Rewritten catalog view partial.

@h-kataria, @martinpovolny  OK, this looks good