Widget fixes
Dialogs view fixes
Refactoring