Refactored order schema and UI