Reworking page template to make more reusable