Add page layout and caching