Improvements to drag/drop behaviour