Improve architecture - dialogs