diff --git a/module/pivot/js/preview.js b/module/pivot/js/preview.js
index ac74bd3af1..b4373f1e43 100644
--- a/module/pivot/js/preview.js
+++ b/module/pivot/js/preview.js
@@ -315,3 +315,9 @@ function isQueryFilter(filters)
 {
     return filters.length > 0 && filters[0].from == 'query';
 }
+
+function locate(module, method, params)
+{
+    var link = createLink(module, method, params);
+    window.location.href = link;
+}
diff --git a/module/pivot/lang/de.php b/module/pivot/lang/de.php
index 25378fd3b2..5e8b1a4f56 100644
--- a/module/pivot/lang/de.php
+++ b/module/pivot/lang/de.php
@@ -20,6 +20,7 @@ $lang->pivot->design       = 'Design pivot';
 $lang->pivot->export       = 'Export pivot';
 $lang->pivot->query        = 'Query';
 $lang->pivot->browseAction = 'Design in Pivot Table';
+$lang->pivot->designAB     = 'Design';
 
 $lang->pivot->id          = 'ID';
 $lang->pivot->name        = 'Name';
diff --git a/module/pivot/lang/en.php b/module/pivot/lang/en.php
index ba3240852d..a4f92a6871 100644
--- a/module/pivot/lang/en.php
+++ b/module/pivot/lang/en.php
@@ -20,6 +20,7 @@ $lang->pivot->design       = 'Design pivot';
 $lang->pivot->export       = 'Export pivot';
 $lang->pivot->query        = 'Query';
 $lang->pivot->browseAction = 'Design in Pivot Table';
+$lang->pivot->designAB     = 'Design';
 
 $lang->pivot->id          = 'ID';
 $lang->pivot->name        = 'Name';
diff --git a/module/pivot/lang/fr.php b/module/pivot/lang/fr.php
index 7f98262e58..9d550e0866 100644
--- a/module/pivot/lang/fr.php
+++ b/module/pivot/lang/fr.php
@@ -20,6 +20,7 @@ $lang->pivot->design       = 'Design pivot';
 $lang->pivot->export       = 'Export pivot';
 $lang->pivot->query        = 'Query';
 $lang->pivot->browseAction = 'Design in Pivot Table';
+$lang->pivot->designAB     = 'Design';
 
 $lang->pivot->id          = 'ID';
 $lang->pivot->name        = 'Name';
diff --git a/module/pivot/lang/vi.php b/module/pivot/lang/vi.php
index 1dcef985a8..34c11436c2 100644
--- a/module/pivot/lang/vi.php
+++ b/module/pivot/lang/vi.php
@@ -10,6 +10,7 @@ $lang->pivot->design       = 'Design pivot';
 $lang->pivot->export       = 'Export pivot';
 $lang->pivot->query        = 'Query';
 $lang->pivot->browseAction = 'Design in Pivot Table';
+$lang->pivot->designAB     = 'Design';
 
 $lang->pivot->id          = 'ID';
 $lang->pivot->name        = 'Name';
diff --git a/module/pivot/lang/zh-cn.php b/module/pivot/lang/zh-cn.php
index 64ae2184b8..f7d5c2a6f2 100644
--- a/module/pivot/lang/zh-cn.php
+++ b/module/pivot/lang/zh-cn.php
@@ -20,6 +20,7 @@ $lang->pivot->design       = '设计透视表';
 $lang->pivot->export       = '导出透视表';
 $lang->pivot->query        = '查询';
 $lang->pivot->browseAction = '进入透视表设计';
+$lang->pivot->designAB     = '设计';
 
 $lang->pivot->id          = 'ID';
 $lang->pivot->name        = '名称';
diff --git a/module/pivot/model.php b/module/pivot/model.php
index 3e69ddb9d9..65384db443 100644
--- a/module/pivot/model.php
+++ b/module/pivot/model.php
@@ -2162,8 +2162,7 @@ class pivotModel extends model
      */
     public function buildPivotTable($data, $configs, $fields = array(), $sql = '')
     {
-        $clientLang  = $this->app->getClientLang();
-        $width       = 128;
+        $width = 128;
 
         /* Init table. */
         $table  = "<table class='reportData table table-condensed table-striped table-bordered table-fixed datatable' style='width: auto; min-width: 100%' data-fixed-left-width='400'>";
diff --git a/module/pivot/view/show.html.php b/module/pivot/view/show.html.php
index 391877be36..3c4d242edf 100644
--- a/module/pivot/view/show.html.php
+++ b/module/pivot/view/show.html.php
@@ -40,6 +40,14 @@
     <div>
       <?php echo html::a('#', "{$lang->pivot->showOrigin}", '', "id='origin-query' class='query-after query-color btn-query-origin' title='{$lang->pivot->showOrigin}'");?>
       <?php echo html::a('#', "{$lang->pivot->showPivot}",  '', "id='pivot-query'  class='query-after query-color btn-query hidden' title='{$lang->pivot->showPivot}'");?>
+
+      <?php
+        $clickable = $this->pivot->isClickable($pivot, 'design');
+        $params    = helper::safe64Encode("dimensionID=$pivot->dimension&groupID=$pivot->group&pivotID=$pivot->id");
+        if(common::hasPriv('pivot', 'design') and $clickable) echo html::a($this->createLink('pivot', 'design', "id=$pivot->id&from=preview&param=$params"), "<i class='icon icon-design'></i> {$lang->pivot->designAB}", '', "class='query-view' title='{$lang->pivot->designAB}'");
+        if(common::hasPriv('pivot', 'edit') and $clickable) echo html::a($this->createLink('pivot', 'edit', "id=$pivot->id&from=preview&params=$params", '', true), "<i class='icon icon-edit'></i> {$lang->edit}", '', "class='iframe' title='{$lang->edit}' data-width='600'");
+        if(common::hasPriv('pivot', 'delete') and $clickable) echo html::a($this->createLink('pivot', 'delete', "id=$pivot->id&confirm=no&from=preview"), "<i class='icon icon-trash'></i> {$lang->delete}", 'hiddenwin', "title='{$lang->delete}'");
+      ?>
     </div>
   </div>
   <div class='panel-body' style='padding:0px;'>