Courses link is updated and some refactoring relates to pagination