diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index 3645621..589e6d8 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -1099,11 +1099,6 @@ public function optionsSummary(&$categories, &$options) {
       'desc' => t('Change the way content is formatted.'),
     );
 
-    // This adds a 'Settings' link to the style_options setting if the style has options.
-    if ($style_plugin_instance->usesOptions()) {
-      $options['style']['links']['style_options'] = t('Change settings for this format');
-    }
-
     if ($style_plugin_instance->usesRowPlugin()) {
       $row_plugin_instance = $this->getPlugin('row');
       $row_summary = empty($row_plugin_instance->definition['title']) ? t('Missing style plugin') : $row_plugin_instance->summaryTitle();
@@ -1116,10 +1111,6 @@ public function optionsSummary(&$categories, &$options) {
         'setting' => $row_summary,
         'desc' => t('Change the way each row in the view is styled.'),
       );
-      // This adds a 'Settings' link to the row_options setting if the row style has options.
-      if ($row_plugin_instance->usesOptions()) {
-        $options['row']['links']['row_options'] = t('Change settings for this style');
-      }
     }
     if ($this->usesAJAX()) {
       $options['use_ajax'] = array(
@@ -1596,59 +1587,48 @@ public function buildOptionsForm(&$form, &$form_state) {
         $form['#title'] .= t('How should this view be styled');
         $style_plugin = $this->getPlugin('style');
         $form['style'] =  array(
+          '#title' => t('Select the format'),
           '#type' => 'radios',
           '#options' => views_fetch_plugin_names('style', $this->getType(), array($this->view->storage->get('base_table'))),
           '#default_value' => $style_plugin->definition['id'],
           '#description' => t('If the style you choose has settings, be sure to click the settings button that will appear next to it in the View summary.'),
         );
 
-        if ($style_plugin->usesOptions()) {
-          $form['markup'] = array(
-            '#prefix' => '<div class="form-item description">',
-            '#suffix' => '</div>',
-            '#markup' => t('You may also adjust the !settings for the currently selected style.', array('!settings' => $this->optionLink(t('settings'), 'style_options'))),
-          );
-        }
-
-        break;
-      case 'style_options':
-        $form['#title'] .= t('Style options');
-        $style = TRUE;
         $style_plugin = $this->getOption('style');
         $name = $style_plugin['type'];
 
-      case 'row_options':
-        if (!isset($name)) {
-          $row_plugin = $this->getOption('row');
-          $name = $row_plugin['type'];
-        }
-        // if row, $style will be empty.
-        if (empty($style)) {
-          $form['#title'] .= t('Row style options');
-        }
-        $plugin = $this->getPlugin(empty($style) ? 'row' : 'style', $name);
+        $plugin = $this->getPlugin('style', $name);
         if ($plugin) {
-          $form[$form_state['section']] = array(
+          $form['options'] = array(
+            '#type' => 'fieldset',
+            '#collapsed' => FALSE,
+            '#collapsible' => FALSE,
+            '#title' => t('Options'),
             '#tree' => TRUE,
           );
-          $plugin->buildOptionsForm($form[$form_state['section']], $form_state);
+          $plugin->buildOptionsForm($form['options'], $form_state);
         }
         break;
       case 'row':
         $form['#title'] .= t('How should each row in this view be styled');
         $row_plugin_instance = $this->getPlugin('row');
         $form['row'] =  array(
+          '#title' => t('Select the row format'),
           '#type' => 'radios',
           '#options' => views_fetch_plugin_names('row', $this->getType(), array($this->view->storage->get('base_table'))),
           '#default_value' => $row_plugin_instance->definition['id'],
         );
 
-        if ($row_plugin_instance->usesOptions()) {
-          $form['markup'] = array(
-            '#prefix' => '<div class="form-item description">',
-            '#suffix' => '</div>',
-            '#markup' => t('You may also adjust the !settings for the currently selected row style.', array('!settings' => $this->optionLink(t('settings'), 'row_options'))),
+        $plugin = $this->getPlugin('row');
+        if ($plugin) {
+          $form['options'] = array(
+            '#type' => 'fieldset',
+            '#collapsed' => FALSE,
+            '#collapsible' => FALSE,
+            '#title' => t('Options'),
+            '#tree' => TRUE,
           );
+          $plugin->buildOptionsForm($form['options'], $form_state);
         }
 
         break;
@@ -2244,10 +2224,18 @@ public function submitOptionsForm(&$form, &$form_state) {
 
             // send ajax form to options page if we use it.
             if ($plugin->usesOptions()) {
-              $form_state['view']->addFormToStack('display', $this->display['id'], 'row_options');
+              $form_state['view']->addFormToStack('display', $this->display['id'], 'row');
             }
           }
         }
+
+        $plugin = $this->getPlugin('row');
+        if ($plugin) {
+          $row = $this->getOption('row');
+          $plugin->submitOptionsForm($form['options'], $form_state);
+          $row['options'] = $form_state['values']['options'];
+          $this->setOption('row', $row);
+        }
         break;
       case 'style':
         // This if prevents resetting options to default if they don't change
@@ -2260,29 +2248,18 @@ public function submitOptionsForm(&$form, &$form_state) {
             $this->setOption($section, $row);
             // send ajax form to options page if we use it.
             if ($plugin->usesOptions()) {
-              $form_state['view']->addFormToStack('display', $this->display['id'], 'style_options');
+              $form_state['view']->addFormToStack('display', $this->display['id'], 'style');
             }
           }
         }
-        break;
-      case 'style_options':
         $plugin = $this->getPlugin('style');
         if ($plugin) {
           $style = $this->getOption('style');
-          $plugin->submitOptionsForm($form['style_options'], $form_state);
-          $style['options'] = $form_state['values'][$section];
+          $plugin->submitOptionsForm($form['options'], $form_state);
+          $style['options'] = $form_state['values']['options'];
           $this->setOption('style', $style);
         }
         break;
-      case 'row_options':
-        $plugin = $this->getPlugin('row');
-        if ($plugin) {
-          $row = $this->getOption('row');
-          $plugin->submitOptionsForm($form['row_options'], $form_state);
-          $row['options'] = $form_state['values'][$section];
-          $this->setOption('row', $row);
-        }
-        break;
       case 'exposed_block':
         $this->setOption($section, (bool) $form_state['values'][$section]);
         break;