--- uc_shipping.module.orig	2010-08-09 16:22:30.000000000 +1000
+++ uc_shipping.module	2010-08-09 15:37:23.000000000 +1000
@@ -585,21 +585,24 @@
       $result = db_query("SELECT sid FROM {uc_shipments} WHERE order_id = %d", $arg1->order_id);
       while ($shipment = db_fetch_object($result)) {
         $shipment = uc_shipping_shipment_load($shipment->sid);
+
         if ($shipment->tracking_number) {
+          $tracking[$shipment->carrier]['data'] = $shipment->carrier;
           $tracking[$shipment->carrier]['children'][] = check_plain($shipment->tracking_number);
         }
         else {
           foreach ($shipment->packages as $package) {
             if ($package->tracking_number) {
+              $tracking[$shipment->carrier]['data'] = $shipment->carrier;
               $tracking[$shipment->carrier]['children'][] = check_plain($package->tracking_number);
             }
           }
         }
       }
       $output = '';
-      foreach ($tracking as $carrier => $item) {
-        $output .= '<strong>'. $carrier .':</strong>'. theme('item_list', $item);
-      }
+      $output .= theme('item_list', $tracking);
+
+
       return $output;
     break;
   }