Revamped course list
Merged