Dialog Control Updated
Merge remote-tracking branch 'origin/new-ui-2' into tahir_ui_changes