Various leaflet improvements

See commits