=== modified file 'uc_product/uc_product.module'
--- uc_product/uc_product.module	2009-03-17 17:48:19 +0000
+++ uc_product/uc_product.module	2009-03-19 12:53:15 +0000
@@ -1421,33 +1421,30 @@
 
   $first = array_shift($images);
 
-  $output = '<div class="product-image">';
+  $output = '<div class="product-image"><div class="main-product-image">';
+  $output .= '<a href="'. imagecache_create_url('product_full', $first['filepath']) .'" title="'. $first['data']['title'] .'"';
   if ($image_widget) {
-    $output .= '<a href="'. imagecache_create_url('product_full', $first['filepath']) .'" title="'. $first['data']['title'] .'"'. $image_widget_func($rel_count) .'>';
+    $output .= $image_widget_func($rel_count);
   }
+  $output .= '>';
   $output .= theme('imagecache', 'product', $first['filepath'], $first['data']['alt'], $first['data']['title']);
-  /* if (count($images)) {
-    $output .= '<br />'. t('Click for more images.');
-  } */
-  if ($image_widget) {
-    $output .= '</a>';
-  }
-  $output .= '<br />';
+  $output .= '</a></div><div class="more-product-images">';
   foreach ($images as $thumbnail) {
     // Node preview adds extra values to $images that aren't files.
     if (!is_array($thumbnail) || empty($thumbnail['filepath'])) {
       continue;
     }
+    $output .= '<a href="'. imagecache_create_url('product_full', $thumbnail['filepath']) .'" title="'. $thumbnail['data']['title'] .'"';
     if ($image_widget) {
-      $output .= '<a href="'. imagecache_create_url('product_full', $thumbnail['filepath']) .'" title="'. $thumbnail['data']['title'] .'"'. $image_widget_func($rel_count) .'>';
+      $output .= $image_widget_func($rel_count);
     }
+    $output .= '>';
     $output .= theme('imagecache', 'uc_thumbnail', $thumbnail['filepath'], $thumbnail['data']['alt'], $thumbnail['data']['title']);
-    if ($image_widget) {
-      $output .= '</a>';
-    }
+    $output .= '</a>';
   }
-  $output .= '</div>';
+  $output .= '</div></div>';
   $rel_count++;
+
   return $output;
 }