Updating generic views
Merge pull request #5 from mozilla/views

Updating generic views