Improved lobby layout