Redesigned (and fixed) lessontype-management