more view updates
Merge branch 'master' of https://github.com/coffee-n-code/Hackathon-TEAM3