Made the GUI more like the server
Merge branch 'master' into robotSim_greenleaf
Added Zac's request...