Delay adding markers to the map

Allow map to download before we start adding markers
Merge remote-tracking branch 'origin/optimize-markers'