Reworking the page template