structure update and page refactor