Refactor new page header