Pagination and Other edits