order form improvements, and reduce generation flicker