Form generator improvements