Pagination fixed up