improve order form submit behaviour 5