fixing form templates