Pagination improvements

Pagination visual and functional improvements