Pull request: READ THE COMMENT

I had some MAJOR issues with conflicts and the damn thing was frustrating me!!

The MainWindow.xaml should be exactly the same (plus or minus converting spaces into tab indents)

The net change to MainWindow.xaml.cs should be like 3 if(...) got changed

If you do not like the changes then please tell me how to COMPLETELY reset my Fork to what you have....