Added touch and keyboard map control