diff --git a/module/bug/css/batchedit.css b/module/bug/css/batchedit.css
index 24236cbe26..c293bdd635 100644
--- a/module/bug/css/batchedit.css
+++ b/module/bug/css/batchedit.css
@@ -1,3 +1,4 @@
 .chosen-container[id^="plan"] .chosen-drop {min-width: 300px; border-top: 1px solid #ddd!important}
 .duplicate-input {border-left-width: 0; border-radius: 0 2px 2px 0; padding-left: 9px}
-.duplicate-input:focus {border-left-width: 1px; padding-left: 8px}
\ No newline at end of file
+.duplicate-input:focus {border-left-width: 1px; padding-left: 8px}
+#batchEditForm{overflow-x:auto;}
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 64963dfeba..11919caf47 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -57,6 +57,7 @@ $lang->required     = 'Required';
 $lang->noData       = 'No record';
 
 $lang->actions         = 'Actions';
+$lang->restore         = 'Restore';
 $lang->comment         = 'Note';
 $lang->history         = 'History';
 $lang->attatch         = 'Attachment';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index c185478339..81df46652b 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -57,6 +57,7 @@ $lang->required     = '必填';
 $lang->noData       = '暂无';
 
 $lang->actions         = '操作';
+$lang->restore         = '恢复默认';
 $lang->comment         = '备注';
 $lang->history         = '历史记录';
 $lang->attatch         = '附件';
diff --git a/module/common/view/customfield.html.php b/module/common/view/customfield.html.php
index 702c2b1205..30031fa2e0 100644
--- a/module/common/view/customfield.html.php
+++ b/module/common/view/customfield.html.php
@@ -27,6 +27,7 @@
       <div>
         <?php echo html::submitButton($lang->save);?>
         <?php echo html::commonButton($lang->cancel, '', "btn close-dropdown");?>
+        <?php echo html::a($customLink, $lang->restore, 'hiddenwin', "class='btn'");?>
       </div>
     </form>
   </div>
diff --git a/module/common/view/noticeimport.html.php b/module/common/view/noticeimport.html.php
index fc7a488ca1..440b1a75ad 100644
--- a/module/common/view/noticeimport.html.php
+++ b/module/common/view/noticeimport.html.php
@@ -6,7 +6,7 @@
         <h4 class="modal-title"><?php echo $lang->importConfirm;?></h4>
       </div>
       <div class="modal-body">
-        <?php echo html::hidden('insert', '');?>
+        <?php echo html::hidden('insert', 0);?>
         <div class='alert with-icon'>
           <i class="icon icon-exclamation-sign"></i>
           <div class="content">
@@ -25,7 +25,7 @@
 <script>
 function submitForm(type)
 {
-    $('#insert').val(type == 'insert' ? 1 : 0);
+    $('.modal-body #insert').val(type == 'insert' ? 1 : 0);
     $("button[data-target='#importNoticeModal']").closest('form').submit();
 }
 </script>
diff --git a/module/custom/control.php b/module/custom/control.php
index 0fb47cb64a..c2d91e091c 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -327,9 +327,16 @@ class custom extends control
     public function ajaxSaveCustomFields($module, $section, $key)
     {
         $account = $this->app->user->account;
-        $fields  = $this->post->fields;
-        if(is_array($fields)) $fields = join(',', $fields);
-        $this->loadModel('setting')->setItem("$account.$module.$section.$key", $fields);
+        if($_POST)
+        {
+            $fields  = $this->post->fields;
+            if(is_array($fields)) $fields = join(',', $fields);
+            $this->loadModel('setting')->setItem("$account.$module.$section.$key", $fields);
+        }
+        else
+        {
+            $this->loadModel('setting')->deleteItems("owner=$account&module=$module&section=$section&key=$key");
+        }
         die(js::reload('parent'));
     }
 
diff --git a/module/project/model.php b/module/project/model.php
index 2d01fefcd0..5db6db67ff 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -336,6 +336,7 @@ class projectModel extends model
                 $members = $this->dao->select('*')->from(TABLE_TEAM)->where('root')->eq($copyProjectID)->andWhere('type')->eq('project')->fetchAll();
                 foreach($members as $member)
                 {
+                    unset($member->id);
                     $member->root = $projectID;
                     $member->join = $today;
                     $member->days = $project->days;
diff --git a/module/story/css/batchedit.css b/module/story/css/batchedit.css
index 8bcaf7accf..fea49f488d 100644
--- a/module/story/css/batchedit.css
+++ b/module/story/css/batchedit.css
@@ -1,2 +1,3 @@
 #suhosinInfo {margin-bottom: 0;}
 .chosen-container .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
+#batchEditForm{overflow-x:auto}
diff --git a/module/task/config.php b/module/task/config.php
index ff1eecfd4d..022735759b 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -99,13 +99,13 @@ $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']    = '70';
+$config->task->datatable->fieldList['progress']['width']    = '50';
 $config->task->datatable->fieldList['progress']['required'] = 'no';
 $config->task->datatable->fieldList['progress']['sort']     = 'no';
 
 $config->task->datatable->fieldList['deadline']['title']    = 'deadlineAB';
 $config->task->datatable->fieldList['deadline']['fixed']    = 'no';
-$config->task->datatable->fieldList['deadline']['width']    = '70';
+$config->task->datatable->fieldList['deadline']['width']    = '60';
 $config->task->datatable->fieldList['deadline']['required'] = 'no';
 
 $config->task->datatable->fieldList['openedBy']['title']    = 'openedByAB';
diff --git a/module/task/css/batchedit.css b/module/task/css/batchedit.css
index 9ef9eaa117..102e960b82 100644
--- a/module/task/css/batchedit.css
+++ b/module/task/css/batchedit.css
@@ -1 +1,2 @@
 .chosen-container[id^="module"] .chosen-drop {min-width: 400px;!important}
+#batchEditForm{overflow-x:auto;}
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index 8ea8f16176..45a61e2e54 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -45,7 +45,7 @@
       }
   }
   ?>
