First build for Windows and updates

Updates to MainWindow