Tweak widget
Small fix
More generification
Merge pull request #1631 from onepercentclub/feature/widget-fixes

Tweak widget