Added search bar and map type control