(#11): Improve the Pagination part.