Updates to catalog views

Remaining issues from previous pull request and upgrades to catalog views.
This events is not possible to make into a function? It seems to me that they are all exactly the same, except for the path at the end of the click?