Refactor field and page