Slight refactor of map controls