Updated a few list options for more logical ordering