DF-2765 drag and drop and some small fixes