Gabriel fixed drag and drop

Working version