Improve the way items are moved

Leverages the dataview api, and fixes indentation automagically