diff --git a/module/bug/view/report.html.php b/module/bug/view/report.html.php
index 2f72726d84..d36e89d741 100644
--- a/module/bug/view/report.html.php
+++ b/module/bug/view/report.html.php
@@ -43,7 +43,7 @@
     <div class='cell'>
       <div class='btn-toolbar'>
         <?php foreach($lang->report->typeList as $type => $typeName):?>
-        <?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-cog'></i>" : "<i class='icon icon-chart-{$type}'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
+        <?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-circle'></i>" : "<i class='icon icon-chart-{$type}'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
         <?php endforeach;?>
         <div class='pull-right with-padding text-muted'><?php echo $lang->report->notice->help;?></div>
       </div>
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 7ce0a905ad..b9f6edc4db 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -372,6 +372,7 @@ $lang->admin->menu->safe      = array('link' => 'Security|admin|safe', 'alias' =
 $lang->admin->menu->cron      = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
 $lang->admin->menu->trashes   = array('link' => 'Recycle|action|trash', 'subModule' => 'action');
 $lang->admin->menu->dev       = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor');
+$lang->admin->menu->entry     = 'Entry|entry|browse';
 $lang->admin->menu->sso       = 'Zdoo|admin|sso';
 
 $lang->convert   = new stdclass();
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index bb98f6e8ac..1490f25378 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -115,6 +115,7 @@ $lang->admin->menuOrder[45] = 'dev';
 $lang->admin->menuOrder[50] = 'safe';
 $lang->admin->menuOrder[53] = 'api';
 $lang->admin->menuOrder[55] = 'sso';
+$lang->admin->menuOrder[57] = 'entry';
 $lang->admin->menuOrder[60] = 'trashes';
 $lang->convert->menuOrder   = $lang->admin->menuOrder;
 $lang->upgrade->menuOrder   = $lang->admin->menuOrder;
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 63833b3223..edf79c3ac3 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -372,6 +372,7 @@ $lang->admin->menu->safe      = array('link' => '安全|admin|safe', 'alias' =>
 $lang->admin->menu->cron      = array('link' => '计划任务|cron|index', 'subModule' => 'cron');
 $lang->admin->menu->trashes   = array('link' => '回收站|action|trash', 'subModule' => 'action');
 $lang->admin->menu->dev       = array('link' => '二次开发|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor');
+$lang->admin->menu->entry     = '应用|entry|browse';
 $lang->admin->menu->sso       = '然之集成|admin|sso';
 
 $lang->convert   = new stdclass();
diff --git a/module/doc/model.php b/module/doc/model.php
index e2e57daf40..e852f9030a 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -517,7 +517,7 @@ class docModel extends model
         $stmt = $this->dao->select('*')->from(TABLE_DOC)
             ->where('deleted')->eq(0)
             ->beginIF($libID)->andWhere('lib')->in($libID)->fi()
-            ->andWhere('module')->in($module)
+            ->beginIF(!empty($module))->andWhere('module')->in($module)->fi()
             ->query();
 
 
diff --git a/module/entry/view/create.html.php b/module/entry/view/create.html.php
index 520d422bb7..32babe1cba 100644
--- a/module/entry/view/create.html.php
+++ b/module/entry/view/create.html.php
@@ -55,7 +55,7 @@
         <tr>
           <th></th>
           <td>
-            <?php echo html::submitButton();?>
+            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::a($config->entry->help, $lang->entry->help, '_blank', "class='help'");?>
           </td>
           <td></td>
diff --git a/module/task/view/report.html.php b/module/task/view/report.html.php
index f430f92a38..8bdd3d8b03 100644
--- a/module/task/view/report.html.php
+++ b/module/task/view/report.html.php
@@ -43,7 +43,7 @@
     <div class='cell'>
       <div class='btn-toolbar'>
         <?php foreach($lang->report->typeList as $type => $typeName):?>
-        <?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-cog'></i>" : "<i class='icon icon-chart-{$type}'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
+        <?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-circle'></i>" : "<i class='icon icon-chart-{$type}'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
         <?php endforeach;?>
         <div class='pull-right with-padding text-muted'><?php echo $lang->report->notice->help;?></div>
       </div>
diff --git a/module/testtask/view/groupcase.html.php b/module/testtask/view/groupcase.html.php
index 25e5bfef83..85a77c5e82 100644
--- a/module/testtask/view/groupcase.html.php
+++ b/module/testtask/view/groupcase.html.php
@@ -25,7 +25,7 @@
           </div>
         </th>
         <th class='c-id-sm'><?php echo $lang->idAB;?></th>
-        <th class='w-pri'>  <?php echo $lang->priAB;?></th>
+        <th class='w-80px'>  <?php echo $lang->priAB;?></th>
         <th><?php echo $lang->testcase->title;?></th>
         <th class='w-80px'> <?php echo $lang->typeAB;?></th>
         <th class='w-user'> <?php echo $lang->testtask->assignedTo;?></th>
diff --git a/module/testtask/view/report.html.php b/module/testtask/view/report.html.php
index a46441056b..e58a9a3699 100644
--- a/module/testtask/view/report.html.php
+++ b/module/testtask/view/report.html.php
@@ -43,7 +43,7 @@
     <div class='cell'>
       <div class='btn-toolbar'>
         <?php foreach($lang->report->typeList as $type => $typeName):?>
-        <?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-cog'></i>" : "<i class='icon icon-chart-{$type}'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
+        <?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-circle'></i>" : "<i class='icon icon-chart-{$type}'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
         <?php endforeach;?>
         <div class='pull-right with-padding text-muted'><?php echo $lang->report->notice->help;?></div>
       </div>
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 6dd73f45cc..b00c1448bb 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -233,6 +233,9 @@ class upgradeModel extends model
                 $this->execSQL($xuanxuanSql);
             case '10_2':
             case '10_3':
+            case '10_3_1':
+                $this->execSQL($this->getUpgradeFile('10.3.1'));
+                $this->removeCustomMenu();
         }
 
         $this->deletePatch();
@@ -347,6 +350,7 @@ class upgradeModel extends model
             case '10_1':       $confirmContent .= file_get_contents($this->app->getAppRoot() . 'db' . DS . 'xuanxuan.sql');
             case '10_2':
             case '10_3':
+            case '10_3_1':     $confirmContent .= file_get_contents($this->getUpgradeFile('10.3.1'));
         }
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
     }
@@ -2398,4 +2402,31 @@ class upgradeModel extends model
 
         return !dao::isError();
     }
+
+    /**
+     * Remove custom menu.
+     * 
+     * @access public
+     * @return bool
+     */
+    public function removeCustomMenu()
+    {
+        $customMenuMain = $this->dao->select('*')->from(TABLE_CONFIG)->where('module')->eq('common')->andWhere('section')->eq('customMenu')->andWhere('`key`')->eq('full_main')->fetchAll('id');
+        foreach($customMenuMain as $mainMenu)
+        {
+            $mainMenuValue = json_decode($mainMenu->value);
+            foreach($mainMenuValue as $menu)
+            {
+                /* If has admin in custom value, then delete old custom menu config. */
+                if($menu->name == 'admin')
+                {
+                    $this->dao->delete()->from(TABLE_CONFIG)->where('module')->eq('common')
+                        ->andWhere('section')->eq('customMenu')
+                        ->andWhere('owner')->eq($mainMenu->owner)
+                        ->exec();
+               }
+            }
+        }
+        return !dao::isError();
+    }
 }