Issue #182 working drag and drop functionality