Adding subject classroom insert and fixing the teacher class.