Reformat code
Adds wmSubmitButton to the buttons that close the dialog
Layout fixes