UI tweaks
Merge branch 'master' of https://github.com/chrisfarnsvt/SoftEngProj
Integrated Chris's changes into mine