Renamed new_main_window.ui AND merged conflicts

Still having problems with getting the UI files to compile correctly.

Plus, git.