Frontend merge widget updates
![conflict_1_](/uploads/2088e396f22d851fdd256bd35f263c77/conflict_1_.png)
epic