Options: Reorder options slightly