fix typo and fix navigation