updated UI
Merge branch 'master' of https://github.com/UBC-304-bestteam/dbproject