OrderForm changes + Exit corrected