Cleaned MainWindow a bit