More refinements on order form