added i18n, navigation