neon-1237 Fixing broken widgets
NEON-1238: Pulling the widget file updates in from master.