Tidyup views.

Fixes #94