refactor order form as per conversion-spec