add page header and refactor view