some work on GUI
Renamed main window class