Refined existing pages and added Boxes to use ESI