more for page, refactor code