Fix translations
Style tweaks