improve order form submit behaviour 8