Reorder navigation

Reordered navigation to match thread.