diff --git a/uc_product/uc_product.admin.inc b/uc_product/uc_product.admin.inc
index be9eb0c..7534c4a 100644
--- a/uc_product/uc_product.admin.inc
+++ b/uc_product/uc_product.admin.inc
@@ -227,11 +227,13 @@ function uc_product_field_settings_form() {
       '#type' => 'markup',
       '#value' => $field['title'],
     );
-    $form['fields'][$label]['weight'] = array(
-      '#type' => 'weight',
-      '#delta' => 10,
-      '#default_value' => $field['weight'],
-    );
+    if (!module_exists('content')) {
+      $form['fields'][$label]['weight'] = array(
+        '#type' => 'weight',
+        '#delta' => 10,
+        '#default_value' => $field['weight'],
+      );
+    }
   }
 
   $form['buttons']['submit'] = array(
@@ -284,13 +286,18 @@ function _uc_product_fields_summarize($form, $options, $enabled, $weight) {
  * @ingroup themeable
  */
 function theme_uc_product_field_settings_form($form) {
-  $header = array(t('Enable'), t('Product field'), t('List position'));
+  $header = array(t('Enable'), t('Product field'));
+  if (!module_exists('content')) {
+    $header[] = t('List position');
+  }
   $rows = array();
   foreach (element_children($form['fields']) as $field) {
     $row = array();
     $row[] = drupal_render($form['fields'][$field]['enabled']);
     $row[] = drupal_render($form['fields'][$field]['title']);
-    $row[] = drupal_render($form['fields'][$field]['weight']);
+    if (!module_exists('content')) {
+      $row[] = drupal_render($form['fields'][$field]['weight']);
+    }
     $rows[] = $row;
   }
   $output  = theme('table', $header, $rows);
@@ -318,10 +325,24 @@ function uc_product_field_settings_form_reset($form, &$form_state) {
  */
 function uc_product_field_settings_form_submit($form, &$form_state) {
   $enabled = array();
-  $weight = array();
+  $weight = variable_get('uc_product_field_weight', array(
+    'image' => -2,
+    'display_price' -1,
+    'model' => 0,
+    'list_price' => 2,
+    'cost' => 3,
+    'sell_price' => 4,
+    'weight' => 5,
+    'dimensions' => 6,
+    'add_to_cart' => 10,
+  ));
   foreach ($form_state['values']['fields'] as $id => $field) {
     $enabled[$id] = $field['enabled'];
-    $weight[$id] = $field['weight'];
+    if (module_exists('content')) {
+      $weight[$id] = $weight[$id];
+    } else {
+      $weight[$id] = $field['weight'];
+    }
   }
   variable_set('uc_product_field_enabled', $enabled);
   variable_set('uc_product_field_weight', $weight);
diff --git a/uc_product/uc_product.module b/uc_product/uc_product.module
index dcc3496..1c30523 100644
--- a/uc_product/uc_product.module
+++ b/uc_product/uc_product.module
@@ -1038,10 +1038,50 @@ function uc_product_content_extra_fields($type_name) {
   $extra = array();
 
   if ($type->module == 'uc_product') {
-    $extra['base'] = array(
-      'label' => t('Product information'),
+    $extra['image'] = array(
+      'label' => t('Product image'),
       'description' => t('Product module form.'),
-      'weight' => -1
+      'weight' => -2, // Default, unless customized on Content Type -> Manage Fields.
+    );
+    $extra['display_price'] = array(
+      'label' => t('Product display price'),
+      'description' => t('Product module form.'),
+      'weight' => -1,
+    );
+    $extra['model'] = array(
+      'label' => t('Product SKU'),
+      'description' => t('Product module form.'),
+      'weight' => 0,
+    );
+    $extra['list_price'] = array(
+      'label' => t('Product list price'),
+      'description' => t('Product module form.'),
+      'weight' => 2,
+    );
+    $extra['cost'] = array(
+      'label' => t('Product cost'),
+      'description' => t('Product module form.'),
+      'weight' => 3,
+    );
+    $extra['sell_price'] = array(
+      'label' => t('Product sell price'),
+      'description' => t('Product module form.'),
+      'weight' => 4,
+    );
+    $extra['weight'] = array(
+      'label' => t('Product weight'),
+      'description' => t('Product module form.'),
+      'weight' => 5,
+    );
+    $extra['dimensions'] = array(
+      'label' => t('Product dimensions'),
+      'description' => t('Product module form.'),
+      'weight' => 6,
+    );
+    $extra['add_to_cart'] = array(
+      'label' => t('Product add to cart form'),
+      'description' => t('Product module form.'),
+      'weight' => 10,
     );
   }