Improved layout of modal dialogs
Added more semantic