Refactor Schedule Pagination