Updated the default order for some combo boxes