Updates to catalog views

Remaining issues from previous pull request and upgrades to catalog views.
I searched for a while and didn't find a way to call helpers. So I looked at the code and thought that was essentially what you were doing. But I see now that you have more complicated code somewhere. I will save it to global functions then and have them called from (refactored) event handlers.