improve order form submit behaviour 7