Minor fixes
Refactored widgets to be providers