Refined the dialogs