Clean up setup
Merge pull request #1117 from onepercentclub/feature/widget-refactor-v2a

Change setup