Small cleanup, added "up next" and current class roster
Smaller sizes in case we have extra students