Refactor Pagination and added pagination to standard list view