Made Drag-n-Drop interface more functional and general