"Minor front end changes"
Merge branch 'master' of github.com:gathcon/Group3ProjectWeb