diff --git a/commerce_discount.module b/commerce_discount.module
index 208027e..6e1bff5 100644
--- a/commerce_discount.module
+++ b/commerce_discount.module
@@ -315,18 +315,6 @@ function commerce_discount_form_commerce_discount_form_alter(&$form, $form_state
   $form['commerce_discount_type']['#attributes']['class'][] = 'clearfix';
   $form['commerce_discount_fields']['commerce_discount_offer']['#attributes']['class'][] = 'clearfix';
 
-  // 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';
-
   if (empty($form_state['commerce_discount']->discount_id)) {
     // Entity is new.
     return;
@@ -345,17 +333,6 @@ function commerce_discount_form_commerce_discount_form_alter(&$form, $form_state
 }
 
 /**
- * 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;
-}
-
-/**
  * Implements hook_field_widget_form_alter().
  */
 function commerce_discount_field_widget_form_alter(&$element, &$form_state, $context) {
diff --git a/css/commerce_discount.css b/css/commerce_discount.css
index 4da2e5c..1479b1d 100644
--- a/css/commerce_discount.css
+++ b/css/commerce_discount.css
@@ -4,19 +4,6 @@
 .commerce-discount-form {
   position: relative;
 }
-.commerce-discount-form .form-item-status {
-  background-color: #eee;
-  padding: 10px 10px 20px 10px;
-  position: absolute;
-  top: 0;
-  width: 180px;
-}
-[dir="ltr"] .commerce-discount-form .form-item-status {
-  right: 0;
-}
-[dir="rtl"] .commerce-discount-form .form-item-status {
-  left: 0;
-}
 .commerce-discount-form .form-item-label {
   clear: both;
 }
diff --git a/includes/commerce_discount.admin.inc b/includes/commerce_discount.admin.inc
index f17961b..bbc25d9 100644
--- a/includes/commerce_discount.admin.inc
+++ b/includes/commerce_discount.admin.inc
@@ -177,25 +177,7 @@ function commerce_discount_form($form, &$form_state, CommerceDiscount $commerce_
     '#field_suffix' => '</span>&lrm;',
   );
 
-  $form['status'] = array(
-    '#title' => t('Discount status'),
-    '#type' => 'select',
-    '#options' => array(
-      TRUE => t('Active'),
-      FALSE => t('Disabled'),
-    ),
-    '#required' => FALSE,
-    '#default_value' => $commerce_discount->status,
-  );
 
-  // Add the sort order select list.
-  $form['sort_order'] = array(
-    '#type' => 'select',
-    '#title' => t('Sort order'),
-    '#description' => t('Discounts will be sorted by this value to be evaluated in that order.'),
-    '#options' => drupal_map_assoc(range(1, 21)),
-    '#default_value' => !empty($commerce_discount->sort_order) ? $commerce_discount->sort_order : 10,
-  );
 
   // Show a list of commerce discounts.
   $form['commerce_discount_type'] = array(
@@ -216,6 +198,45 @@ function commerce_discount_form($form, &$form_state, CommerceDiscount $commerce_
     '#tree' => TRUE,
     '#parents' => array('commerce_discount_fields'),
   );
+  // Vertical tabs container.
+  $form['commerce_discount_fields']['additional_settings'] = array(
+    '#type' => 'vertical_tabs',
+    '#weight' => 99,
+    'discount_options' => array(
+      '#type' => 'fieldset',
+      '#title' => t('Discount options'),
+      '#collapsible' => TRUE,
+      '#weight' => -10,
+    ),
+    'commerce_discount_compatibility' => array(
+      '#type' => 'fieldset',
+      '#title' => t('Compatibility with other discounts'),
+      '#collapsible' => TRUE,
+    )
+  );
+
+  // Add radios for enabling or disabling this discount.
+  $form['commerce_discount_fields']['additional_settings']['discount_options']['status'] = array(
+    '#title' => t('Discount status'),
+    '#type' => 'radios',
+    '#parents' => array('status'),
+    '#options' => array(
+      TRUE => t('Active'),
+      FALSE => t('Disabled'),
+    ),
+    '#required' => FALSE,
+    '#default_value' => $commerce_discount->status,
+  );
+
+  // Add the sort order select list.
+  $form['commerce_discount_fields']['additional_settings']['discount_options']['sort_order'] = array(
+    '#type' => 'select',
+    '#parents' => array('sort_order'),
+    '#title' => t('Sort order'),
+    '#description' => t('Discounts will be sorted by this value to be evaluated in that order.'),
+    '#options' => drupal_map_assoc(range(1, 21)),
+    '#default_value' => !empty($commerce_discount->sort_order) ? $commerce_discount->sort_order : 10,
+  );
 
   field_attach_form('commerce_discount', $commerce_discount, $form['commerce_discount_fields'], $form_state);
   // Remove the title and surrounding fieldset from the offer reference field.
@@ -254,6 +275,18 @@ function commerce_discount_form($form, &$form_state, CommerceDiscount $commerce_
     ),
   );
 
+  // We have to do some extra adjustments to move compatibility fields into
+  // the vertical tabs.
+  $form['commerce_discount_fields']['additional_settings']['commerce_discount_compatibility']['commerce_compatibility_strategy'] = $form['commerce_discount_fields']['commerce_compatibility_strategy'];
+  $form['commerce_discount_fields']['additional_settings']['commerce_discount_compatibility']['commerce_compatibility_strategy']['#parents'] = array(
+    'commerce_discount_fields', 'commerce_compatibility_strategy',
+  );
+  $form['commerce_discount_fields']['additional_settings']['commerce_discount_compatibility']['commerce_compatibility_selection'] = $form['commerce_discount_fields']['commerce_compatibility_selection'];
+  $form['commerce_discount_fields']['additional_settings']['commerce_discount_compatibility']['commerce_compatibility_selection']['#parents'] = array(
+    'commerce_discount_fields', 'commerce_compatibility_selection',
+  );
+  unset($form['commerce_discount_fields']['commerce_compatibility_strategy'], $form['commerce_discount_fields']['commerce_compatibility_selection']);
+
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
     '#type' => 'submit',
diff --git a/scss/commerce_discount.scss b/scss/commerce_discount.scss
index 35b0808..0bb5045 100644
--- a/scss/commerce_discount.scss
+++ b/scss/commerce_discount.scss
@@ -7,20 +7,6 @@
   // Position the discount status block on top right region.
   position: relative;
 
-  .form-item-status {
-    background-color: #eee;
-    padding: 10px 10px 20px 10px;
-    position: absolute;
-    top: 0;
-    [dir="ltr"] & {
-      right: 0;
-    }
-    [dir="rtl"] & {
-      left: 0;
-    }
-    width: 180px;
-  }
-
   // Reset.
   .form-item-label {
     clear: both;