Changes mainly to dialog box