diff --git a/db/update10.0.alpha.sql b/db/update10.0.alpha.sql
new file mode 100644
index 0000000000..0d6b2557d6
--- /dev/null
+++ b/db/update10.0.alpha.sql
@@ -0,0 +1 @@
+ALTER TABLE `zt_userquery` ADD `shortcut` enum('0','1') COLLATE 'utf8_general_ci' NOT NULL DEFAULT '0';
diff --git a/db/zentao.sql b/db/zentao.sql
index 9322e1dfcf..67a35ca9f1 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -833,6 +833,7 @@ CREATE TABLE IF NOT EXISTS `zt_userquery` (
   `title` varchar(90) NOT NULL,
   `form` text NOT NULL,
   `sql` text NOT NULL,
+  `shortcut` enum('0','1') NOT NULL DEFAULT '0',
   PRIMARY KEY  (`id`),
   KEY `query` (`account`, `module`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php
index e84e3ac0e0..e0831d654d 100644
--- a/module/file/view/export.html.php
+++ b/module/file/view/export.html.php
@@ -162,7 +162,8 @@ if($isCustomExport)
               <th><?php echo $lang->file->encoding;?></th>
               <td><?php echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8', key($lang->exportFileTypeList) == 'csv' ? "class='form-control'" : "class='form-control'");?></td>
             </tr>
-            <tr>
+            <?php $hide = isset($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], 'kanban') !== false ? 'style="display:none"' : '';?>
+            <tr <?php echo $hide;?>>
               <th><?php echo $lang->file->exportRange;?></th>
               <td><?php echo html::select('exportType', $lang->exportTypeList, 'all', "class='form-control'");?></td>
             </tr>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 68d5969d66..483118c4f6 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -128,7 +128,7 @@
               <?php endforeach;?>
             </tbody>
           </table>
-        </div> 
+        </div>
       </div>
       <?php endif;?>
       <?php echo $this->fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true'));?>
@@ -344,25 +344,25 @@
   <?php common::printPreAndNext($preAndNext);?>
   <div class="btn-toolbar">
     <?php common::printBack($browseLink);?>
+    <?php if(!isonlybody()) echo "<div class='divider'></div>";?>
     <?php if(!$task->deleted):?>
-    <div class='divider'></div>
     <?php
     common::printIcon('task', 'assignTo',       "projectID=$task->project&taskID=$task->id", $task, 'button', '', '', 'iframe', true, '', empty($task->team) ? $lang->task->assignTo : $lang->task->transfer);
-    common::printIcon('task', 'start',          "taskID=$task->id", $task, 'button', '', '', 'iframe', true);
-    common::printIcon('task', 'restart',        "taskID=$task->id", $task, 'button', '', '', 'iframe', true);
-    common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'button', '', '', 'iframe', true);
-    common::printIcon('task', 'pause',          "taskID=$task->id", $task, 'button', '', '', 'iframe', true);
+    common::printIcon('task', 'start',          "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
+    common::printIcon('task', 'restart',        "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
+    common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
+    common::printIcon('task', 'pause',          "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
     common::printIcon('task', 'finish',         "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody text-success', true);
-    common::printIcon('task', 'activate',       "taskID=$task->id", $task, 'button', '', '', 'iframe text-success', true);
-    common::printIcon('task', 'close',          "taskID=$task->id", $task, 'button', '', '', 'iframe', true);
-    common::printIcon('task', 'cancel',         "taskID=$task->id", $task, 'button', '', '', 'iframe', true);
-  
-    echo "<div class='divider'></div>";
+    common::printIcon('task', 'activate',       "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody text-success', true);
+    common::printIcon('task', 'close',          "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
+    common::printIcon('task', 'cancel',         "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
+
+    if(!isonlybody()) echo "<div class='divider'></div>";
     if(empty($task->team) or empty($task->children)) common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id", $task, 'button','plus','','','','',' ');
     common::printIcon('task', 'edit', "taskID=$task->id", $task);
     common::printIcon('task', 'create', "productID=0&storyID=0&moduleID=0&taskID=$task->id", $task, 'button', 'copy');
     common::printIcon('task', 'delete', "projectID=$task->project&taskID=$task->id", $task, 'button', '', 'hiddenwin');
-  
+
     if(!empty($task->parent)) echo html::a(helper::createLink('task', 'view', "taskID=$task->parent"), "<i class='icon icon-chevron-double-up'></i>", '', "class='btn btn-link' title='{$lang->task->parent}'");
     ?>
     <?php endif;?>
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index ded7d2c4a8..23de2f9bcf 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -129,6 +129,10 @@
         <?php endif;?>
         <?php $pager->show('right', 'pagerjs');?>
       </div>
+      <?php else:?>
+      <div class="table-empty-tip">
+        <p><span class="text-muted"><?php echo $lang->testcase->noCase;?></span> <?php common::printLink('testtask', 'linkCase', "taskID={$taskID}", "<i class='icon icon-plus'></i> " . $lang->testtask->linkCase, '', "class='btn btn-info'");?></p>
+      </div>
       <?php endif;?>
     </form>
   </div>