Fix l10n display issues
Merge pull request #114 from muffinresearch/fix-10n-display-issues

Fix l10n display issues