Changed a lot of GUI
Merge branch 'master' of https://github.com/projectteam5/Project1