diff --git a/module/programplan/control.php b/module/programplan/control.php
index 2c66ab4dfa..d607021d95 100644
--- a/module/programplan/control.php
+++ b/module/programplan/control.php
@@ -119,6 +119,7 @@ class programplan extends control
         $this->view->position[]   = $this->lang->programplan->browse;
         $this->view->projectID    = $projectID;
         $this->view->productID    = $this->productID;
+        $this->view->productList  = $this->loadModel('product')->getProductPairsByProject($projectID);
         $this->view->type         = $type;
         $this->view->plans        = $plans;
         $this->view->orderBy      = $orderBy;
@@ -245,19 +246,40 @@ class programplan extends control
      */
     public function ajaxCustom()
     {
-        $data    = fixer::input('post')->get();
-        $owner   = $this->app->user->account;
-        $module  = 'programplan';
-        $section = 'browse';
-        $object  = 'stageCustom';
-        $setting = $this->loadModel('setting');
-        $custom  = empty($data->stageCustom) ? '' : implode(',', $data->stageCustom);
-        $setting->setItem("$owner.$module.$section.$object", $custom);
+        $owner  = $this->app->user->account;
+        $module = 'programplan';
+        $this->app->loadLang('execution');
+        $this->loadModel('datatable');
+        $this->loadModel('setting');
 
-        $response            = array();
-        $response['result']  = 'success';
-        $response['message'] = '';
-        return $this->send($response);
+        $stageCustom = $this->setting->getItem("owner=$owner&module=$module&section=browse&key=stageCustom");
+        $ganttFields = $this->setting->getItem("owner=$owner&module=$module&section=ganttCustom&key=ganttFields");
+        $zooming     = $this->setting->getItem("owner=$owner&module=$module&section=ganttCustom&key=zooming");
+
+        if($_POST)
+        {
+            $data        = fixer::input('post')->get();
+            $zooming     = empty($data->zooming) ? '' : $data->zooming;
+            $stageCustom = empty($data->stageCustom) ? '' : implode(',', $data->stageCustom);
+            $ganttFields = empty($data->ganttFields) ? '' : implode(',', $data->ganttFields);
+
+            $this->setting->setItem("$owner.$module.browse.stageCustom", $stageCustom);
+            $this->setting->setItem("$owner.$module.ganttCustom.ganttFields", $ganttFields);
+            $this->setting->setItem("$owner.$module.ganttCustom.zooming", $zooming);
+
+            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
+        }
+
+        /* Set Custom. */
+        foreach(explode(',', $this->config->programplan->custom->customGanttFields) as $field) $customFields[$field] = $this->lang->programplan->ganttCustom[$field];
+
+        $this->view->zooming      = $zooming;
+        $this->view->customFields = $customFields;
+        $this->view->showFields   = $this->config->programplan->ganttCustom->ganttFields;
+        $this->view->ganttFields  = $ganttFields;
+        $this->view->stageCustom  = $stageCustom;
+
+        $this->display();
     }
 
     /**
diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php
index 889b03bcaa..a186daf4c5 100644
--- a/module/programplan/lang/de.php
+++ b/module/programplan/lang/de.php
@@ -62,6 +62,8 @@ $lang->programplan->hideCriticalPath = 'Hide Critical Path';
 $lang->programplan->showCriticalPath = 'Show Critical Path';
 $lang->programplan->delay            = 'Delay';
 $lang->programplan->delayDays        = 'Delay days';
+$lang->programplan->settingGantt     = 'Gantt Setting';
+$lang->programplan->viewSetting      = 'Setting';
 
 $lang->programplan->errorBegin       = "Project begin date: %s, begin date should be >= project begin date.";
 $lang->programplan->errorEnd         = "Project end date: %s, end date should be <= project end date.";
diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php
index 6ed9867b61..b2084c75f4 100644
--- a/module/programplan/lang/en.php
+++ b/module/programplan/lang/en.php
@@ -62,6 +62,8 @@ $lang->programplan->hideCriticalPath = 'Hide Critical Path';
 $lang->programplan->showCriticalPath = 'Show Critical Path';
 $lang->programplan->delay            = 'Delay';
 $lang->programplan->delayDays        = 'Delay days';
+$lang->programplan->settingGantt     = 'Gantt Setting';
+$lang->programplan->viewSetting      = 'Setting';
 
 $lang->programplan->errorBegin       = "Project begin date: %s, begin date should be >= project begin date.";
 $lang->programplan->errorEnd         = "Project end date: %s, end date should be <= project end date.";
diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php
index 889b03bcaa..a186daf4c5 100644
--- a/module/programplan/lang/fr.php
+++ b/module/programplan/lang/fr.php
@@ -62,6 +62,8 @@ $lang->programplan->hideCriticalPath = 'Hide Critical Path';
 $lang->programplan->showCriticalPath = 'Show Critical Path';
 $lang->programplan->delay            = 'Delay';
 $lang->programplan->delayDays        = 'Delay days';
+$lang->programplan->settingGantt     = 'Gantt Setting';
+$lang->programplan->viewSetting      = 'Setting';
 
 $lang->programplan->errorBegin       = "Project begin date: %s, begin date should be >= project begin date.";
 $lang->programplan->errorEnd         = "Project end date: %s, end date should be <= project end date.";
diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php
index 1e4fdfbacd..b3f4b04429 100644
--- a/module/programplan/lang/zh-cn.php
+++ b/module/programplan/lang/zh-cn.php
@@ -62,6 +62,8 @@ $lang->programplan->hideCriticalPath = '隐藏关键路径';
 $lang->programplan->showCriticalPath = '显示关键路径';
 $lang->programplan->delay            = '是否延期';
 $lang->programplan->delayDays        = '延期天数';
+$lang->programplan->settingGantt     = '设置甘特图';
+$lang->programplan->viewSetting      = '显示设置';
 
 $lang->programplan->errorBegin       = '阶段的开始时间不能小于所属项目的开始时间%s';
 $lang->programplan->errorEnd         = '阶段的结束时间不能大于所属项目的结束时间%s';
diff --git a/module/programplan/view/gantt.html.php b/module/programplan/view/gantt.html.php
index 6b1f88c074..e68b128d0e 100644
--- a/module/programplan/view/gantt.html.php
+++ b/module/programplan/view/gantt.html.php
@@ -45,7 +45,7 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
 .gantt_row.task-item{cursor: pointer;}
 
 #ganttDownload, #ganttHeader {display: none;}
-#ganttContainer {margin-top: 10px;}
+#ganttContainer {margin-top: 40px;}
 #mainContent:before {background: #fff;}
 #mainContent.loading {overflow: hidden}
 #mainContent.loading #ganttView {overflow: hidden}
@@ -65,6 +65,9 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
 .gantt_task_line.gantt_task_inline_color{border:0px;}
 .gantt_grid_scale, .gantt_task_scale, .gantt_task_vscroll{background-color: #F2F7FF;}
 #myCover {display:none;left:12px!important;z-index:10!important;top:9px!important;height:unset!important;}
+.button-group{position: relative;}
+.flax{display: flex; margin-bottom: 10px;}
+.switchBtn > i {padding-left: 7px;}
 </style>
 <?php js::set('customUrl', $this->createLink('programplan', 'ajaxCustom'));?>
 <?php js::set('dateDetails', $dateDetails);?>
@@ -74,34 +77,43 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
 <?php js::set('showFields', $this->config->programplan->ganttCustom->ganttFields);?>
 <?php js::set('canGanttEdit', common::hasPriv('programplan', 'ganttEdit'));?>
 <div id='mainContent' class='main-content load-indicator' data-loading='<?php echo $lang->programplan->exporting;?>'>
-  <div class="pull-right btn-toolbar">
-  <?php
-  if($this->app->getModuleName() == 'programplan')
-  {
-      $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=programplan&section=ganttCustom&key=ganttFields');
-      include '../../common/view/customfield.html.php';
-  }
-  ?>
-  </div>
-  <form class="main-form form-ajax not-watch">
-    <div class="example">
-      <?php echo html::commonButton($lang->programplan->full, 'id="fullScreenBtn"', 'btn btn-primary btn-sm')?>
-      <?php if($app->rawModule == 'review' and $app->rawMethod == 'assess') unset($lang->programplan->stageCustom->date); ?>
-      <?php echo html::checkbox('stageCustom', $lang->programplan->stageCustom, $selectCustom);?>
-      <div class='btn btn-link'>
-        <strong><?php echo $lang->execution->gantt->format . '：';?></strong>
-        <?php echo html::radio('zooming', $lang->execution->gantt->zooming, 'day', "onchange='zoomTasks(this)'");?>
-      </div>
-      <div class='btn btn-link' id='ganttPris'>
-        <strong><?php echo $lang->task->pri . " : "?></strong>
-        <?php foreach($lang->execution->gantt->progressColor as $pri => $color):?>
-        <?php if($pri <= 4):?>
-        <span style="background:<?php echo $color?>"><?php echo $pri;?></span> &nbsp;
-        <?php endif;?>
-        <?php endforeach;?>
-      </div>
+  <?php if($this->app->getModuleName() == 'programplan'):?>
+  <div class='btn-toolbar pull-left'>
+    <div class='btn-group'>
+      <?php $viewName = $productID != 0 ? zget($productList,$productID) : $lang->product->allProduct;?>
+      <a href='javascript:;' class='btn btn-link btn-limit' data-toggle='dropdown'><span class='text' title='<?php echo $viewName;?>'><?php echo $viewName;?></span> <span class='caret'></span></a>
+      <ul class='dropdown-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
+        <?php
+          $class = '';
+          if($productID == 0) $class = 'class="active"';
+          foreach($productList as $key => $product)
+          {
+              $class = $productID == $key ? 'class="active"' : '';
+              echo "<li $class>" . html::a($this->createLink('programplan', 'browse', "projectID=$projectID&productID=$key&type=gantt"), $product) . "</li>";
+          }
+        ?>
+      </ul>
     </div>
-  </form>
+  </div>
+  <div class="pull-right btn-toolbar flax">
+    <div class="btn-group">
+      <?php echo html::a($this->createLink('project', 'execution', "status=all&projectID=$projectID"),"<i class='icon-list'></i> &nbsp;", '', "class='btn btn-icon switchBtn' title='{$lang->project->bylist}'");?>
+      <?php echo html::a('',"<i class='icon-cards-view'></i> &nbsp;", '', "class='btn btn-icon text-primary switchBtn' title='{$lang->programplan->gantt}'");?>
+    </div>
+    <a href='javascript:fullScreen();' id='fullScreenBtn' class='btn btn-link'><i class='icon icon-fullscreen'></i> <?php echo $lang->programplan->full;?></a>
+    <div class='button-group'>
+    <button class='btn btn-link' data-toggle='dropdown'><i class='icon icon-export'></i> <span class='text'><?php echo $this->lang->export;?></span> <span class='caret'></span></button>
+      <ul class='dropdown-menu' id='exportActionMenu'>
+      <li><a href='javascript:exportGantt()'><?php echo $lang->execution->gantt->exportImg;?></a></li>
+      <li><a href="javascript:exportGantt('pdf')"><?php echo $lang->execution->gantt->exportPDF;?></a></li>
+      </ul>
+    </div>
+    <?php
+    echo html::a(helper::createLink('programplan', 'ajaxcustom', '', '', true), '<i class="icon icon-cog-outline"></i> ' . $lang->settings, '', "class='iframe btn btn-link' data-width='30%'");
+    if(common::hasPriv('programplan', 'create')) echo html::a($this->createLink('programplan', 'create', "projectID=$projectID"), "<i class='icon icon-sm icon-plus'>    </i> " . $this->lang->programplan->create, '', "class='btn btn-primary'");
+    ?>
+  </div>
+  <?php endif;?>
   <div id='ganttContainer'>
     <div class='gantt' id='ganttView'></div>
   </div>
@@ -145,7 +157,7 @@ gantt.init("gantt_here");
 gantt.attachEvent("onBeforeExpand",function(){
     $('#myCover').css('display', 'unset');
     $('#mainContent .pull-right').css('opacity', '0');
-    $('.example').css('display', 'none');
+    $('.btn-toolbar').css('display', 'none');
     return true;
 });
 
@@ -153,7 +165,7 @@ gantt.attachEvent("onBeforeExpand",function(){
 gantt.attachEvent("onCollapse", function (){
     $('#myCover').css('display', 'none');
     $('#mainContent .pull-right').css('opacity', '1');
-    $('.example').css('display', 'block');
+    $('.btn-toolbar').css('display', 'flex');
 });
 
 /**
diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php
index 0c47eaabf2..d349c0629b 100644
--- a/module/project/view/execution.html.php
+++ b/module/project/view/execution.html.php
@@ -40,6 +40,10 @@
     <?php if(common::hasPriv('execution', 'task')) echo html::checkbox('showTask', array('1' => $lang->programplan->stageCustom->task), '', $this->cookie->showTask ? 'checked=checked' : '');?>
   </div>
   <div class='btn-toolbar pull-right'>
+    <div class="btn-group">
+      <?php echo html::a('', "<i class='icon-list'></i> &nbsp;", '', "class='btn btn-icon text-primary switchBtn' title='{$lang->project->bylist}'");?>
+      <?php echo html::a($this->createLink('programplan', 'browse', "projectID=$projectID&productID=$productID&type=gantt"), "<i class='icon-cards-view'></i> &nbsp;", '', "class='btn btn-icon switchBtn' title='{$lang->programplan->gantt}'");?>
+    </div>
     <?php common::printLink('execution', 'export', "status=$status&productID=$productID&orderBy=$orderBy&from=project", "<i class='icon-export muted'> </i> " . $lang->export, '', "class='btn btn-link export'")?>
      <?php if(common::hasPriv('programplan', 'create') and $isStage):?>
      <?php echo html::a($this->createLink('programplan', 'create', "projectID=$projectID&productID=$productID"), "<i class='icon icon-plus'></i> " . $lang->programplan->create, '', "class='btn btn-primary'");?>