Some Changes to the MainWindow
Some Changes to the design