some page refactor