Changed hierarchy of StudentMaterialSelector. Closes #388