Refactor of page header