Updated views
Merge branch 'master' of github.com:stdragiev1/Team7