Last touches to template fixing