Move some more stuff to the new main window