Improve Map And Civ UI Selection

It was already proposed here. I think they will eventually.