Improve design, code and locale with l10n