[Issue 662] Translations retouch

Fixes overlaps and text running out of boundaries.