Merge pull request #204 from davidmsantos90/master

[CDE-408]: Some Operations werent updating correctly after Delete Operation execution
[CDE-406]: Drag and drop / reorder doesn't work for teh freeform layout