Enable reordering items
Minor bugfix
Some fixes/optimizations for reordering items