Change nav order
Fix typo