refactor navigation for I18n