ui changes
changes merge
Changed to the UI windows