Add level references
SImplify grouping of teachers