some rework on Droplets helper and module