Added more main window stuff