more i18n and smooth top
fixing i18n