Simplified dialogs & renewed structure