Reorder some config options