MainWindow modified