Nav and Order: more fun changes