Fix team selection bug in tournaments

along with a more intuitive naming for team selection variables and classes
Fix bug where the tournament box doesn't disappear when the box is open and the tournament ends, but the user is in a different room