diff --git a/core/modules/views/views_ui/admin.inc b/core/modules/views/views_ui/admin.inc
index 1c67ceb..f2c80ed 100644
--- a/core/modules/views/views_ui/admin.inc
+++ b/core/modules/views/views_ui/admin.inc
@@ -1292,31 +1292,43 @@ function views_ui_add_item_form($form, &$form_state) {
       }
     }
 
+    $rows = array();
     foreach ($grouped_options as $group => $group_options) {
       $zebra = 0;
       foreach ($group_options as $key => $option) {
-        $zebra_class = ($zebra % 2) ? 'odd' : 'even';
-        $form['options']['name'][$key] = array(
-          '#type' => 'checkbox',
-          '#title' => t('!group: !field', array('!group' => $option['group'], '!field' => $option['title'])),
-          '#description' => $option['help'],
-          '#return_value' => $key,
-          '#prefix' => "<div class='$zebra_class filterable-option'>",
-          '#suffix' => '</div>',
-          '#states' => array(
-            'visible' => array(
-              array(
-                ':input[name="group"]' => array('value' => 'all'),
-              ),
-              array(
-                ':input[name="group"]' => array('value' => $group),
-              ),
-            )
-          )
+        $row = array();
+        $row[] = array(
+          'data' => array(
+            '#type' => 'checkbox',
+            '#return_value' => $key,
+          ),
+        );
+        $row[] = $option['title'];
+        $row[] = $option['help'];
+        $row[] = $option['group'];
+        $rows[] = array(
+          'data' => $row,
+          'class' => array(
+            'filterable-option',
+          ),
         );
-        $zebra++;
       }
     }
+    $form['options']['table'] = array(
+      '#theme' => 'table',
+      '#header' => array(
+        '',
+        t('Title'),
+        t('Description'),
+        t('Category'),
+      ),
+      '#rows' => $rows,
+      '#attributes' => array(
+        'class' => array(
+          'views-filterable-options',
+        ),
+      ),
+    );
 
     $form['options']['controls']['group']['#options'] = $groups;
   }
diff --git a/core/modules/views/views_ui/css/views-admin.theme.css b/core/modules/views/views_ui/css/views-admin.theme.css
index d309edc..00b8505 100644
--- a/core/modules/views/views_ui/css/views-admin.theme.css
+++ b/core/modules/views/views_ui/css/views-admin.theme.css
@@ -791,7 +791,6 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 }
 
 .views-filterable-options .form-type-checkbox {
-  border: 1px solid #CCC;
   padding: 5px 8px;
   border-top: none;
 }
diff --git a/core/modules/views/views_ui/js/views-admin.js b/core/modules/views/views_ui/js/views-admin.js
index c5a3fc0..43e7820 100644
--- a/core/modules/views/views_ui/js/views-admin.js
+++ b/core/modules/views/views_ui/js/views-admin.js
@@ -211,7 +211,7 @@
   "use strict";
 
   var $target = jQuery(event.target);
-  var label = jQuery.trim($target.next().text());
+  var label = jQuery.trim($target.closest('td').next().text());
   // Add/remove the checked item to the list.
   if ($target.is(':checked')) {
     this.$selected_div.show();
@@ -372,13 +372,14 @@
   "use strict";
 
   var $ = jQuery;
-  var i, $label, $description, $option;
+  var i, $label, $description, $option, $cell;
   var options = [];
   var length = $allOptions.length;
   for (i = 0; i < length; i++) {
     $option = $($allOptions[i]);
-    $label = $option.find('label');
-    $description = $option.find('div.description');
+    $cell = $option.find('td');
+    $label = $($cell[1]);
+    $description = $($cell[2]);
     options[i] = {
       // Search on the lowercase version of the label text + description.
       'searchText': $label.text().toLowerCase() + " " + $description.text().toLowerCase(),