Initial framework for widgets
Improvements