Reorder commands, add a separator