Some minor changes to the formbuilder and the form