Improvements to drag and snap