Could you please change the single menu for buildings and unit to one for buildings and one for units ?
Even better, could you even make the distinction between military and technology buildings ?
I mean, when selecting a unit, there is a lot of chance you want to focus on that unit. It would be weird to search for a scout and then blindly send him somewhere without even knowing where he was to begin with.
For military buildings, some might want to know which military building they selected to know where to put waypoints or what units to create.
But for technology buildings, I don’t think you really need the precise location of that building to start searching for a new tech