Fix up the navigation to be in a sane order

23 months ago, Gary Kramlich