Pagination and Other minor task
Merge Conflict