Can we please have the ability to quit out of the map with the esc key please?

It feels really unnatural for me to press the 'm' key to close the map in-game. Can we please close the map with 'esc' key.

While we're at it, can we move our soldier around to that our icon can pointer can change direction while the map is open? It would make it much easier to get my bearings on direction that way.