refactor view course listings
Merge branch 'master' into enrollment-functionality
Merge branch 'enrollment-functionality'