Replaced validation clicking with drag/drop