Bring back proper box model for the catalog.

Effectively reverts:
- 3bc3aabc05347945fb1497e9f2e724e008436d03
- eb26a09ce575b75f53d7c5477aee9ecfe37a9b04