Better category navigation and index support