UI touch up
Merge branch 'master' of https://github.com/atesija/497team_project