updated map style
merged master