Tidy up views
Merge pull request #41 from jasondbaker/dev-jdb-05052014

Tidy up views