Clean Up of MainWindow.xaml.cs + Small UI fixes