Tidied up MainWindow