Some minor changes to page template