Reordered some of the option data to make their grouping more logical.