improved shipment page flow