Fix up the navigation to be in a sane order

2022-05-17, Gary Kramlich