Finished Pagination Refactoring Issues