-  <form class='main-form' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "projectID={$projectID}")?>">
+  <form id='batchEditForm' class='main-form' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "projectID={$projectID}")?>">
     <table class='table table-form table-fixed with-border'>
       <thead>
         <tr>
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 06e3ca5f75..a4172b2ee0 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1031,7 +1031,7 @@ class testcaseModel extends model
                 }
             }
 
-            $cases[$key] =$caseData;
+            $cases[$key] = $caseData;
         }
 
         $forceNotReview = $this->forceNotReview();
@@ -1387,6 +1387,12 @@ class testcaseModel extends model
                 echo $case->stepNumber;
                 break;
             case 'actions':
+                if($case->needconfirm or $browseType == 'needconfirm')
+                {
+                    if(common::hasPriv('testcase', 'confirmchange')) echo html::a(helper::createLink('testcase', 'confirmchange', "caseID=$case->id"), $this->lang->confirm, 'hiddenwin', "class='btn-wide'");
+                    break;
+                }
+
                 echo "<div class='more'>";
                 if($this->config->testcase->needReview or !empty($this->config->testcase->forceReview)) common::printIcon('testcase', 'review',  "caseID=$case->id", $case, 'list', 'glasses', '', 'iframe');
 
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index 9e958fd2cb..f66218b750 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -99,7 +99,7 @@
             {
                 echo html::submitButton('', '', 'btn btn-primary btn-wide');
             }
-            echo ' &nbsp; ' . html::backButton('', '', 'btn btn-wide')
+            echo ' &nbsp; ' . html::backButton('', '', 'btn btn-wide');
             ?>
           </td>
         </tr>
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index 21a162750f..860718454a 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -252,7 +252,6 @@ $(function()
 
     var tree = $tree.data('zui.tree');
     if(<?php echo $currentModuleID ?>)
-    if(0)
     {
         var $currentLi = $tree.find('.module-name[data-id=' + <?php echo $currentModuleID ?> + ']').closest('li');
         if($currentLi.length) tree.show($currentLi);