More main window tweaks