Leaflet Improvements