more GUI changes
merged mainwindow changes
Merge pull request #170 from danlurie/GUI

Changes to GUI text