Added drag and drop wrap. Small improvements