Change drag/drop style
Review code