diff -u b/panels_ipe/css/panels_ipe.css b/panels_ipe/css/panels_ipe.css
--- b/panels_ipe/css/panels_ipe.css
+++ b/panels_ipe/css/panels_ipe.css
@@ -558,6 +558,19 @@
   position: relative;
   text-align: left;
 }
+.panels-ipe-menu ul {
+  list-style: none;
+  padding: 0!important;
+  margin: 0!important;
+}
+.panels-ipe-menu hr {
+  border: 0;
+  margin: 0;
+  background: #ccc;
+}
+.panels-ipe-menu a:hover {
+  text-decoration: none;
+}
 .panels-ipe-menu.opened > ul {
   display: block;
   border-radius: 3px 0 3px 3px;
@@ -603,3 +615,0 @@
-.panels-ipe-menu hr {
-  margin: 0;
-}
diff -u b/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php b/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
--- b/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
+++ b/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
@@ -23,6 +23,7 @@
    */
   public $cache;
 
+
   /**
    * {@inheritdoc}
    */
@@ -75,9 +76,7 @@
         '#type' => 'link',
         '#title' => t('Change layout'),
         '#href' => $this->get_url('change_layout'),
-        '#options' => array(
-          'query' => drupal_get_destination(),
-        ),
+        '#options' => array('query' => drupal_get_destination()),
         '#attributes' => array(
           'class' => array(
             'panels-ipe-change-layout',
@@ -115,16 +114,7 @@
   }
 
   /**
-   * Render panels pane.
-   *
-   * Override & call the parent, then pass output through to the dnd wrapper
-   * theme function.
-   *
-   * @param \stdClass $pane
-   *   Panels pane.
-   *
-   * @return string
-   *   HTML output of the pane.
+   * {@inheritdoc}
    */
   public function render_pane(\stdClass $pane) {
     $output = parent::render_pane($pane);
@@ -190,13 +180,7 @@
   }
 
   /**
-   * Render content of a panel.
-   *
-   * @param \stdClass $pane
-   *   Panels pane.
-   *
-   * @return \stdClass
-   *   Pane content object.
+   * {@inheritdoc}
    */
   public function render_pane_content(\stdClass $pane) {
     if (!empty($pane->shown) && panels_pane_access($pane, $this->display)) {
@@ -229,13 +213,7 @@
   /**
    * Add an "empty" pane placeholder above all the normal panes.
    *
-   * @param string $region_id
-   *   The ID of a region.
-   * @param array $panes
-   *   An array with panes.
-   *
-   * @return string
-   *   HTML output of a region.
+   * {@inheritdoc}
    */
   public function render_region($region_id, array $panes) {
     // Generate this region's 'empty' placeholder pane from the IPE plugin.
@@ -328,8 +306,8 @@
       'layout' => $this->plugins['layout'],
     );
 
+    $output = drupal_build_form('panels_ipe_edit_control_form', $form_state);
     if (empty($form_state['executed'])) {
-      $output = drupal_build_form('panels_ipe_edit_control_form', $form_state);
       // At this point, we want to save the cache to ensure that we have a lock.
       $this->cache->ipe_locked = TRUE;
 
diff -u b/plugins/display_renderers/panels_renderer_editor.class.php b/plugins/display_renderers/panels_renderer_editor.class.php
--- b/plugins/display_renderers/panels_renderer_editor.class.php
+++ b/plugins/display_renderers/panels_renderer_editor.class.php
@@ -11,19 +11,19 @@
    * An array of AJAX commands to return. If populated it will automatically
    * be used by the AJAX router.
    */
-  var $commands = array();
-  var $admin = TRUE;
+  public $commands = array();
+  public $admin = TRUE;
 
   /**
    * Set to true if edit links (for panes and regions) should not be displayed.
    * This can be used for special edit modes such as layout change and layout
    * builder that do not actually have real content.
    */
-  var $no_edit_links = FALSE;
+  public $no_edit_links = FALSE;
   // -------------------------------------------------------------------------
   // Display edit rendering.
 
-  function edit() {
+  public function edit() {
     $form_state = array(
       'display' => &$this->display,
       'renderer' => &$this,
@@ -50,7 +50,7 @@
     return $this->display;
   }
 
-  function add_meta() {
+  public function add_meta() {
     parent::add_meta();
     if ($this->admin) {
       ctools_include('ajax');
@@ -64,7 +64,7 @@
     }
   }
 
-  function render() {
+  public function render() {
     // Pass through to normal rendering if not in admin mode.
     if (!$this->admin) {
       return parent::render();
@@ -79,7 +79,7 @@
     return $output;
   }
 
-  function render_region($region_id, $panes) {
+  public function render_region($region_id, array $panes) {
     // Pass through to normal rendering if not in admin mode.
     if (!$this->admin) {
       return parent::render_region($region_id, $panes);
@@ -98,7 +98,7 @@
     return $output;
   }
 
-  function render_pane(&$pane) {
+  public function render_pane(\stdClass $pane) {
     // Pass through to normal rendering if not in admin mode.
     if (!$this->admin) {
       return parent::render_pane($pane);
@@ -122,7 +122,7 @@
     $block = new stdClass();
     if (empty($content_type)) {
       $block->title = '<em>' . t('Missing content type') . '</em>';
-      $block->content = t('This pane\'s content type is either missing or has been deleted. This pane will not render.');
+      $block->content = t("This pane's content type is either missing or has been deleted. This pane will not render.");
     }
     else {
       $block = ctools_content_admin_info($content_type, $pane->subtype, $pane->configuration, $this->display->context);
@@ -135,12 +135,11 @@
         $settings['Panels']['RegionLock'][$pane->pid] = $pane->locks['regions'];
         drupal_add_js($settings, 'setting');
       }
-      else if ($pane->locks['type'] == 'immovable') {
+      elseif ($pane->locks['type'] == 'immovable') {
         $grabber_class = 'grab-title not-grabber';
       }
     }
 
-    $output = '';
     $class = 'panel-pane';
 
     if (empty($pane->shown)) {
@@ -179,10 +178,9 @@
    *
    * This is abstracted out since we have styles on both panes and regions.
    */
-  function get_style_links($type, $id = NULL) {
+  public function get_style_links($type, $id = NULL) {
     $info = $this->get_style($type, $id);
     $style = $info[0];
-    $conf = $info[1];
 
     $style_title = isset($style['title']) ? $style['title'] : t('Default');
 
@@ -214,7 +212,7 @@
    *
    * This is abstracted out for easy ajax replacement.
    */
-  function get_display_links() {
+  public function get_display_links() {
     $links = array();
 
     if (user_access('administer panels styles')) {
@@ -266,7 +264,7 @@
   /**
    * Render the links to display when editing a region.
    */
-  function get_region_links($region_id) {
+  public function get_region_links($region_id) {
     if (!empty($this->no_edit_links)) {
       return '';
     }
@@ -541,7 +539,7 @@
   /**
    * Generate a URL path for the AJAX editor.
    */
-  function get_url() {
+  public function get_url() {
     $args = func_get_args();
     $command = array_shift($args);
     $url = 'panels/ajax/' . $this->plugin['name'] . '/' . $command . '/' . $this->display->cache_key;
@@ -555,7 +553,7 @@
   /**
    * AJAX command to show a pane.
    */
-  function ajax_show($pid = NULL) {
+  public function ajax_show($pid = NULL) {
     if (empty($this->display->content[$pid])) {
       ctools_ajax_render_error(t('Invalid pane id.'));
     }
@@ -569,7 +567,7 @@
   /**
    * AJAX command to show a pane.
    */
-  function ajax_hide($pid = NULL) {
+  public function ajax_hide($pid = NULL) {
     if (empty($this->display->content[$pid])) {
       ctools_ajax_render_error(t('Invalid pane id.'));
     }
@@ -583,7 +581,7 @@
   /**
    * AJAX command to present a dialog with a list of available content.
    */
-  function ajax_select_content($region = NULL, $category = NULL) {
+  public function ajax_select_content($region = NULL, $category = NULL) {
     if (!array_key_exists($region, $this->plugins['layout']['regions'])) {
       ctools_modal_render(t('Error'), t('Invalid input'));
     }
@@ -607,11 +605,11 @@
    *
    * @todo -- this should be in CTools.
    */
-  function get_category($content_type) {
+  public function get_category($content_type) {
     if (!empty($content_type['top level'])) {
       $category = 'root';
     }
-    else if (isset($content_type['category'])) {
+    elseif (isset($content_type['category'])) {
       if (is_array($content_type['category'])) {
         list($category, $weight) = $content_type['category'];
       }
@@ -626,7 +624,6 @@
     return array(preg_replace('/[^a-z0-9]/', '-', strtolower($category)), $category);
   }
 
-
   /**
    * Create a list of categories from all of the content type.
    *
@@ -638,7 +635,7 @@
    *   found in the content array. They will be keyed by the title so that they
    *   can be sorted.
    */
-  function get_categories($content_types) {
+  public function get_categories($content_types) {
     $categories = array();
     $category_names = array();
 
@@ -679,7 +676,7 @@
   /**
    * AJAX entry point to add a new pane.
    */
-  function ajax_add_pane($region = NULL, $type_name = NULL, $subtype_name = NULL, $step = NULL) {
+  public function ajax_add_pane($region = NULL, $type_name = NULL, $subtype_name = NULL, $step = NULL) {
     $content_type = ctools_get_content_type($type_name);
     $subtype = ctools_content_get_subtype($content_type, $subtype_name);
 
@@ -732,17 +729,17 @@
       $pane = $form_state['pane'];
       unset($this->cache->new_pane);
 
-      // Add the pane to the display
+      // Add the pane to the display.
       $this->display->add_pane($pane, $region);
       panels_edit_cache_set($this->cache);
 
-      // Tell the client to draw the pane
+      // Tell the client to draw the pane.
       $this->command_add_pane($pane);
 
       // Dismiss the modal.
       $this->commands[] = ctools_modal_command_dismiss();
     }
-    else if (!empty($form_state['cancel'])) {
+    elseif (!empty($form_state['cancel'])) {
       // If cancelling, return to the activity.
       list($category_key, $category) = $this->get_category($subtype);
       $this->ajax_select_content($region, $category_key);
@@ -756,7 +753,7 @@
   /**
    * AJAX entry point to edit a pane.
    */
-  function ajax_edit_pane($pid = NULL, $step = NULL) {
+  public function ajax_edit_pane($pid = NULL, $step = NULL) {
     if (empty($this->cache->display->content[$pid])) {
       ctools_modal_render(t('Error'), t('Invalid pane id.'));
     }
@@ -785,18 +782,19 @@
       'cancel callback' => 'panels_ajax_edit_pane_cancel',
     );
 
-    $output = ctools_content_form('edit', $form_info, $form_state, $content_type, $pane->subtype,  $subtype, $pane->configuration, $step);
+    $output = ctools_content_form('edit', $form_info, $form_state, $content_type, $pane->subtype, $subtype, $pane->configuration, $step);
 
     // If $rc is FALSE, there was no actual form.
     if ($output === FALSE || !empty($form_state['cancel'])) {
       // Dismiss the modal.
       $this->commands[] = ctools_modal_command_dismiss();
     }
-    else if (!empty($form_state['complete'])) {
+    elseif (!empty($form_state['complete'])) {
       // References get blown away with AJAX caching. This will fix that.
       $this->cache->display->content[$pid] = $form_state['pane'];
 
-      // Conditionally overwrite the context for this panel if present in the form state.
+      // Conditionally overwrite the context for this panel if present
+      // in the form state.
       if (!empty($form_state['display_cache']->display->context)) {
         $this->cache->display->context = $form_state['display_cache']->display->context;
       }
@@ -817,7 +815,7 @@
    * @param string $pid
    *   The pane id for the pane object whose title state we're setting.
    */
-  function ajax_panel_title($pid = NULL) {
+  public function ajax_panel_title($pid = NULL) {
     if (empty($this->display->content[$pid])) {
       ctools_ajax_render_error(t('Invalid pane id.'));
     }
@@ -843,7 +841,7 @@
    *   Either a pane id for a pane in the display, or 'display' to edit the
    *   display cache settings.
    */
-  function ajax_cache_method($pid = NULL) {
+  public function ajax_cache_method($pid = NULL) {
     ctools_include('content');
     // This lets us choose whether we're doing the display's cache or
     // a pane's.
@@ -851,7 +849,7 @@
       $conf = &$this->display->cache;
       $title = t('Cache method for this display');
     }
-    else if (!empty($this->display->content[$pid])) {
+    elseif (!empty($this->display->content[$pid])) {
       $pane = &$this->display->content[$pid];
       $subtype = ctools_content_get_subtype($pane->type, $pane->subtype);
       $conf = &$pane->cache;
@@ -895,8 +893,10 @@
     else {
       $this->cache->method = $form_state['method'];
       panels_edit_cache_set($this->cache);
-      // send them to next form.
-      return $this->ajax_cache_settings($pid);
+      // Send them to next form.
+      $this->ajax_cache_settings($pid);
+
+      return;
     }
   }
 
@@ -907,7 +907,7 @@
    *   Either a pane id for a pane in the display, or 'display' to edit the
    *   display cache settings.
    */
-  function ajax_cache_settings($pid = 0) {
+  public function ajax_cache_settings($pid = 0) {
     ctools_include('content');
 
     // This lets us choose whether we're doing the display's cache or
@@ -916,7 +916,7 @@
       $conf = &$this->display->cache;
       $title = t('Cache settings for this display');
     }
-    else if (!empty($this->display->content[$pid])) {
+    elseif (!empty($this->display->content[$pid])) {
       $pane = &$this->display->content[$pid];
       $subtype = ctools_content_get_subtype($pane->type, $pane->subtype);
 
@@ -968,7 +968,7 @@
    * @param $pid
    *   The pane id, if a pane. The region id, if a region.
    */
-  function ajax_style_type($type, $pid = NULL) {
+  public function ajax_style_type($type, $pid = NULL) {
     // This lets us choose whether we're doing the display's cache or
     // a pane's.
     switch ($type) {
@@ -997,7 +997,6 @@
         ctools_modal_render(t('Error'), t('Invalid pane id.'));
     }
     $info = $this->get_style($type, $pid);
-    $style_plugin = $info[0];
     $style_settings = $info[1];
 
     // Backward compatibility: Translate old-style stylizer to new style
@@ -1031,7 +1030,7 @@
       }
 
       // If there's no settings form, just change the style and exit.
-      switch($type) {
+      switch ($type) {
         case 'display':
           $this->display->panel_settings['style'] = $form_state['style'];
           if (isset($this->display->panel_settings['style_settings']['default'])) {
@@ -1061,7 +1060,7 @@
       if ($type == 'pane') {
         $this->command_update_pane($pane);
       }
-      else if ($type == 'region') {
+      elseif ($type == 'region') {
         $this->command_update_region_links($pid);
       }
       else {
@@ -1074,7 +1073,7 @@
         panels_edit_cache_set($this->cache);
       }
 
-      // send them to next form.
+      // Send them to next form.
       return $this->ajax_style_settings($type, $pid);
     }
   }
@@ -1086,7 +1085,7 @@
    * they are stored differently, we use this method to simplify getting
    * style information into a way that's easy to cope with.
    */
-  function get_style($type, $pid = '') {
+  public function get_style($type, $pid = '') {
     if (isset($this->cache->style)) {
       $style = panels_get_style($this->cache->style);
       $defaults = isset($style['defaults']) ? $style['defaults'] : array();
@@ -1161,7 +1160,7 @@
    * @param $pid
    *   The pane id, if a pane. The region id, if a region.
    */
-  function ajax_style_settings($type, $pid = '') {
+  public function ajax_style_settings($type, $pid = '') {
     $info = $this->get_style($type, $pid);
     $style = $info[0];
     $conf = &$info[1];
@@ -1213,11 +1212,11 @@
     }
 
     // Copy settings from form state back into the cache.
-    if(!empty($form_state['values']['settings'])) {
+    if (!empty($form_state['values']['settings'])) {
       if ($type == 'pane') {
         $this->cache->display->content[$pid]->style['settings'] = $form_state['values']['settings'];
       }
-      else if($type == 'region') {
+      elseif($type == 'region') {
         $this->cache->display->panel_settings['style_settings'][$pid] = $form_state['values']['settings'];
       }
     }
@@ -1243,7 +1242,7 @@
    * @param $pid
    *   The pane id to edit.
    */
-  function ajax_pane_css($pid = NULL) {
+  public function ajax_pane_css($pid = NULL) {
     if (empty($this->display->content[$pid])) {
       ctools_modal_render(t('Error'), t('Invalid pane id.'));
     }
@@ -1275,7 +1274,7 @@
    * @param $pid
    *   The pane id to edit.
    */
-  function ajax_lock($pid = NULL) {
+  public function ajax_lock($pid = NULL) {
     if (empty($this->display->content[$pid])) {
       ctools_modal_render(t('Error'), t('Invalid pane id.'));
     }
@@ -1307,7 +1306,7 @@
    * @param $pid
    *   The pane id to edit.
    */
-  function ajax_access_settings($pid = NULL) {
+  public function ajax_access_settings($pid = NULL) {
     if (empty($this->display->content[$pid])) {
       ctools_modal_render(t('Error'), t('Invalid pane id.'));
     }
@@ -1336,7 +1335,7 @@
   /**
    * AJAX entry point for to add a visibility rule.
    */
-  function ajax_access_add_test($pid = NULL) {
+  public function ajax_access_add_test($pid = NULL) {
     if (empty($this->display->content[$pid])) {
       ctools_modal_render(t('Error'), t('Invalid pane id.'));
     }
@@ -1368,7 +1367,7 @@
   /**
    * AJAX entry point for to configure vsibility rule.
    */
-  function ajax_access_configure_test($pid = NULL, $id = NULL) {
+  public function ajax_access_configure_test($pid = NULL, $id = NULL) {
     if (empty($this->display->content[$pid])) {
       ctools_modal_render(t('Error'), t('Invalid pane id.'));
     }
@@ -1386,7 +1385,7 @@
       $pane->access['plugins'][] = $this->cache->new_plugin;
       $id = max(array_keys($pane->access['plugins']));
     }
-    else if (empty($pane->access['plugins'][$id])) {
+    elseif (empty($pane->access['plugins'][$id])) {
       ctools_modal_render(t('Error'), t('Invalid test id.'));
     }
 
@@ -1427,7 +1426,7 @@
    * This allows those layouts to simply declare their callbacks and use
    * them with $this->get_url('layout', $command).
    */
-  function ajax_layout() {
+  public function ajax_layout() {
     $args = func_get_args();
     if (empty($args)) {
       return MENU_NOT_FOUND;
@@ -1453,7 +1452,7 @@
    * This allows those layouts to simply declare their callbacks and use
    * them using $this->get_url('style', $command, $type, $pid).
    */
-  function ajax_style() {
+  public function ajax_style() {
     $args = func_get_args();
     if (count($args) < 3) {
       return MENU_NOT_FOUND;
@@ -1486,7 +1485,7 @@
   /**
    * Create a command array to redraw a pane.
    */
-  function command_update_pane($pid) {
+  public function command_update_pane($pid) {
     if (is_object($pid)) {
       $pane = $pid;
     }
@@ -1501,7 +1500,7 @@
   /**
    * Create a command array to add a new pane.
    */
-  function command_add_pane($pid) {
+  public function command_add_pane($pid) {
     if (is_object($pid)) {
       $pane = $pid;
     }
@@ -1516,14 +1515,14 @@
   /**
    * Create a command to update the links on a display after a change was made.
    */
-  function command_update_display_links() {
+  public function command_update_display_links() {
     $this->commands[] = ajax_command_replace('.panels-display-links', $this->get_display_links());
   }
 
   /**
    * Create a command to update the links on a region after a change was made.
    */
-  function command_update_region_links($id) {
+  public function command_update_region_links($id) {
     $this->commands[] = ajax_command_replace('.panels-region-links-' . $id, $this->get_region_links($id));
   }
 }
only in patch2:
unchanged:
--- a/plugins/display_renderers/panels_renderer_standard.class.php
+++ b/plugins/display_renderers/panels_renderer_standard.class.php
@@ -61,7 +61,7 @@ class panels_renderer_standard {
    *
    * @var panels_display
    */
-  var $display;
+  public $display;
 
   /**
    * An associative array of loaded plugins. Used primarily as a central
@@ -73,7 +73,7 @@ class panels_renderer_standard {
    *
    * @var array
    */
-  var $plugins = array();
+  public $plugins = array();
 
   /**
    * A multilevel array of rendered data. The first level of the array
@@ -87,7 +87,7 @@ class panels_renderer_standard {
    *
    * @var array
    */
-  var $rendered = array();
+  public $rendered = array();
 
   /**
    * A multilevel array of data prepared for rendering. The first level of the
@@ -101,7 +101,7 @@ class panels_renderer_standard {
    *
    * @var array
    */
-  var $prepared = array();
+  public $prepared = array();
 
   /**
    * Boolean state variable, indicating whether or not the prepare() method has
@@ -112,12 +112,12 @@ class panels_renderer_standard {
    *
    * @var bool
    */
-  var $prep_run = FALSE;
+  public $prep_run = FALSE;
 
   /**
    * The plugin that defines this handler.
    */
-  var $plugin = FALSE;
+  public $plugin = FALSE;
 
   /**
    * TRUE if this renderer is rendering in administrative mode
@@ -125,7 +125,7 @@ class panels_renderer_standard {
    *
    * @var bool
    */
-  var $admin = FALSE;
+  public $admin = FALSE;
 
   /**
    * Where to add standard meta information. There are three possibilities:
@@ -135,21 +135,21 @@ class panels_renderer_standard {
    *
    * @var string
    */
-  var $meta_location = 'standard';
+  public $meta_location = 'standard';
 
   /**
    * Include rendered HTML prior to the layout.
    *
    * @var string
    */
-  var $prefix = '';
+  public $prefix = '';
 
   /**
    * Include rendered HTML after the layout.
    *
    * @var string
    */
-  var $suffix = '';
+  public $suffix = '';
 
   /**
    * Receive and store the display object to be rendered.
@@ -162,7 +162,7 @@ class panels_renderer_standard {
    * @param panels_display $display
    *   The panels display object to be rendered.
    */
-  function init($plugin, &$display) {
+  public function init($plugin, &$display) {
     $this->plugin = $plugin;
     $layout = panels_get_layout($display->layout);
     $this->display = &$display;
@@ -191,7 +191,7 @@ class panels_renderer_standard {
    *  settings for use in the preparation process. Not used in the default
    *  renderer, but included for interface consistency.
    */
-  function prepare($external_settings = NULL) {
+  public function prepare($external_settings = NULL) {
     $this->prepare_panes($this->display->content);
     $this->prepare_regions($this->display->panels, $this->display->panel_settings);
     $this->prep_run = TRUE;
@@ -215,7 +215,7 @@ class panels_renderer_standard {
    *  An associative array of panes to be rendered, keyed on pane id and sorted
    *  into proper rendering order.
    */
-  function prepare_panes($panes) {
+  public function prepare_panes($panes) {
     ctools_include('content');
     // Use local variables as writing to them is very slightly faster
     $first = $normal = $last = array();
@@ -250,7 +250,7 @@ class panels_renderer_standard {
       // If it wants to render first, add it to the $first array. This is used
       // by panes that need to do some processing before other panes are
       // rendered.
-      else if (!empty($content_type['render first'])) {
+      elseif (!empty($content_type['render first'])) {
         $first[$pid] = $pane;
       }
       // Otherwise, render it in the normal order.
@@ -299,7 +299,7 @@ class panels_renderer_standard {
    * @return array
    *   An array of regions prepared for rendering.
    */
-  function prepare_regions($region_pane_list, $settings) {
+  public function prepare_regions($region_pane_list, $settings) {
     // Initialize defaults to be used for regions without their own explicit
     // settings. Use display settings if they exist, else hardcoded defaults.
     $default = array(
@@ -349,7 +349,7 @@ class panels_renderer_standard {
    * @return string
    *  Themed & rendered HTML output.
    */
-  function render() {
+  public function render() {
     // Let the display refer back to the renderer.
     $this->display->renderer_handler = $this;
 
@@ -382,7 +382,7 @@ class panels_renderer_standard {
    * @return string
    *   The HTML string representing the entire rendered, themed panel.
    */
-  function render_layout() {
+  public function render_layout() {
     if (empty($this->prep_run)) {
       $this->prepare();
     }
@@ -406,7 +406,7 @@ class panels_renderer_standard {
    * This must be done before render, because panels-within-panels must have
    * their CSS added in the right order: inner content before outer content.
    */
-  function add_meta() {
+  public function add_meta() {
     global $theme;
 
     if (!empty($this->plugins['layout']['css'])) {
@@ -454,7 +454,7 @@ class panels_renderer_standard {
    *
    * @see drupal_add_css
    */
-  function add_css($filename) {
+  public function add_css($filename) {
     switch ($this->meta_location) {
       case 'standard':
         drupal_add_css($filename);
@@ -473,7 +473,7 @@ class panels_renderer_standard {
    * @return array
    *   The array of rendered panes, keyed on pane pid.
    */
-  function render_panes() {
+  public function render_panes() {
     ctools_include('content');
 
     // First, render all the panes into little boxes.
@@ -494,10 +494,13 @@ class panels_renderer_standard {
    * an individual pane can be bubbled up to take over the title for the entire
    * display.
    *
-   * @param stdClass $pane
+   * @param \stdClass $pane
    *  A Panels pane object, as loaded from the database.
+   *
+   * @return string
+   *   HTML output of the pane content.
    */
-  function render_pane(&$pane) {
+  public function render_pane(\stdClass $pane) {
     module_invoke_all('panels_pane_prerender', $pane);
 
     $content = $this->render_pane_content($pane);
@@ -539,13 +542,13 @@ class panels_renderer_standard {
    * This method retrieves pane content and produces a ready-to-render content
    * object. It also manages pane-specific caching.
    *
-   * @param stdClass $pane
+   * @param \stdClass $pane
    *   A Panels pane object, as loaded from the database.
-   * @return stdClass $content
+   * @return \stdClass $content
    *   A renderable object, containing a subject, content, etc. Based on the
    *   renderable objects used by the block system.
    */
-  function render_pane_content(&$pane) {
+  public function render_pane_content(\stdClass $pane) {
     ctools_include('context');
     // TODO finally safe to remove this check?
     if (!is_array($this->display->context)) {
@@ -600,13 +603,12 @@ class panels_renderer_standard {
    * @return array
    *   An array of rendered panel regions, keyed on the region name.
    */
-  function render_regions() {
+  public function render_regions() {
     $this->rendered['regions'] = array();
 
     // Loop through all panel regions, put all panes that belong to the current
     // region in an array, then render the region. Primarily this ensures that
     // the panes are arranged in the proper order.
-    $content = array();
     foreach ($this->prepared['regions'] as $region_id => $conf) {
       $region_panes = array();
       foreach ($conf['pids'] as $pid) {
@@ -627,15 +629,15 @@ class panels_renderer_standard {
    * Primarily just a passthrough to the panel region rendering callback
    * specified by the style plugin that is attached to the current panel region.
    *
-   * @param $region_id
+   * @param string $region_id
    *   The ID of the panel region being rendered
-   * @param $panes
+   * @param array $panes
    *   An array of panes that are assigned to the panel that's being rendered.
    *
    * @return string
    *   The rendered, HTML string output of the passed-in panel region.
    */
-  function render_region($region_id, $panes) {
+  public function render_region($region_id, array $panes) {
     $style = $this->prepared['regions'][$region_id]['style'];
     $style_settings = $this->prepared['regions'][$region_id]['style settings'];