Rework URLs - still changes needed
Add page-level caching for metrics