Fixed quote/bracket issue and added code for done dialogs