Updates to catalog views

Remaining issues from previous pull request and upgrades to catalog views.