Fixed JS bug and i18n