Added modal dialogs
Merge