Change order of options for second column
Clean up comments in XML file