MainWindow Changes

Just cleaning up, organizing and adding to the MainWindow.xaml.