Fixed ordering in dropdown menus to be consistent