DF-2339 - Updated drag'n'drop functionality