Feature/language fixes

More tpl updates for translations