Cleaned up MainWindow markup.