Updates to catalog views

Remaining issues from previous pull request and upgrades to catalog views.
Hm, this is great, because you've made me realize, I could just put all the setup code on the created of the main catalog template (and then stop the autoruns on destroy).