widget redesign fixes
resolved conflict