Fix methods names
NullPointException fix ???
Fix SVG
Course
Course