Reworked the dialog.