More mainwindow tweaks