Cosmetic fixes and sorting of courses