diff --git a/commerce_discount.module b/commerce_discount.module
index 68aa6af..03e4d3d 100644
--- a/commerce_discount.module
+++ b/commerce_discount.module
@@ -305,7 +305,7 @@ function commerce_discount_commerce_price_formatted_components_alter(&$component
 function commerce_discount_form_commerce_discount_form_alter(&$form, $form_state) {
   // Add clearfix to the discount type container.
   $form['commerce_discount_type']['#attributes']['class'][] = 'clearfix';
-  $form['commerce_discount_fields']['commerce_discount_offer'][LANGUAGE_NONE]['form']['type']['#attributes']['class'][] = 'clearfix';
+  $form['commerce_discount_fields']['commerce_discount_offer']['#attributes']['class'][] = 'clearfix';
 
   if (empty($form_state['commerce_discount']->discount_id)) {
     // Entity is new.
@@ -322,6 +322,29 @@ function commerce_discount_form_commerce_discount_form_alter(&$form, $form_state
     drupal_set_message(t('The rule associated with this discount is overriden, making it impossible to edit the discount.'), 'warning');
     $form['actions']['submit']['#disabled'] = TRUE;
   }
+
+  // Vertical tabs container
+  $form['commerce_discount_fields']['additional_settings'] = array(
+    '#type' => 'vertical_tabs',
+    '#weight' => 99,
+    'commerce_discount_compatibility' => array(
+      '#type' => 'fieldset',
+      '#title' => t('Compatibility with other discounts'),
+      '#collapsible' => TRUE,
+    )
+  );
+  $form['commerce_discount_fields']['#pre_render'][] = 'commerce_discount_vertical_tabs_pre_render';
+}
+
+/**
+ * Add fields to the additional_settings vertical tabs container
+ */
+function commerce_discount_vertical_tabs_pre_render($fields) {
+  $fields['additional_settings']['commerce_discount_compatibility']['commerce_compatibility_strategy'] = $fields['commerce_compatibility_strategy'];
+  $fields['additional_settings']['commerce_discount_compatibility']['commerce_compatibility_selection'] = $fields['commerce_compatibility_selection'];
+  unset($fields['commerce_compatibility_strategy'], $fields['commerce_compatibility_selection']);
+
+  return $fields;
 }
 
 /**
diff --git a/modules/commerce_discount_date/commerce_discount_date.module b/modules/commerce_discount_date/commerce_discount_date.module
index a3eb419..7440aae 100644
--- a/modules/commerce_discount_date/commerce_discount_date.module
+++ b/modules/commerce_discount_date/commerce_discount_date.module
@@ -50,6 +50,23 @@ function commerce_discount_date_views_api($module, $api) {
  */
 function commerce_discount_date_form_commerce_discount_form_alter(&$form, $form_state) {
   $form['commerce_discount_fields']['commerce_discount_date']['#after_build'][] = 'commerce_discount_date_after_build';
+  $form['commerce_discount_fields']['additional_settings']['discount_date'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Discount dates'),
+    '#collapsible' => TRUE,
+    '#weight' => -1,
+  );
+  $form['commerce_discount_fields']['#pre_render'][] = 'commerce_discount_date_pre_render';
+}
+
+/**
+ * Add fields to the additional_settings vertical tabs container
+ */
+function commerce_discount_date_pre_render($fields) {
+  $fields['additional_settings']['discount_date']['commerce_discount_date'] = $fields['commerce_discount_date'];
+  unset($fields['commerce_discount_date']);
+
+  return $fields;
 }
 
 /**
diff --git a/modules/commerce_discount_usage/commerce_discount_usage.module b/modules/commerce_discount_usage/commerce_discount_usage.module
index f3b0198..330b7b6 100644
--- a/modules/commerce_discount_usage/commerce_discount_usage.module
+++ b/modules/commerce_discount_usage/commerce_discount_usage.module
@@ -206,6 +206,23 @@ function commerce_discount_usage_commerce_order_delete($order) {
  */
 function commerce_discount_usage_form_commerce_discount_form_alter(&$form, $form_state) {
   $form['#attached']['css'][] = drupal_get_path('module', 'commerce_discount_usage') . '/css/commerce_discount_usage.css';
+  $form['commerce_discount_fields']['additional_settings']['commerce_discount_usage'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Maximum usage'),
+    '#collapsible' => TRUE,
+  );
+  $form['commerce_discount_fields']['#pre_render'][] = 'commerce_discount_usage_pre_render';
+}
+
+/**
+ * Add fields to the additional_settings vertical tabs container
+ */
+function commerce_discount_usage_pre_render($fields) {
+  $fields['additional_settings']['commerce_discount_usage']['discount_usage_per_person'] = $fields['discount_usage_per_person'];
+  $fields['additional_settings']['commerce_discount_usage']['discount_usage_limit'] = $fields['discount_usage_limit'];
+  unset($fields['discount_usage_per_person'], $fields['discount_usage_limit']);
+
+  return $fields;
 }
 
 /**