Add Pagination and NOtes