Translation and fixes to links translatability