Feature/orders design