diff --git a/shipping/uc_flatrate/uc_flatrate.admin.inc b/shipping/uc_flatrate/uc_flatrate.admin.inc
index d87a39e..d5cdf5f 100644
--- a/shipping/uc_flatrate/uc_flatrate.admin.inc
+++ b/shipping/uc_flatrate/uc_flatrate.admin.inc
@@ -6,36 +6,6 @@
  */
 
 /**
- * Lists and compares all flatrate shipping quote methods.
- */
-function uc_flatrate_admin_methods() {
-  $build = array();
-  $rows = array();
-
-  $result = db_query("SELECT mid, title, label, base_rate, product_rate FROM {uc_flatrate_methods}");
-  foreach ($result as $method) {
-    $row = array();
-    $row[] = check_plain($method->title);
-    $row[] = check_plain($method->label);
-    $row[] = uc_currency_format($method->base_rate);
-    $row[] = uc_currency_format($method->product_rate);
-    $row[] = l(t('edit'), 'admin/store/settings/quotes/methods/flatrate/' . $method->mid);
-    $rows[] = $row;
-  }
-
-  if (count($rows)) {
-    $header = array(t('Title'), t('Label'), t('Base rate'), t('Default product rate'), array('data' => t('Operations'), 'colspan' => 1));
-    $build['methods'] = array(
-      '#theme' => 'table',
-      '#header' => $header,
-      '#rows' => $rows,
-    );
-  }
-
-  return $build;
-}
-
-/**
  * Configures the store default product shipping rates.
  *
  * @see uc_flatrate_admin_method_edit_form_validate()
@@ -170,7 +140,7 @@ function uc_flatrate_admin_method_edit_form_submit($form, &$form_state) {
     drupal_set_message(t('Created and enabled new flat rate shipping method.'));
   }
 
-  $form_state['redirect'] = 'admin/store/settings/quotes/methods/flatrate';
+  $form_state['redirect'] = 'admin/store/settings/quotes/methods';
 }
 
 /******************************************************************************
@@ -187,7 +157,7 @@ function uc_flatrate_admin_method_confirm_delete($form, &$form_state, $mid) {
   $form['mid'] = array('#type' => 'value', '#value' => $mid);
 
   return confirm_form($form, t('Do you want to delete this shipping method?'),
-    'admin/store/settings/quotes/methods/flatrate',
+    'admin/store/settings/quotes/methods',
     t('This will remove the shipping method and the product-specific overrides (if applicable). This action can not be undone.'),
     t('Delete'));
 }
@@ -218,5 +188,5 @@ function uc_flatrate_admin_method_confirm_delete_submit($form, &$form_state) {
   variable_set('uc_quote_method_weight', $weight);
 
   drupal_set_message(t('Flat rate shipping method deleted.'));
-  $form_state['redirect'] = 'admin/store/settings/quotes/methods/flatrate';
+  $form_state['redirect'] = 'admin/store/settings/quotes/methods';
 }
diff --git a/shipping/uc_flatrate/uc_flatrate.info b/shipping/uc_flatrate/uc_flatrate.info
index e06f1c2..31cc496 100644
--- a/shipping/uc_flatrate/uc_flatrate.info
+++ b/shipping/uc_flatrate/uc_flatrate.info
@@ -3,4 +3,4 @@ description = Assigns a flat shipping rate to an order, plus an optional amount
 dependencies[] = uc_quote
 package = Ubercart - fulfillment
 core = 7.x
-configure = admin/store/settings/quotes/methods/flatrate
+configure = admin/store/settings/quotes/methods
diff --git a/shipping/uc_flatrate/uc_flatrate.module b/shipping/uc_flatrate/uc_flatrate.module
index 8c718c2..27c3aff 100644
--- a/shipping/uc_flatrate/uc_flatrate.module
+++ b/shipping/uc_flatrate/uc_flatrate.module
@@ -15,13 +15,6 @@
 function uc_flatrate_menu() {
   $items = array();
 
-  $items['admin/store/settings/quotes/methods/flatrate'] = array(
-    'title' => 'Flat rate',
-    'page callback' => 'uc_flatrate_admin_methods',
-    'access arguments' => array('configure quotes'),
-    'type' => MENU_LOCAL_TASK,
-    'file' => 'uc_flatrate.admin.inc',
-  );
   $items['admin/store/settings/quotes/methods/flatrate/add'] = array(
     'title' => 'Add flat rate quote',
     'page callback' => 'drupal_get_form',
@@ -178,7 +171,7 @@ function uc_flatrate_uc_shipping_method() {
   $enabled = variable_get('uc_quote_enabled', array());
   $weight = variable_get('uc_quote_method_weight', array());
 
-  $result = db_query("SELECT mid, title, label FROM {uc_flatrate_methods}");
+  $result = db_query("SELECT mid, title, label, base_rate, product_rate FROM {uc_flatrate_methods}");
   foreach ($result as $method) {
     // Ensure default values are set.
     $enabled += array('flatrate_' . $method->mid => TRUE);
@@ -188,6 +181,17 @@ function uc_flatrate_uc_shipping_method() {
       'id' => 'flatrate_' . $method->mid,
       'module' => 'uc_flatrate',
       'title' => $method->title,
+      'description' => t('!base_rate + !product_rate per item', array('!base_rate' => uc_currency_format($method->base_rate), '!product_rate' => uc_currency_format($method->product_rate))),
+      'operations' => array(
+        'edit' => array(
+          'title' => t('edit'),
+          'href' => 'admin/store/settings/quotes/methods/flatrate/' . $method->mid,
+        ),
+        'delete' => array(
+          'title' => t('delete'),
+          'href' => 'admin/store/settings/quotes/flatrate/' . $method->mid . '/delete',
+        ),
+      ),
       'enabled' => $enabled['flatrate_' . $method->mid],
       'quote' => array(
         'type' => 'order',
diff --git a/shipping/uc_quote/uc_quote.admin.inc b/shipping/uc_quote/uc_quote.admin.inc
index b6a2186..30aa3c5 100644
--- a/shipping/uc_quote/uc_quote.admin.inc
+++ b/shipping/uc_quote/uc_quote.admin.inc
@@ -124,23 +124,35 @@ function uc_quote_method_settings($form, &$form_state) {
 
   $enabled = variable_get('uc_quote_enabled', array());
   $weight = variable_get('uc_quote_method_weight', array());
-  $methods = uc_quote_shipping_method_options();
-  if (is_array($methods)) {
-    foreach ($methods as $id => $title) {
+  $methods = module_invoke_all('uc_shipping_method');
+  uasort($methods, '_uc_quote_type_sort');
+
+  foreach ($methods as $method) {
+    if (isset($method['quote'])) {
+      $id = $method['id'];
+
       // Ensure default values are set.
       $enabled += array($id => FALSE);
       $weight += array($id => 0);
 
       $form['methods'][$id]['uc_quote_enabled'] = array(
         '#type' => 'checkbox',
-        '#title' => $title,
+        '#title' => $method['title'],
         '#default_value' => $enabled[$id],
       );
+      $form['methods'][$id]['description'] = array(
+        '#markup' => isset($method['description']) ? $method['description'] : '',
+      );
       $form['methods'][$id]['uc_quote_method_weight'] = array(
         '#type' => 'weight',
         '#default_value' => $weight[$id],
         '#attributes' => array('class' => array('uc-quote-method-weight')),
       );
+      $form['methods'][$id]['operations'] = array(
+        '#theme' => 'links',
+        '#links' => isset($method['operations']) ? $method['operations'] : array(),
+        '#attributes' => array('class' => array('links', 'inline')),
+      );
     }
   }
 
@@ -196,12 +208,14 @@ function theme_uc_quote_method_settings($variables) {
 
   drupal_add_tabledrag('uc-quote-methods', 'order', 'sibling', 'uc-quote-method-weight');
 
-  $header = array(t('Shipping method'), t('List position'));
+  $header = array(t('Shipping method'), t('Details'), t('List position'), t('Actions'));
   $rows = array();
   foreach (element_children($form['methods']) as $method) {
     $row = array(
       drupal_render($form['methods'][$method]['uc_quote_enabled']),
+      drupal_render($form['methods'][$method]['description']),
       drupal_render($form['methods'][$method]['uc_quote_method_weight']),
+      drupal_render($form['methods'][$method]['operations']),
     );
 
     $rows[] = array(
diff --git a/shipping/uc_quote/uc_quote.module b/shipping/uc_quote/uc_quote.module
index d839983..f6c939f 100644
--- a/shipping/uc_quote/uc_quote.module
+++ b/shipping/uc_quote/uc_quote.module
@@ -1105,18 +1105,3 @@ function uc_quote_get_shipping_types() {
 
   return $return;
 }
-
-/**
- * Returns an options array of shipping methods.
- */
-function uc_quote_shipping_method_options() {
-  $methods = module_invoke_all('uc_shipping_method');
-  uasort($methods, '_uc_quote_type_sort');
-  $types = array();
-  foreach ($methods as $method) {
-    if (isset($method['quote'])) {
-      $types[$method['id']] = $method['title'];
-    }
-  }
-  return $types;
-}
diff --git a/shipping/uc_weightquote/uc_weightquote.admin.inc b/shipping/uc_weightquote/uc_weightquote.admin.inc
index ed03fa5..3b8fcdf 100644
--- a/shipping/uc_weightquote/uc_weightquote.admin.inc
+++ b/shipping/uc_weightquote/uc_weightquote.admin.inc
@@ -6,36 +6,6 @@
  */
 
 /**
- * Lists and compares all weight-based shipping quote methods.
- */
-function uc_weightquote_admin_methods() {
-  $build = array();
-  $rows = array();
-
-  $result = db_query("SELECT mid, title, label, base_rate, product_rate FROM {uc_weightquote_methods}");
-  foreach ($result as $method) {
-    $row = array();
-    $row[] = check_plain($method->title);
-    $row[] = check_plain($method->label);
-    $row[] = uc_currency_format($method->base_rate);
-    $row[] = uc_currency_format($method->product_rate);
-    $row[] = l(t('edit'), 'admin/store/settings/quotes/methods/weightquote/' . $method->mid);
-    $rows[] = $row;
-  }
-
-  if (count($rows)) {
-    $header = array(t('Title'), t('Label'), t('Base rate'), t('Default product rate'), array('data' => t('Operations'), 'colspan' => 1));
-    $build['methods'] = array(
-      '#theme' => 'table',
-      '#header' => $header,
-      '#rows' => $rows,
-    );
-  }
-
-  return $build;
-}
-
-/**
  * Configures the store default product shipping rates.
  *
  * @see uc_weightquote_admin_method_edit_form_validate()
@@ -170,7 +140,7 @@ function uc_weightquote_admin_method_edit_form_submit($form, &$form_state) {
     drupal_set_message(t('Created and enabled new weight quote shipping method.'));
   }
 
-  $form_state['redirect'] = 'admin/store/settings/quotes/methods/weightquote';
+  $form_state['redirect'] = 'admin/store/settings/quotes/methods';
 }
 
 /******************************************************************************
@@ -187,7 +157,7 @@ function uc_weightquote_admin_method_confirm_delete($form, &$form_state, $mid) {
   $form['mid'] = array('#type' => 'value', '#value' => $mid);
 
   return confirm_form($form, t('Do you want to delete this shipping method?'),
-    'admin/store/settings/quotes/methods/weightquote',
+    'admin/store/settings/quotes/methods',
     t('This will remove the shipping method and the product-specific overrides (if applicable). This action can not be undone.'),
     t('Delete'));
 }
@@ -218,5 +188,5 @@ function uc_weightquote_admin_method_confirm_delete_submit($form, &$form_state)
   variable_set('uc_quote_method_weight', $weight);
 
   drupal_set_message(t('Weight quote shipping method deleted.'));
-  $form_state['redirect'] = 'admin/store/settings/quotes/methods/weightquote';
+  $form_state['redirect'] = 'admin/store/settings/quotes/methods';
 }
diff --git a/shipping/uc_weightquote/uc_weightquote.info b/shipping/uc_weightquote/uc_weightquote.info
index feaa49e..929a3e6 100644
--- a/shipping/uc_weightquote/uc_weightquote.info
+++ b/shipping/uc_weightquote/uc_weightquote.info
@@ -3,4 +3,4 @@ description = Assigns a shipping rate to products based on weight.
 dependencies[] = uc_quote
 package = Ubercart - fulfillment
 core = 7.x
-configure = admin/store/settings/quotes/methods/weightquote
+configure = admin/store/settings/quotes/methods
diff --git a/shipping/uc_weightquote/uc_weightquote.module b/shipping/uc_weightquote/uc_weightquote.module
index 7c8e56a..d19658e 100644
--- a/shipping/uc_weightquote/uc_weightquote.module
+++ b/shipping/uc_weightquote/uc_weightquote.module
@@ -15,13 +15,6 @@
 function uc_weightquote_menu() {
   $items = array();
 
-  $items['admin/store/settings/quotes/methods/weightquote'] = array(
-    'title' => 'Weight quote',
-    'page callback' => 'uc_weightquote_admin_methods',
-    'access arguments' => array('configure quotes'),
-    'type' => MENU_LOCAL_TASK,
-    'file' => 'uc_weightquote.admin.inc',
-  );
   $items['admin/store/settings/quotes/methods/weightquote/add'] = array(
     'title' => 'Add weight quote',
     'page callback' => 'drupal_get_form',
@@ -178,7 +171,7 @@ function uc_weightquote_uc_shipping_method() {
   $enabled = variable_get('uc_quote_enabled', array());
   $weight = variable_get('uc_quote_method_weight', array());
 
-  $result = db_query("SELECT mid, title, label FROM {uc_weightquote_methods}");
+  $result = db_query("SELECT mid, title, label, base_rate, product_rate FROM {uc_weightquote_methods}");
   foreach ($result as $method) {
     // Ensure the default values are set.
     $enabled += array('weightquote_' . $method->mid => FALSE);
@@ -188,6 +181,17 @@ function uc_weightquote_uc_shipping_method() {
       'id' => 'weightquote_' . $method->mid,
       'module' => 'uc_weightquote',
       'title' => $method->title,
+      'description' => t('!base_rate + !product_rate per !unit', array('!base_rate' => uc_currency_format($method->base_rate), '!product_rate' => uc_currency_format($method->product_rate), '!unit' => variable_get('uc_weight_unit', 'lb'))),
+      'operations' => array(
+        'edit' => array(
+          'title' => t('edit'),
+          'href' => 'admin/store/settings/quotes/methods/weightquote/' . $method->mid,
+        ),
+        'delete' => array(
+          'title' => t('delete'),
+          'href' => 'admin/store/settings/quotes/weightquote/' . $method->mid . '/delete',
+        ),
+      ),
       'enabled' => isset($enabled['weightquote_' . $method->mid]) ? $enabled['weightquote_' . $method->mid] : FALSE,
       'quote' => array(
         'type' => 'order',