Updated OrderManager and OrderUI