renamed controller and introduced dialogs