Updates to page rendering and page creation