Changed some view stuff
updated for rename
Merge branch 'master' into gh-pages