refactor, add some pages