Rework room selection menu