Fixed order of branch and made the teacher dialog stretchable