Merge pull request #113 from dbeckwith/GUIFixes

Gui fixes
Merge remote-tracking branch 'origin/team9dev' into GUIFixes