Improvements to drag and drop

Still not complete, but looks better than it
did before.