Fix errors of twig form template
Use new template files of block