refactor some page