Layers and markers visualization improved on map