diff --git a/shipping/uc_quote/uc_quote.info b/shipping/uc_quote/uc_quote.info
index f879cdf..cbab608 100644
--- a/shipping/uc_quote/uc_quote.info
+++ b/shipping/uc_quote/uc_quote.info
@@ -3,4 +3,4 @@ description = Enables shipping quotes to be calculated and displayed at checkout
 dependencies[] = uc_cart
 package = "Ubercart - core (optional)"
 core = 7.x
-configure = admin/store/settings/quotes/edit
+configure = admin/store/settings/quotes
diff --git a/shipping/uc_quote/uc_quote.module b/shipping/uc_quote/uc_quote.module
index d26193e..e9fb3eb 100644
--- a/shipping/uc_quote/uc_quote.module
+++ b/shipping/uc_quote/uc_quote.module
@@ -42,12 +42,7 @@ function uc_quote_menu() {
     'title' => 'Methods',
     'type' => MENU_DEFAULT_LOCAL_TASK,
   );
-  $items['admin/store/settings/quotes/methods/general'] = array(
-    'title' => 'General settings',
-    'weight' => -10,
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-  );
-  $items['admin/store/settings/quotes/edit'] = array(
+  $items['admin/store/settings/quotes/settings'] = array(
     'title' => 'Settings',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_quote_admin_settings'),
@@ -55,6 +50,10 @@ function uc_quote_menu() {
     'type' => MENU_LOCAL_TASK,
     'file' => 'uc_quote.admin.inc',
   );
+  $items['admin/store/settings/quotes/settings/general'] = array(
+    'title' => 'Basic settings',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+  );
 
   return $items;
 }
diff --git a/shipping/uc_ups/uc_ups.admin.inc b/shipping/uc_ups/uc_ups.admin.inc
index 5f3fdd5..1c92cf4 100644
--- a/shipping/uc_ups/uc_ups.admin.inc
+++ b/shipping/uc_ups/uc_ups.admin.inc
@@ -272,6 +272,9 @@ function uc_ups_admin_settings($form, &$form_state) {
     '#type' => 'submit',
     '#value' => t('Save configuration'),
   );
+  $form['actions']['cancel'] = array(
+    '#markup' => l(t('Cancel'), 'admin/store/settings/quotes'),
+  );
 
   if (!empty($_POST) && form_get_errors()) {
     drupal_set_message(t('The settings have not been saved because of the errors.'), 'error');
diff --git a/shipping/uc_ups/uc_ups.info b/shipping/uc_ups/uc_ups.info
index e79be89..0631e94 100644
--- a/shipping/uc_ups/uc_ups.info
+++ b/shipping/uc_ups/uc_ups.info
@@ -3,5 +3,5 @@ description = Integrates UPS Rates and Services Selection and Shipping Online To
 dependencies[] = uc_quote
 package = Ubercart - fulfillment
 core = 7.x
-configure = admin/store/settings/quotes/methods/ups/edit
+configure = admin/store/settings/quotes/settings/ups
 stylesheets[all][] = uc_ups.css
diff --git a/shipping/uc_ups/uc_ups.module b/shipping/uc_ups/uc_ups.module
index 3a8a4c1..84eb942 100644
--- a/shipping/uc_ups/uc_ups.module
+++ b/shipping/uc_ups/uc_ups.module
@@ -16,7 +16,7 @@
 function uc_ups_menu() {
   $items = array();
 
-  $items['admin/store/settings/quotes/methods/ups'] = array(
+  $items['admin/store/settings/quotes/settings/ups'] = array(
     'title' => 'UPS',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_ups_admin_settings'),
@@ -259,6 +259,12 @@ function uc_ups_uc_shipping_method() {
     'id' => 'ups',
     'module' => 'uc_ups',
     'title' => t('UPS'),
+    'operations' => array(
+      'configure' => array(
+        'title' => t('configure'),
+        'href' => 'admin/store/settings/quotes/settings/ups',
+      ),
+    ),
     'enabled' => $enabled['ups'],
     'quote' => array(
       'type' => 'small_package',
@@ -297,7 +303,7 @@ function uc_ups_uc_store_status() {
   }
   else {
     $messages[] = array('status' => 'error', 'title' => t('UPS Online Tools'),
-      'desc' => t('More information is needed to access UPS Online Tools. Please enter it <a href="!url">here</a>.', array('!url' => url('admin/store/settings/quotes/methods/ups'))),
+      'desc' => t('More information is needed to access UPS Online Tools. Please enter it <a href="!url">here</a>.', array('!url' => url('admin/store/settings/quotes/settings/ups'))),
     );
   }
 
diff --git a/shipping/uc_usps/uc_usps.admin.inc b/shipping/uc_usps/uc_usps.admin.inc
index 399a893..7a3d718 100644
--- a/shipping/uc_usps/uc_usps.admin.inc
+++ b/shipping/uc_usps/uc_usps.admin.inc
@@ -245,6 +245,9 @@ function uc_usps_admin_settings($form, &$form_state) {
     '#type' => 'submit',
     '#value' => t('Save configuration'),
   );
+  $form['actions']['cancel'] = array(
+    '#markup' => l(t('Cancel'), 'admin/store/settings/quotes'),
+  );
 
   if (!empty($_POST) && form_get_errors()) {
     drupal_set_message(t('The settings have not been saved because of the errors.'), 'error');
diff --git a/shipping/uc_usps/uc_usps.info b/shipping/uc_usps/uc_usps.info
index d307750..5347e0d 100644
--- a/shipping/uc_usps/uc_usps.info
+++ b/shipping/uc_usps/uc_usps.info
@@ -3,4 +3,4 @@ description = Integrates USPS Rate Calculator and Mail Service Standards Web Too
 dependencies[] = uc_quote
 package = Ubercart - fulfillment
 core = 7.x
-configure = admin/store/settings/quotes/methods/usps/edit
+configure = admin/store/settings/quotes/settings/usps
diff --git a/shipping/uc_usps/uc_usps.module b/shipping/uc_usps/uc_usps.module
index a254f7b..0483b37 100644
--- a/shipping/uc_usps/uc_usps.module
+++ b/shipping/uc_usps/uc_usps.module
@@ -16,7 +16,7 @@
 function uc_usps_menu() {
   $items = array();
 
-  $items['admin/store/settings/quotes/methods/usps'] = array(
+  $items['admin/store/settings/quotes/settings/usps'] = array(
     'title' => 'USPS',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_usps_admin_settings'),
@@ -202,12 +202,19 @@ function uc_usps_uc_shipping_method() {
     'usps_intl_env' => 1,
     'usps_intl' => 1,
    );
+   $operations = array(
+    'configure' => array(
+      'title' => t('configure'),
+      'href' => 'admin/store/settings/quotes/settings/usps',
+    ),
+  );
 
   $methods = array(
     'usps_env' => array(
       'id' => 'usps_env',
       'module' => 'uc_usps',
       'title' => t('U.S. Postal Service (Envelope)'),
+      'operations' => $operations,
       'quote' => array(
         'type' => 'envelope',
         'callback' => 'uc_usps_quote',
@@ -220,6 +227,7 @@ function uc_usps_uc_shipping_method() {
       'id' => 'usps',
       'module' => 'uc_usps',
       'title' => t('U.S. Postal Service (Parcel)'),
+      'operations' => $operations,
       'quote' => array(
         'type' => 'small_package',
         'callback' => 'uc_usps_quote',
@@ -232,6 +240,7 @@ function uc_usps_uc_shipping_method() {
       'id' => 'usps_intl_env',
       'module' => 'uc_usps',
       'title' => t('U.S. Postal Service (Intl., Envelope)'),
+      'operations' => $operations,
       'quote' => array(
         'type' => 'envelope',
         'callback' => 'uc_usps_quote',
@@ -244,6 +253,7 @@ function uc_usps_uc_shipping_method() {
       'id' => 'usps_intl',
       'module' => 'uc_usps',
       'title' => t('U.S. Postal Service (Intl., Parcel)'),
+      'operations' => $operations,
       'quote' => array(
         'type' => 'small_package',
         'callback' => 'uc_usps_quote',