diff --git a/plugins/display_renderers/panels_renderer_editor.class.php b/plugins/display_renderers/panels_renderer_editor.class.php
index 6c1fce6..ec6c82d 100644
--- a/plugins/display_renderers/panels_renderer_editor.class.php
+++ b/plugins/display_renderers/panels_renderer_editor.class.php
@@ -508,16 +508,26 @@ class panels_renderer_editor extends panels_renderer_standard {
       $output = t('There are no content types you may add to this display.');
     }
     else {
-      $output = '<div class="panels-add-content-modal">';
-      $selector = $this->render_category_selector($categories, $category, $region);
+      $output = '';
 
-      $content = !empty($categories[$category]['content']) ? $categories[$category]['content'] : array();
-      $center = $this->render_category($content, $category, $region);
+      $element = array();
+      $element['categories'] = array(
+        '#type' => 'vertical_tabs',
+      );
+      foreach ($categories as $category => $info) {
+        $content = !empty($categories[$category]['content']) ? $categories[$category]['content'] : array();
+        $center = $this->render_category($content, $category, $region);
+        $element['categories'][$category] = array(
+          '#type' => 'fieldset',
+          '#title' => $info['title'],
+          '#children' => $center,
+        );
+      }
+      $output .= drupal_render($element);
+
+      $selector = $this->render_category_selector($categories, $region);
+      $output .= $selector;
 
-      $output .= '<div class="panels-section-column panels-section-column-categories">'
-        . '<div class="inside">' . $selector . '</div></div>';
-      $output .= $center;
-      $output .= '</div>'; // panels-add-content-modal
     }
 
     $this->commands[] = ctools_modal_command_display($title, $output);
@@ -618,26 +628,9 @@ class panels_renderer_editor extends panels_renderer_standard {
   /**
    * Render the selector widget in the add content modal to select categories.
    */
-  function render_category_selector($categories, $category, $region) {
-    $output = '<div class="panels-categories-box">';
-
-    // Render our list of categories in column 0.
-    foreach ($categories as $key => $category_info) {
-      if ($key == 'root') {
-        continue;
-      }
-
-      $class = 'panels-modal-add-category';
-      if ($key == $category) {
-        $class .= ' active';
-      }
-
-      $url = $this->get_url('select-content', $region, $key);
-      $output .= ctools_ajax_text_button($category_info['title'], $url, '', $class);
-    }
-
-    $output .= '</div>'; // panels-categories-box
-
+  function render_category_selector($categories, $region) {
+    $url = $this->get_url('select-content', $region, $key);
+    $output .= ctools_ajax_text_button($category_info['title'], $url, '', $class);
     if (!empty($categories['root'])) {
       foreach ($categories['root']['content'] as $content_type) {
         $output .= $this->render_add_content_link($region, $content_type);
diff --git a/plugins/task_handlers/panel_context.inc b/plugins/task_handlers/panel_context.inc
index da6b943..2eeebb4 100644
--- a/plugins/task_handlers/panel_context.inc
+++ b/plugins/task_handlers/panel_context.inc
@@ -251,10 +251,6 @@ function panels_panel_context_render($handler, $base_contexts, $args, $test = TR
     return;
   }
 
-  if (isset($handler->handler)) {
-    ctools_context_handler_pre_render($handler, $contexts, $args);
-  }
-
   // Load the display
   $display = panels_panel_context_get_display($handler);