This is just the lobby? This looks like the full game! Very nice attention to detail.
I actually think the setup of the map is fine as it is. If you’re familiar with Age of Empires III, there is a similar menu layout as well. Here is a screenshot:
In the game, players can actually click on some of the buildings to view certain upgrades. In the end, there’s no set organization of the buildings because it’s meant to look like a normal city, so I’d say your “disorganized” map works just as well.
I hope this helped! You earn a thumbs-up for Cyberpunk/Sci-fi Urban City Lobby quality. 