OMG put the Generals and Admirals to sleep!

[King Phaedron]

I would like to see escorting generals and admirals stay sleeping, and give me the unit to move, not the commander. This is actually gamebreaking when the unit is parked on a settler or civilian unit. It becomes impossibe to select the Frigate!

 

[AriochIV]

If one unit icon is obscuring another, zoom in.