use labels instead of popups, and divicons. Also update leaflet.