Better handling of Leaflet container