WIP teacher view refactoring