Modified UI according to our discussion
Merge branch 'master' of https://github.com/ht92/CPSC304

Merging the remote repo with my changes.