minor changes to GUI
Merge