Feature/order details rewrite