Add explicit close to Dialog and ModalDialog views

Include an explicit close icon in the Dialog and ModalDialog views by default to improve usability. (Still allow users to click outside the dialog as a alternate close option.)