Sorting just by position creates a funny bug with block templates being written before real ones

Now we asign an infinite position to new ones and we're ready
Merge branch 'fixes/wrong-menu-items-creation'
When updating goes wrong we return to edit