Revert "Reordered Navigation"

This reverts commit db640235fabfc1e5f68fbc9d4aaed8b066eab8e5.