More refactoring with the lobby styling