Widgets
small refactoring...
DB dump