Modify page limit
Modify page limit, refactor view
refactor view