diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php
index c820e1cfec..0821a77e1b 100644
--- a/module/block/view/dashboard.html.php
+++ b/module/block/view/dashboard.html.php
@@ -22,7 +22,6 @@ $useGuest = $this->app->user->account == 'guest';
   <div class="table-empty-tip">
     <p>
       <span class="text-muted"><?php echo $lang->block->noData. ',';?></span>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink("block", "admin", "id=0&module=$module"), "<i class='icon icon-plus'></i> {$lang->block->createBlock}", '', "data-toggle='modal' data-type='ajax' data-width='700' data-title='{$lang->block->createBlock}' class='btn btn-info'")?> 
       <?php echo html::a($this->createLink("block", "ajaxReset", "module=$module"), "<i class='icon icon-refresh'></i> {$lang->block->reset}", 'hiddenwin', 'class="btn btn-info"')?>
     </p>
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 79fc84af9b..1fe478e3a8 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -173,7 +173,6 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
       <p>
         <span class="text-muted"><?php echo $lang->bug->noBug;?></span>
         <?php if(common::hasPriv('bug', 'create')):?>
-        <span class="text-muted"><?php echo $lang->youCould;?></span>
         <?php echo html::a($this->createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID"), "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-info'");?>
         <?php endif;?>
       </p>
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index b6b81b1b45..17c0a26e7c 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -88,7 +88,6 @@ $lang->customMenu      = 'Custom Menu';
 $lang->customField     = 'Custom Field';
 $lang->lineNumber      = 'Line No.';
 $lang->tutorialConfirm = 'You are using ZenTao tutorial. Do you want to quit right now？';
-$lang->youCould        = 'You could ';
 
 $lang->preShortcutKey  = '[Shortcut:←]';
 $lang->nextShortcutKey = '[Shortcut:→]';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index bd6dbaa21c..eda5876cef 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -88,7 +88,6 @@ $lang->customMenu      = '自定义导航';
 $lang->customField     = '自定义表单项';
 $lang->lineNumber      = '行号';
 $lang->tutorialConfirm = '检测到你尚未退出新手教程模式，是否现在退出？';
-$lang->youCould        = '您现在可以 ';
 
 $lang->preShortcutKey  = '[快捷键:←]';
 $lang->nextShortcutKey = '[快捷键:→]';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 3a62992548..74ab163ab1 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -88,7 +88,6 @@ $lang->customMenu      = '自定義導航';
 $lang->customField     = '自定義表單項';
 $lang->lineNumber      = '行號';
 $lang->tutorialConfirm = '檢測到你尚未退出新手教程模式，是否現在退出？';
-$lang->youCould        = '您現在可以 ';
 
 $lang->preShortcutKey  = '[快捷鍵:←]';
 $lang->nextShortcutKey = '[快捷鍵:→]';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 5cc5ee129b..3b7f2a26bf 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -77,7 +77,7 @@ $lang->custom->user->fields['statusList']   = 'Status';
 $lang->custom->user->fields['contactField'] = 'Available Contact';
 $lang->custom->user->fields['deleted']      = 'Deleted User';
 
-$lang->custom->system = array('flow', 'working', 'required', 'score', 'setDynamic');
+$lang->custom->system = array('flow', 'working', 'required', 'score');
 
 $lang->custom->block->fields['closed'] = 'Closed Block';
 
diff --git a/module/doc/css/common.css b/module/doc/css/common.css
index 443e29b04b..af09f31953 100644
--- a/module/doc/css/common.css
+++ b/module/doc/css/common.css
@@ -34,7 +34,7 @@
 
 .files-grid {padding: 0 10px;}
 .files-grid .col {width: 20%; text-align: center; padding: 0; margin-bottom: 10px;}
-.files-grid .actions {position: absolute; bottom: -38px; height:50px; left: 0; right: 0; background: #E9F2FB; z-index: 10; opacity: 0; transition: opacity .2s; padding-bottom: 8px; border-radius: 0 0 3px 3px; padding-top: 8px;}
+.files-grid .actions {background: #E9F2FB; z-index: 10; opacity: 0; transition: opacity .2s; padding-bottom: 8px; border-radius: 0 0 3px 3px; padding-top: 8px;}
 .files-grid .col:hover .actions {opacity: 1;}
 .files-grid .file {padding: 10px; cursor: pointer; display: block; border-radius: 2px; transition: background-color .2s; border-radius: 3px 3px 0 0}
 .files-grid .col:hover .file {background-color: #E9F2FB;}
diff --git a/module/doc/css/createlib.css b/module/doc/css/createlib.css
index 056a6984f3..0aad5d4557 100644
--- a/module/doc/css/createlib.css
+++ b/module/doc/css/createlib.css
@@ -6,3 +6,6 @@ table{width:90% !important}
 
 #product_chosen{width: 50%!important}
 #project_chosen{width: 50%!important}
+
+#whiteListBox .input-group:last-child{margin-top:10px}
+#whiteListBox .input-group:last-child .input-group-addon{padding:5px 16px}
diff --git a/module/doc/css/edit.css b/module/doc/css/edit.css
new file mode 100644
index 0000000000..a7265b26a7
--- /dev/null
+++ b/module/doc/css/edit.css
@@ -0,0 +1,2 @@
+#whiteListBox .input-group:last-child{margin-top:10px}
+#whiteListBox .input-group:last-child .input-group-addon{padding:5px 16px}
diff --git a/module/doc/css/editlib.css b/module/doc/css/editlib.css
index afb55c8159..09b6eb891e 100644
--- a/module/doc/css/editlib.css
+++ b/module/doc/css/editlib.css
@@ -3,3 +3,5 @@ form {margin-right: 30px;}
 .chosen-container .chosen-results {max-height: 180px;}
 
 #whiteListBox div.input-group {margin-bottom: 2px;}
+#whiteListBox .input-group:last-child{margin-top:10px}
+#whiteListBox .input-group:last-child .input-group-addon{padding:5px 16px}
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index 823dca830c..715ae42439 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -75,7 +75,6 @@ var browseType = '<?php echo $browseType;?>';
           <?php if($libID):?>
           <span class="text-muted"><?php echo $lang->doc->noDoc;?></span>
           <?php if(common::hasPriv('doc', 'create')):?>
-          <span class="text-muted"><?php echo $lang->youCould;?></span>
           <?php echo html::a($this->createLink('doc', 'create', "libID={$libID}&moduleID=$moduleID"), "<i class='icon icon-plus'></i> " . $lang->doc->create, '', "class='btn btn-info'");?>
           <?php endif;?>
           <?php elseif($browseType == 'byediteddate'):?>
diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php
index face156077..e2dd1fbc34 100644
--- a/module/doc/view/browsebygrid.html.php
+++ b/module/doc/view/browsebygrid.html.php
@@ -50,7 +50,6 @@
         <?php if($libID):?>
         <span class="text-muted"><?php echo $lang->doc->noDoc;?></span>
         <?php if(common::hasPriv('doc', 'create')):?>
-        <span class="text-muted"><?php echo $lang->youCould;?></span>
         <?php echo html::a($this->createLink('doc', 'create', "libID={$libID}&moduleID=$moduleID"), "<i class='icon icon-plus'></i> " . $lang->doc->create, '', "class='btn btn-info'");?>
         <?php endif;?>
         <?php elseif($browseType == 'byediteddate'):?>
@@ -138,7 +137,7 @@
             <a data-url="<?php echo $this->createLink('doc', 'collect', "objectID={$doc->id}&objectType=doc");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
             <?php endif;?>
             <?php common::printLink('doc', 'edit', "docID={$doc->id}", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link'")?>
-            <?php common::printLink('doc', 'delete', "docID={$doc->id}", "<i class='icon icon-trash'></i>", '', "title='{$lang->delete}' class='btn btn-link'")?>
+            <?php common::printLink('doc', 'delete', "docID={$doc->id}", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
           </div>
         </div>
         <?php endforeach;?>
diff --git a/module/my/css/common.css b/module/my/css/common.css
index cbbfe79103..c3ea4341f0 100644
--- a/module/my/css/common.css
+++ b/module/my/css/common.css
@@ -6,3 +6,5 @@
 .dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;}
 .dropdown-list > li > a:hover,
 .dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;}
+
+.btn-toolbar .nav-title{float:left; display:inline-block; padding: 6px 12px; margin-bottom: 0; font-size: 13px; font-weight: bolder; line-height: 18px; text-align: center; white-space: nowrap; vertical-align: middle;}
diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php
index 90ecc608df..66341bdefb 100644
--- a/module/my/view/project.html.php
+++ b/module/my/view/project.html.php
@@ -25,7 +25,6 @@
     <p>
       <span class="text-muted"><?php echo $lang->project->noProject;?></span>
       <?php if(common::hasPriv('project', 'create')):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('project', 'create'), "<i class='icon icon-plus'></i> " . $lang->my->home->createProject, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index ebca6ff777..0844a8981e 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -19,8 +19,11 @@
   <div class="btn-toolbar pull-left">
     <?php
     $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
+    echo "<span class='nav-title'>{$lang->testtask->common}: </span>";
     echo html::a(inlink('testtask', "type=wait"),       "<span class='text'>{$lang->testtask->wait}</span>", '', "class='btn btn-link'");
     echo html::a(inlink('testtask', "type=done"),       "<span class='text'>{$lang->testtask->done}</span>", '', "class='btn btn-link'");
+    echo "<span class='divider'></span>";
+    echo "<span class='nav-title'>{$lang->testcase->common}: </span>";
     echo html::a(inlink('testcase', "type=assigntome"), "<span class='text'>{$lang->testcase->assignToMe}</span>" . ($type == 'assigntome' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assigntome' ? ' btn-active-text' : '') . "'");
     echo html::a(inlink('testcase', "type=openedbyme"), "<span class='text'>{$lang->testcase->openedByMe}</span>" . ($type == 'openedbyme' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedbyme' ? ' btn-active-text' : '') . "'");
     ?>
diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php
index 86500cf681..60c97e9458 100644
--- a/module/my/view/testtask.html.php
+++ b/module/my/view/testtask.html.php
@@ -16,8 +16,11 @@
   <div class="btn-toolbar pull-left">
     <?php
     $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
+    echo "<span class='nav-title'>{$lang->testtask->common}: </span>";
     echo html::a(inlink('testtask', "type=wait"),       "<span class='text'>{$lang->testtask->wait}</span>" . ($type == 'wait' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'wait' ? ' btn-active-text' : '') . "'");
     echo html::a(inlink('testtask', "type=done"),       "<span class='text'>{$lang->testtask->done}</span>" . ($type == 'done' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'done' ? ' btn-active-text' : '') . "'");
+    echo "<span class='divider'></span>";
+    echo "<span class='nav-title'>{$lang->testcase->common}: </span>";
     echo html::a(inlink('testcase', "type=assigntome"), "<span class='text'>{$lang->testcase->assignToMe}</span>", '', "class='btn btn-link'");
     echo html::a(inlink('testcase', "type=openedbyme"), "<span class='text'>{$lang->testcase->openedByMe}</span>", '', "class='btn btn-link'");
     ?>
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index c24b46d798..46b6d99034 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -46,7 +46,6 @@
     <p>
       <span class="text-muted"><?php echo $lang->my->noTodo;?></span>
       <?php if(common::hasPriv('todo', 'create')):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('todo', 'create'), "<i class='icon icon-plus'></i> " . $lang->todo->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index 544eb6ac8c..a72de84ebe 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -104,7 +104,7 @@ $lang->product->typeList['platform'] = '多平台';
 
 $lang->product->typeTips = array();
 $lang->product->typeTips['branch']   = '(适用于客户定制场景)';
-$lang->product->typeTips['platform'] = '(适用于跨平台应用开发，比如ios、安卓、pc端等)';
+$lang->product->typeTips['platform'] = '(适用于跨平台应用开发，比如IOS、安卓、PC端等)';
 
 $lang->product->branchName['normal']   = '';
 $lang->product->branchName['branch']   = '分支';
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 756d941de1..c1f8459dac 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -144,7 +144,6 @@
       <p>
         <span class="text-muted"><?php echo $lang->story->noStory;?></span>
         <?php if(common::hasPriv('story', 'create')):?>
-        <span class="text-muted"><?php echo $lang->youCould;?></span>
         <?php echo html::a($this->createLink('story', 'create', "productID={$productID}&branch={$branch}&moduleID={$moduleID}"), "<i class='icon icon-plus'></i> " . $lang->story->create, '', "class='btn btn-info'");?>
         <?php endif;?>
       </p>
diff --git a/module/product/view/build.html.php b/module/product/view/build.html.php
index 99cd166262..fbbcf67135 100644
--- a/module/product/view/build.html.php
+++ b/module/product/view/build.html.php
@@ -26,7 +26,6 @@
     <p>
       <span class="text-muted"><?php echo $lang->build->noBuild;?></span>
       <?php if(common::hasPriv('build', 'create')):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('build', 'create', "productID=$product->id"), "<i class='icon icon-plus'></i> " . $lang->build->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index f416000449..7bd0071737 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -22,7 +22,7 @@
       <table class="table table-form">
         <tbody>
           <tr>
-            <th><?php echo $lang->product->name;?></th>
+            <th class='w-130px'><?php echo $lang->product->name;?></th>
             <td><?php echo html::input('name', '', "class='form-control input-product-title' required");?></td><td></td>
           </tr>  
           <tr>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index 405cf3bed2..d89c61b6d0 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -26,7 +26,7 @@
       <table class="table table-form">
         <tbody>
           <tr>
-            <th class='w-120px'><?php echo $lang->product->name;?></th>
+            <th class='w-130px'><?php echo $lang->product->name;?></th>
             <td class='w-p40-f'><?php echo html::input('name', $product->name, "class='form-control' required");?></td><td></td>
           </tr>  
           <tr>
diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php
index 77abc220af..9dbf3279c2 100644
--- a/module/product/view/project.html.php
+++ b/module/product/view/project.html.php
@@ -21,7 +21,6 @@
     <p>
       <span class="text-muted"><?php echo $lang->project->noProject;?></span>
       <?php if(common::hasPriv('project', 'create')):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('project', 'create'), "<i class='icon icon-plus'></i> " . $lang->project->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/product/view/roadmap.html.php b/module/product/view/roadmap.html.php
index 1b445335b8..baef091494 100644
--- a/module/product/view/roadmap.html.php
+++ b/module/product/view/roadmap.html.php
@@ -42,7 +42,6 @@
         <p>
           <span class="text-muted"><?php echo $lang->release->noRelease;?></span>
           <?php if(common::hasPriv('release', 'create')):?>
-          <span class="text-muted"><?php echo $lang->youCould;?></span>
           <?php echo html::a($this->createLink('release', 'create', "productID=$product->id&branch=$branchKey"), "<i class='icon icon-plus'></i> " . $lang->release->create, '', "class='btn btn-info'");?>
           <?php endif;?>
         </p>
diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php
index e2a6c948fe..dffe1e7d15 100644
--- a/module/productplan/view/browse.html.php
+++ b/module/productplan/view/browse.html.php
@@ -33,7 +33,6 @@
     <p>
       <span class="text-muted"><?php echo $lang->productplan->noPlan;?></span>
       <?php if(common::hasPriv('productplan', 'create')):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('productplan', 'create', "productID=$product->id&branch=$branch"), "<i class='icon icon-plus'></i> " . $lang->productplan->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 543809d370..32784e2537 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -32,7 +32,6 @@
     <p>
       <span class="text-muted"><?php echo $lang->bug->noBug;?></span>
       <?php if(common::hasPriv('bug', 'create')):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('bug', 'create', "productID=$productID&branch=$branchID&extra=projectID=$project->id"), "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index f3cd8ea063..aa7ecf4609 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -35,7 +35,6 @@
     <p>
       <span class="text-muted"><?php echo $lang->build->noBuild;?></span>
       <?php if(common::hasPriv('build', 'create')):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('build', 'create', "project=$project->id"), "<i class='icon icon-plus'></i> " . $lang->build->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php
index 99f595b66b..292c0dbca3 100644
--- a/module/project/view/grouptask.html.php
+++ b/module/project/view/grouptask.html.php
@@ -83,7 +83,6 @@
     <p>
       <span class="text-muted"><?php echo $lang->task->noTask;?></span>
       <?php if(common::hasPriv('task', 'create', $checkObject)):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('task', 'create', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')), "<i class='icon icon-plus'></i> " . $lang->task->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index 5415663640..bd27293d5a 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -70,7 +70,6 @@ $account = $this->app->user->account;
     <p>
       <span class="text-muted"><?php echo $lang->task->noTask;?></span>
       <?php if(common::hasPriv('task', 'create', $checkObject)):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('task', 'create', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')), "<i class='icon icon-plus'></i> " . $lang->task->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index f44ca87fd2..594f314ae5 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -88,7 +88,6 @@
       <p>
         <span class="text-muted"><?php echo $lang->story->noStory;?></span>
         <?php if(common::hasPriv('project', 'linkStory')):?>
-        <span class="text-muted"><?php echo $lang->youCould;?></span>
         <?php echo html::a($this->createLink('project', 'linkStory', "project=$project->id"), "<i class='icon icon-link'></i> " . $lang->project->linkStory, '', "class='btn btn-info'");?>
         <?php endif;?>
       </p>
diff --git a/module/project/view/storykanban.html.php b/module/project/view/storykanban.html.php
index 4ee2c47fd1..80afd1e39e 100644
--- a/module/project/view/storykanban.html.php
+++ b/module/project/view/storykanban.html.php
@@ -49,7 +49,6 @@ $account = $this->app->user->account;
     <p>
       <span class="text-muted"><?php echo $lang->story->noStory;?></span>
       <?php if(common::hasPriv('project', 'linkStory')):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('project', 'linkStory', "project=$project->id"), "<i class='icon icon-link'></i> " . $lang->project->linkStory, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 4f0f73b127..0e665f91bb 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -196,7 +196,6 @@ js::set('browseType', $browseType);
       <p>
         <span class="text-muted"><?php echo $lang->task->noTask;?></span>
         <?php if(common::hasPriv('task', 'create', $checkObject)):?>
-        <span class="text-muted"><?php echo $lang->youCould;?></span>
         <?php echo html::a($this->createLink('task', 'create', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')), "<i class='icon icon-plus'></i> " . $lang->task->create, '', "class='btn btn-info'");?>
         <?php endif;?>
       </p>
diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php
index 332a3ea53d..0e8b01b645 100644
--- a/module/project/view/team.html.php
+++ b/module/project/view/team.html.php
@@ -36,7 +36,6 @@
     <p>
       <span class="text-muted"><?php echo $lang->project->noMembers;?></span>
       <?php if((!empty($app->user->admin) or empty($app->user->rights['rights']['my']['limited'])) && common::hasPriv('project', 'manageMembers')):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('project', 'manageMembers', "projectID=$project->id"), "<i class='icon icon-persons'></i> " . $lang->project->manageMembers, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php
index b0f3248964..1c3df04eaf 100644
--- a/module/project/view/testtask.html.php
+++ b/module/project/view/testtask.html.php
@@ -38,7 +38,6 @@
     <p>
       <span class="text-muted"><?php echo $lang->testtask->noTesttask;?></span>
       <?php if(common::hasPriv('testtask', 'create')):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('testtask', 'create', "product=0&project=$projectID"), "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/project/view/tree.html.php b/module/project/view/tree.html.php
index c80a212363..d633dad857 100644
--- a/module/project/view/tree.html.php
+++ b/module/project/view/tree.html.php
@@ -66,7 +66,6 @@
     <p>
       <span class="text-muted"><?php echo $lang->task->noTask;?></span>
       <?php if(common::hasPriv('task', 'create', $checkObject)):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('task', 'create', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')), "<i class='icon icon-plus'></i> " . $lang->task->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index f2fa3307ce..927d75486d 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -29,7 +29,6 @@
     <p>
       <span class="text-muted"><?php echo $lang->release->noRelease;?></span>
       <?php if(common::hasPriv('release', 'create')):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('release', 'create', "productID=$product->id&branch=$branch"), "<i class='icon icon-plus'></i> " . $lang->release->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/task/config.php b/module/task/config.php
index 66f05a4e99..d7f9f333e8 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -99,7 +99,7 @@ $config->task->datatable->fieldList['left']['required'] = 'no';
 
 $config->task->datatable->fieldList['progress']['title']    = 'progress';
 $config->task->datatable->fieldList['progress']['fixed']    = 'no';
-$config->task->datatable->fieldList['progress']['width']    = '50';
+$config->task->datatable->fieldList['progress']['width']    = '40';
 $config->task->datatable->fieldList['progress']['required'] = 'no';
 $config->task->datatable->fieldList['progress']['sort']     = 'no';
 
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 5c7956bc44..1985c69df6 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -48,7 +48,6 @@ js::set('suiteID',        $suiteID);
       <p>
         <span class="text-muted"><?php echo $lang->testcase->noCase;?></span>
         <?php if(common::hasPriv('testcase', 'create')):?>
-        <span class="text-muted"><?php echo $lang->youCould;?></span>
         <?php $initModule = isset($moduleID) ? (int)$moduleID : 0;?>
         <?php echo html::a($this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule"), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-info'");?>
         <?php endif;?>
diff --git a/module/testcase/view/groupcase.html.php b/module/testcase/view/groupcase.html.php
index 40c1182697..3a4b5c1a00 100644
--- a/module/testcase/view/groupcase.html.php
+++ b/module/testcase/view/groupcase.html.php
@@ -20,7 +20,6 @@
     <p>
       <span class="text-muted"><?php echo $lang->testcase->noCase;?></span>
       <?php if(common::hasPriv('testcase', 'create')):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule"), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/testsuite/view/browse.html.php b/module/testsuite/view/browse.html.php
index 6dda7d8fc7..5b43e52a26 100644
--- a/module/testsuite/view/browse.html.php
+++ b/module/testsuite/view/browse.html.php
@@ -32,7 +32,6 @@
     <p>
       <span class="text-muted"><?php echo $lang->testsuite->noTestsuite;?></span>
       <?php if(common::hasPriv('testsuite', 'create')):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('testsuite', 'create', "product=$productID"), "<i class='icon icon-plus'></i> " . $lang->testsuite->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/testsuite/view/library.html.php b/module/testsuite/view/library.html.php
index d5ed803411..a8a02bd231 100644
--- a/module/testsuite/view/library.html.php
+++ b/module/testsuite/view/library.html.php
@@ -87,7 +87,6 @@ js::set('flow',          $config->global->flow);
       <p>
         <span class="text-muted"><?php echo $lang->testcase->noCase;?></span>
         <?php if(common::hasPriv('testsuite', 'createCase')):?>
-        <span class="text-muted"><?php echo $lang->youCould;?></span>
         <?php echo html::a($this->createLink('testsuite', 'createCase', "libID=$libID&moduleID=" . (isset($moduleID) ? $moduleID : 0)), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-info'");?>
         <?php endif;?>
       </p>
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index b21f0fac16..ff903c9ef4 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -57,7 +57,6 @@ $status = $this->session->testTaskVersionStatus;
     <p>
       <span class="text-muted"><?php echo $lang->testtask->noTesttask;?></span>
       <?php if(common::hasPriv('testtask', 'create')):?>
-      <span class="text-muted"><?php echo $lang->youCould;?></span>
       <?php echo html::a($this->createLink('testtask', 'create', "product=$productID"), "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index c2400e4b46..4ca542e1e0 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -15,7 +15,7 @@ $lang->todo->create       = "Add Todo";
 $lang->todo->createCycle  = "Add Recurred Todo";
 $lang->todo->assignTo     = "Assign";
 $lang->todo->activate     = "Activate";
-$lang->todo->batchCreate  = "Batch Add";
+$lang->todo->batchCreate  = "Batch Add ";
 $lang->todo->edit         = "Edit";
 $lang->todo->close        = "Close";
 $lang->todo->batchClose   = "Batch Close";
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index bab9ded643..c27bb06eb9 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -139,9 +139,6 @@ $lang->user->personalData['finishedTask'] = 'Tasks Finished';
 $lang->user->personalData['resolvedBug']  = 'Bugs Solved';
 $lang->user->personalData['createdCase']  = 'Cases Created';
 
-$lang->user->statusList['active'] = 'Activated';
-$lang->user->statusList['delete'] = 'Deleted';
-
 $lang->user->keepLogin['on']      = 'Keep Login';
 $lang->user->loginWithDemoUser    = 'Login as Demo User:';
 
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 820d6a939a..b514dbbe8e 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -8,11 +8,6 @@
 * @version     $Id: style.css 1454 2009-10-23 01:45:26Z wwccss $
 * @link        http://www.zentao.net
 */
-
-/* Change zentao icon on fixed footer with classic style image */
-#poweredBy .icon-zentao {background: url(images/main/icon.png) center no-repeat}
-#poweredBy .icon-zentao:before {visibility: hidden;}
-
 /* Finish task #5068*/
 .main-table .table{cursor:pointer;}
 .table-striped > tbody > tr:nth-child(2n+1) > td, .table-striped > tbody > tr:nth-child(2n+1) > th{background:none;}