Pagination upgrade and NumberedPager implementation