Further improvements to Lobby