refactoring in-progress, moved to a simpler page template