add page header and refactor views