Pagination re-structure