new templated pages, refactored