reworked templates, trasnlation fixes