[EditTemplate] Add form field wrapper with new Twig blocks