[CDE-406]: Drag and drop / reorder doesn't work for teh freeform layout
[CDE-406]: refactor addRowOperations and some minor adjustments to drag and drop