PROJ-135: Mostly fixed datatables stuff and teachers refactoring