refactor some pages, form pages