Moved some dialogs
Refactoring