More UI changes
Merge branch 'master' of https://github.com/Apc204/GroupProject
Merge branch 'master' of https://github.com/Apc204/GroupProject
Updates to UI