General improvements on Form generator.