Fixed formatting and added short name for courses.