Reorder format list a bit