Fixed some more in main window