diff --git a/db/update18.0.beta3.sql b/db/update18.0.beta3.sql
index 2d735195ee..178a4608a4 100644
--- a/db/update18.0.beta3.sql
+++ b/db/update18.0.beta3.sql
@@ -107,5 +107,5 @@ CREATE TABLE `zt_automation` (
 
 ALTER TABLE `zt_repofiles` ADD `oldPath` varchar(255) DEFAULT '' AFTER `path`;
 ALTER TABLE `zt_case` ADD `script` longtext NOT NULL AFTER `howRun`;
-ALTER TABLE `zt_testresult` ADD `ZTFResult` text NOT NULL;
-ALTER TABLE `zt_testresult` ADD `node` int(8) unsigned NOT NULL DEFAULT '0';
+ALTER TABLE `zt_testresult` ADD `ZTFResult` text NOT NULL AFTER `stepResults`;
+ALTER TABLE `zt_testresult` ADD `node` int(8) unsigned NOT NULL DEFAULT '0' AFTER `stepResults`;
diff --git a/module/testcase/css/edit.css b/module/testcase/css/edit.css
index 0d16991789..e0eeacd744 100644
--- a/module/testcase/css/edit.css
+++ b/module/testcase/css/edit.css
@@ -2,9 +2,15 @@
 .col-side .chosen-container {width: 218px !important;}
 .table-form > tbody > tr > td .btn.addbutton {display: block; margin: 1px 0px; width: 40px; padding: 1px 6px;}
 .table-form > tbody > tr > td .btn.delbutton {display: block; margin: 1px 0px; width: 40px; padding: 1px 6px;}
- #branch {width: 95px!important;}
- .detail > table > tbody th {width: 100px !important;}
- [lang^=en] .detail > table > tbody th, [lang^=fr] .detail > table > tbody th {width: 100px !important;}
- [lang^=de] .detail > table > tbody th {width: 125px !important;}
- .linkCaseTitle, .linkBugTitle {white-space: nowrap;}
- #type_chosen{display: table-cell;}
+#branch {width: 95px!important;}
+.detail > table > tbody th {width: 100px !important;}
+[lang^=en] .detail > table > tbody th, [lang^=fr] .detail > table > tbody th {width: 100px !important;}
+[lang^=de] .detail > table > tbody th {width: 125px !important;}
+.linkCaseTitle, .linkBugTitle {white-space: nowrap;}
+#type_chosen{display: table-cell;}
+.autoScript .file-input .file-title{max-width: 70px;}
+
+@media screen and (max-width: 1366px) {
+  #module_chosen{min-width: 60px;}
+}
+
diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php
index 764ab94e4a..74a751fc47 100644
--- a/module/testcase/lang/de.php
+++ b/module/testcase/lang/de.php
@@ -99,7 +99,7 @@ $lang->testcase->suite            = 'Test Suite';
 $lang->testcase->executionStatus  = 'executionStatus';
 $lang->testcase->caseType         = 'Case Type';
 $lang->testcase->allType          = 'All Types';
-$lang->testcase->showAutoCase     = 'Automated Test Cases';
+$lang->testcase->showAutoCase     = 'Automated';
 $lang->testcase->automation       = 'Automation Test';
 
 $lang->case = $lang->testcase;  // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index d6988bbdec..eff259962d 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -99,7 +99,7 @@ $lang->testcase->suite            = 'Test Suite';
 $lang->testcase->executionStatus  = 'executionStatus';
 $lang->testcase->caseType         = 'Case Type';
 $lang->testcase->allType          = 'All Types';
-$lang->testcase->showAutoCase     = 'Automated Test Cases';
+$lang->testcase->showAutoCase     = 'Automated';
 $lang->testcase->automation       = 'Automation Test';
 
 $lang->case = $lang->testcase;  // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php
index 2bcd5aafb0..bf74a1402e 100644
--- a/module/testcase/lang/fr.php
+++ b/module/testcase/lang/fr.php
@@ -99,7 +99,7 @@ $lang->testcase->suite            = 'Test Suite';
 $lang->testcase->executionStatus  = 'executionStatus';
 $lang->testcase->caseType         = 'Case Type';
 $lang->testcase->allType          = 'All Types';
-$lang->testcase->showAutoCase     = 'Automated Test Cases';
+$lang->testcase->showAutoCase     = 'Automated';
 $lang->testcase->automation       = 'Automation Test';
 
 $lang->case = $lang->testcase;  // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
diff --git a/module/zanode/control.php b/module/zanode/control.php
index b90c0a2194..02942e120f 100644
--- a/module/zanode/control.php
+++ b/module/zanode/control.php
@@ -285,7 +285,7 @@ class zanode extends control
     {
         if($confirm == 'no')
         {
-            return print(js::confirm($this->lang->zanode->confirmDelete, inlink('delete', "zanodeID={$nodeID}&confirm=yes")));
+            return print(js::confirm($this->lang->zanode->confirmDelete, inlink('destroy', "zanodeID={$nodeID}&confirm=yes")));
         }
 
         $error = $this->zanode->destroy($nodeID);