Refactoring to get rid of repeating code
Update widget style
Clean up
Cleanup and setup for widget update from service