Moved arrange-order code into editor
Merge remote-tracking branch 'origin/master'