Droplets list/show and some cleanup