better FormBuilder integration, Twig updated