Pagination buttons issue resolved