Small GUI fixes
Merge branch 'master' of https://github.com/mtrebell/CMPT305