Html syllabus and highlighting

Merge latest changes