[CDE-406]: Drag and drop / reorder doesn't work for teh freeform layout

@pamval please review