improve order form submit behaviour