Pagination improvements
oops)