Frontend changes for all users
Merge branch 'master' of https://github.com/jmc123/Group2Tomcat