changes to UI
Merge branch 'master' of https://github.com/jonguan/cmpe273-project1