improved leaflet import