Cleaned up MainWindow more