tidy up the views and such
Merge pull request #109 from phillip-haydon/UpgradeAssemblies

Tidy up the views code a weebit.