Syllabus layout and fixes