Fixed most of the drag and drop bugs!