More tweaks
Merge pull request #1632 from onepercentclub/feature/widget-fixes

More tweaks