Fixes in l10n and software
Reworked design