Fix navigation, and other tweaks
Fix typo