Some tweaks for the dialog