Added better dialogs