Updated the pagination a bit