Refactored most page templates to be more DRY