add teacher choice form + refactoring