Fix i18n and style issues