Some improvements to the dialog