Refactored template pages