Fix a bug in the close dialog and add the close dialog to the Quit
button.