UI Changes: adding map control