Refactored views to match new models.
Merge pull request #39 from bitsculpt/views

Refactored views to match new models.