Add markers to map
Fixed marker persistance issues