Drag drop re-order persistence working, but UGLY ugly code