Fixing form templates