Fixed control ordering w/ 'wrap-and-sort'