refactored and added Leaflet map section