Work on the form generator section
fix