Small MainWindow changes