Fixing classroom controller to use proper view models