added I18n and navigation