UI changes; Added new dialog
Updated tests