Fixing validator
translations and template fixes