fix navigation on map
change begin function
merge