Added street toggle and World map type