Resolve lobby display #23