For those of you who are concerned with the bigger scene, I've mentioned it before, but we are planning to have the teachers invite the students to go back to the dorms.  This should allow for people to break up more if they want.  The characters can also remain in the auditorium, if they choose, so they aren't forced to abandon a scene in which they are talking with someone on a different floor.