Improve Production order wizard