Lobby redesign to make it more room centric
Refactor as per comments from code review