Completed Edit functionality for order validations and a few other minor fixes