moved remaining pages to have template inheritance