Added support for courses in Preview mode
Indenting fixes