Switch works

but broke drag and drop on full width items