diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 408511bd8b..1cdf6d058a 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -48,7 +48,7 @@ $lang->custom->oneUnit              = "One {$lang->hourCommon}";
 $lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first";
 
 if($config->systemMode == 'new') $lang->custom->execution = 'Execution';
-if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon;
+if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon;
 
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index c503045d1c..55ed40f1fd 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -48,7 +48,7 @@ $lang->custom->oneUnit              = "One {$lang->hourCommon}";
 $lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first";
 
 if($config->systemMode == 'new') $lang->custom->execution = 'Execution';
-if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon;
+if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon;
 
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 6f7ef9f418..8e44c229c8 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -48,7 +48,7 @@ $lang->custom->oneUnit              = "One {$lang->hourCommon}";
 $lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first";
 
 if($config->systemMode == 'new') $lang->custom->execution = 'Execution';
-if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon;
+if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon;
 
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php
index cf9b0cbf18..58232273fe 100644
--- a/module/custom/lang/vi.php
+++ b/module/custom/lang/vi.php
@@ -48,7 +48,7 @@ $lang->custom->oneUnit              = "One {$lang->hourCommon}";
 $lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first";
 
 if($config->systemMode == 'new') $lang->custom->execution = 'Execution';
-if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon;
+if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon;
 
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index ef5ab02d70..b6a783ee18 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -48,7 +48,7 @@ $lang->custom->oneUnit              = "一个{$lang->hourCommon}";
 $lang->custom->convertRelationTitle = "请先设置{$lang->hourCommon}转换为%s的换算系数";
 
 if($config->systemMode == 'new') $lang->custom->execution = '执行';
-if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon;
+if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon;
 
 $lang->custom->unitList['efficiency'] = '工时/';
 $lang->custom->unitList['manhour']    = '人时/';
diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php
index f4ccade44e..49361eb4b7 100644
--- a/module/doc/view/editlib.html.php
+++ b/module/doc/view/editlib.html.php
@@ -43,7 +43,7 @@
       </tr>
       <tr>
         <th><?php echo $lang->doclib->control;?></th>
-        <?php if($lib->type == 'product' or $lib->type == 'execution' or ($config->systemMode == 'classic' and $lib->type != 'custom' )):?>
+        <?php if($lib->type == 'product' or $lib->type == 'execution' or ($config->systemMode == 'classic' and $lib->type != 'custom')):?>
         <td>
           <?php echo html::radio('acl', $lang->doclib->aclListA, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'")?>
           <span class='text-info' id='noticeAcl'><?php echo $lang->doc->noticeAcl['lib'][$lib->type][$lib->acl];?></span>
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 0806072497..82868a70a3 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -80,7 +80,7 @@
           <?php foreach($program as $lineID => $line):?>
           <?php if(isset($line['lineName'])):?>
           <?php
-          if($this->config->systemMode == 'new')
+          if($this->config->systemMode == 'new' and $programID)
           {
               $trAttrs  = "data-id='line.$lineID' data-parent='program.$programID'";
               $trClass .= ' is-nest-child  table-nest';
@@ -110,9 +110,11 @@
           $trClass = '';
           if($product->line)
           {
+              $path = "$product->line,$product->id";
+              if($this->config->systemMode == 'new' and $product->program) $path = "$product->program,$path";
               $trAttrs  = "data-id='$product->id' data-parent='line.$product->line'";
               $trClass .= ' is-nest-child  table-nest';
-              $trAttrs .= " data-nest-parent='line.$product->line' data-nest-path='line.$product->program,$product->line,$product->id'";
+              $trAttrs .= " data-nest-parent='line.$product->line' data-nest-path='line.{$path}'";
           }
           elseif($product->program)
           {
diff --git a/module/task/css/create.css b/module/task/css/create.css
index b9fc9218b2..8df0054d67 100644
--- a/module/task/css/create.css
+++ b/module/task/css/create.css
@@ -2,7 +2,7 @@
 
 .title-group.required:after {display: none;}
 .title-group.required > .required:after {display: block; right: 29px; top: 5px;}
-#copyStory-input:after {display: block; right: 85px; top: 5px;}
+#copyStory-input:after {display: block; right: 110px; top: 5px;}
 #pri + .chosen-container > .chosen-single {border-top-left-radius: 0 !important; border-bottom-left-radius: 0 !important;}
 
 .pri-selector > .btn {padding: 5px 8px !important; width: 100%;}
diff --git a/module/task/js/create.js b/module/task/js/create.js
index e8f48c8011..519a1581d3 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -186,12 +186,14 @@ function setPreview()
     {
         storyLink  = createLink('story', 'view', "storyID=" + $('#story').val());
         var concat = config.requestType != 'GET' ? '?'  : '&';
-        storyLink  = storyLink + concat + 'onlybody=yes';
+
+        if(storyLink.indexOf("onlybody=yes") < 0) storyLink = storyLink + concat + 'onlybody=yes';
+
         $('#preview').removeClass('hidden');
         $('#preview a').attr('href', storyLink);
         $('#copyButton').removeClass('hidden');
         $('.title-group.required > div').attr('id', 'copyStory-input').removeClass('.required');
-        $('div.colorpicker').css('right', '90px');//Adjust for task #4151;
+        $('div.colorpicker').css('right', '80px');//Adjust for task #4151;
         $('#copyButton').css('width', '80px');
     }
 
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index a1a52b671d..246eb73ade 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -128,7 +128,7 @@
         <?php echo $this->buildOperateMenu($case, 'view');?>
 
         <?php
-        common::printIcon('testcase', 'edit',"caseID=$case->id", $case, 'button', '', '', 'showinonlybody');
+        if(!isonlybody()) common::printIcon('testcase', 'edit',"caseID=$case->id", $case, 'button', '', '', 'showinonlybody');
         if(!$isLibCase and $case->auto != 'unit') common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$case->id", $case, 'button', 'copy');
         if($isLibCase and common::hasPriv('caselib', 'createCase')) echo html::a($this->createLink('caselib', 'createCase', "libID=$case->lib&moduleID=$case->module&param=$case->id", $case), "<i class='icon-copy'></i>", '', "class='btn' title='{$lang->testcase->copy}'");
         common::printIcon('testcase', 'delete', "caseID=$case->id", $case, 'button', 'trash', 'hiddenwin', '');
@@ -177,7 +177,7 @@
 
                     foreach($modulePath as $key => $module)
                     {
-                        if($this->app->openApp == 'qa')
+                        if($this->app->openApp == 'qa' || $this->app->openApp == 'ops')
                         {
                             if($isLibCase)
                             {
diff --git a/module/tree/control.php b/module/tree/control.php
index ea7e48d692..214b4c6bdd 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -395,7 +395,9 @@ class tree extends control
         if($confirm == 'no')
         {
             $module = $this->tree->getByID($moduleID);
-            $confirmLang = $module->type == 'line' ? $this->lang->tree->confirmDeleteLine : $this->lang->tree->confirmDelete;
+            $confirmLang = $this->lang->tree->confirmDelete;
+            if($module->type == 'line') $confirmLang = $this->lang->tree->confirmDeleteLine;
+            if($module->type == 'host') $confirmLang = $this->lang->tree->confirmDeleteHost;
             die(js::confirm($confirmLang, $this->createLink('tree', 'delete', "rootID=$rootID&moduleID=$moduleID&confirm=yes")));
         }
         else