Changes to pages and template