diff --git a/module/chart/view/preview.html.php b/module/chart/view/preview.html.php
index e007da1ad6..1d68f0867f 100644
--- a/module/chart/view/preview.html.php
+++ b/module/chart/view/preview.html.php
@@ -44,31 +44,33 @@
 
 <div id="mainContent" class='main-row'>
   <div class='side-col col-lg'>
-    <div class='panel'>
-      <div class='panel-heading'>
-        <div class='panel-title'><?php echo isset($group->name) ? $group->name : '';?></div>
-      </div>
-      <div class='panel-body'>
-        <?php if(!$chartTree):?>
-        <hr class="space">
-        <div class="text-center text-muted">
-          <?php echo $lang->chart->noChart;?>
+    <div class="cell">
+      <div class='panel'>
+        <div class='panel-heading text-ellipsis'>
+          <div class='panel-title'><?php echo isset($group->name) ? $group->name : '';?></div>
         </div>
-        <hr class="space">
-        <?php elseif($chartTree):?>
-        <form method='post'>
-          <?php echo $chartTree;?>
-          <div class='btn-toolbar'>
-            <?php echo html::selectAll();?>
-            <?php echo html::submitButton($lang->chart->preview, '', 'btn btn-primary');?>
+        <div class='panel-body'>
+          <?php if(!$chartTree):?>
+          <hr class="space">
+          <div class="text-center text-muted">
+            <?php echo $lang->chart->noChart;?>
           </div>
-        </form>
-        <?php endif;?>
-        <?php if($this->config->edition == 'open'):?>
-        <div class='text biz-version'>
-          <span class='text-important'><?php echo (!empty($config->isINT)) ? $lang->bizVersionINT : $lang->bizVersion;?></span>
+          <hr class="space">
+          <?php elseif($chartTree):?>
+          <form method='post'>
+            <?php echo $chartTree;?>
+            <div class='btn-toolbar'>
+              <?php echo html::selectAll();?>
+              <?php echo html::submitButton($lang->chart->preview, '', 'btn btn-primary');?>
+            </div>
+          </form>
+          <?php endif;?>
+          <?php if($this->config->edition == 'open'):?>
+          <div class='text biz-version'>
+            <span class='text-important'><?php echo (!empty($config->isINT)) ? $lang->bizVersionINT : $lang->bizVersion;?></span>
+          </div>
+          <?php endif;?>
         </div>
-        <?php endif;?>
       </div>
     </div>
   </div>
diff --git a/module/pivot/view/preview.html.php b/module/pivot/view/preview.html.php
index cb4733fd1a..a86fac7ec3 100644
--- a/module/pivot/view/preview.html.php
+++ b/module/pivot/view/preview.html.php
@@ -1,18 +1,18 @@
 <?php include '../../common/view/header.html.php';?>
 <script>
-$('#subNavbar li').not('[data-id=<?php echo $group;?>]').removeClass('active');
+$('#subNavbar li').not('[data-id=<?php echo $groupID;?>]').removeClass('active');
 </script>
 <?php if($this->config->edition != 'open'):?>
 <style>#mainContent > .side-col.col-lg{width: 210px}</style>
 <style>.hide-sidebar #sidebar{width: 0 !important}</style>
 <?php endif;?>
 <?php js::set('dimension', $dimension);?>
-<?php js::set('group', $group);?>
+<?php js::set('groupID', $groupID);?>
 
 <div id='mainMenu' class='clearfix main-position'>
   <div class="btn-toolbar pull-left parent-position">
     <?php foreach($lang->pivot->featureBar['preview'] as $key => $label):?>
-    <?php $active = ($key == $group) ? ' btn-active-text' : '';?>
+    <?php $active = ($key == $groupID) ? ' btn-active-text' : '';?>
     <?php echo html::a(inlink('preview', "dimension=$dimension&group=$key"), "<span class='text'>$label</span>", '', "class='btn btn-link {$active}'");?>
     <?php endforeach;?>
   </div>
@@ -37,8 +37,8 @@ $('#subNavbar li').not('[data-id=<?php echo $group;?>]').removeClass('active');
     </div>
     <div class="cell">
       <div class='panel'>
-        <div class='panel-heading'>
-          <div class='panel-title'><?php echo $lang->pivot->list;?></div>
+        <div class='panel-heading text-ellipsis'>
+          <div class='panel-title'><?php echo isset($group->name) ? $group->name : '';?></div>
         </div>
         <div class='panel-body'>
           <div class='list-group'>
diff --git a/module/pivot/zen.php b/module/pivot/zen.php
index 2134c4c5a0..0b7dd2a328 100644
--- a/module/pivot/zen.php
+++ b/module/pivot/zen.php
@@ -5,27 +5,28 @@ class pivotZen extends pivot
      * Prepare for preview a pivot.
      *
      * @param  int    $dimension
-     * @param  string $group
+     * @param  string $groupID
      * @param  string $module
      * @param  string $method
      * @param  string $params
      * @access public
      * @return void
      */
-    public function prepare4Preview($dimension, $group, $module, $method, $params)
+    public function prepare4Preview($dimension, $groupID, $module, $method, $params)
     {
         $params = helper::safe64Decode($params);
 
-        if(!$group) $group = $this->getDefaultGroup($dimension);
-        if(!$module || !$method) list($module, $method, $params) = $this->getDefaultPivotParams($dimension, $group);
+        if(!$groupID) $groupID = $this->getDefaultGroup($dimension);
+        if(!$module || !$method) list($module, $method, $params) = $this->getDefaultPivotParams($dimension, $groupID);
 
         if(!empty($module) && !empty($method) && $method != 'show' && !common::hasPriv($module, $method)) $this->loadModel('common')->deny('pivot', $method);
 
         $this->setFeatureBar($dimension);
 
-        $this->view->sidebar   = $this->getSidebar($dimension, $group, $module, $method, $params);
+        $this->view->sidebar   = $this->getSidebar($dimension, $groupID, $module, $method, $params);
         $this->view->dimension = $dimension;
-        $this->view->group     = $group;
+        $this->view->groupID   = $groupID;
+        $this->view->group     = $this->loadModel('tree')->getByID($groupID);
         $this->view->module    = $module;
         $this->view->method    = $method;
         $this->view->params    = $params;
@@ -199,19 +200,19 @@ class pivotZen extends pivot
 
             foreach($pivots as $pivot)
             {
-                $class     = '';
+                $class     = "pivot-{$pivot->id}";
                 $pivotName = $pivot->name;
                 $params    = helper::safe64Encode("dimensionID=$pivot->dimension&groupID=$pivot->group&pivotID=$pivot->id");
 
                 if($module == 'pivot' && $method == 'show' && $pivotID == $pivot->id)
                 {
-                    $class = "class='active'";
+                    $class .= ' active';
 
                     $this->view->title = $pivotName;
                 }
 
                 $pivotLink = helper::createLink('pivot', 'preview', "dimension=$dimension&group=$currentGroup->id&module=pivot&method=show&params=$params");
-                $sidebar  .= "<li $class>" . html::a($pivotLink, $pivotName, '', "title='$pivotName'") . '</li>';
+                $sidebar  .= "<li class='$class'>" . html::a($pivotLink, $pivotName, '', "title='$pivotName'") . '</li>';
             }
 
             if($group->grade == 2) $sidebar .= '</ul></li>';