diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index e05274d8f7..f5f43fd1ab 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1219,15 +1219,19 @@ $lang->caselib->methodOrder[45] = 'import';
 $lang->caselib->methodOrder[50] = 'showImport';
 
 $lang->resource->zahost = new stdclass();
-$lang->resource->zahost->browse         = 'browse';
-$lang->resource->zahost->create         = 'create';
-$lang->resource->zahost->edit           = 'editAction';
-$lang->resource->zahost->delete         = 'deleteAction';
+$lang->resource->zahost->browse      = 'browse';
+$lang->resource->zahost->create      = 'create';
+$lang->resource->zahost->edit        = 'editAction';
+$lang->resource->zahost->delete      = 'deleteAction';
+$lang->resource->zahost->view        = 'view';
+$lang->resource->zahost->browseImage = 'browseImage';
 
 $lang->zahost->methodOrder[0]  = 'browse';
 $lang->zahost->methodOrder[5]  = 'create';
 $lang->zahost->methodOrder[10] = 'edit';
 $lang->zahost->methodOrder[15] = 'delete';
+$lang->zahost->methodOrder[20] = 'view';
+$lang->zahost->methodOrder[25] = 'browseImage';
 
 $lang->resource->zanode = new stdclass();
 $lang->resource->zanode->browse  = 'browse';
@@ -1239,6 +1243,8 @@ $lang->resource->zanode->resume  = 'resume';
 $lang->resource->zanode->getVNC  = 'getVNC';
 $lang->resource->zanode->start   = 'boot';
 $lang->resource->zanode->close   = 'shutdown';
+$lang->resource->zanode->view    = 'view';
+$lang->resource->zanode->createImage = 'createImage';
 
 $lang->zanode->methodOrder[5]  = 'browse';
 $lang->zanode->methodOrder[10] = 'create';
@@ -1249,6 +1255,8 @@ $lang->zanode->methodOrder[30] = 'resume';
 $lang->zanode->methodOrder[35] = 'getVNC';
 $lang->zanode->methodOrder[40] = 'start';
 $lang->zanode->methodOrder[45] = 'close';
+$lang->zanode->methodOrder[50] = 'view';
+$lang->zanode->methodOrder[55] = 'createImage';
 
 $lang->resource->repo                  = new stdclass();
 $lang->resource->repo->browse          = 'browseAction';
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index aa93e224c8..5af3600645 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -195,7 +195,9 @@
     <?php if(!empty($productID)): ?>
     <div class='btn-group'>
       <?php common::printLink('testcase', 'automation', "productID=$productID", "<i class='icon-wrench muted'> </i>" . $lang->testcase->automation, '', "class='btn btn-link iframe' data-width='50%'", true, true)?>
+      <?php if(common::hasPriv('testcase', 'automation')):?>
       <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='bottom' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->zanode->automationTips;?>"></icon>
+      <?php endif;?>
     </div>
     <div class='btn-group'>
       <button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown'>
diff --git a/module/zahost/lang/de.php b/module/zahost/lang/de.php
index 28bf968144..f29a6f5ad0 100644
--- a/module/zahost/lang/de.php
+++ b/module/zahost/lang/de.php
@@ -33,10 +33,11 @@ $lang->zahost->editedBy     = 'EditedBy';
 $lang->zahost->editedDate   = 'EditedDate';
 $lang->zahost->registerDate = 'RegisterDate';
 
-$lang->zahost->memorySize = $lang->zahost->memory;
-$lang->zahost->cpuCoreNum = $lang->zahost->cpuCores;
-$lang->zahost->os         = 'System';
-$lang->zahost->imageName  = 'Image File';
+$lang->zahost->memorySize   = $lang->zahost->memory;
+$lang->zahost->cpuCoreNum   = $lang->zahost->cpuCores;
+$lang->zahost->os           = 'System';
+$lang->zahost->imageName    = 'Image File';
+$lang->zahost->browseImage  = 'Image List';
 
 $lang->zahost->createZanode        = 'Create Zanode';
 $lang->zahost->initNotice          = 'Save successfully, initialize the ZAhost or return list';
diff --git a/module/zahost/lang/en.php b/module/zahost/lang/en.php
index 28bf968144..f29a6f5ad0 100644
--- a/module/zahost/lang/en.php
+++ b/module/zahost/lang/en.php
@@ -33,10 +33,11 @@ $lang->zahost->editedBy     = 'EditedBy';
 $lang->zahost->editedDate   = 'EditedDate';
 $lang->zahost->registerDate = 'RegisterDate';
 
-$lang->zahost->memorySize = $lang->zahost->memory;
-$lang->zahost->cpuCoreNum = $lang->zahost->cpuCores;
-$lang->zahost->os         = 'System';
-$lang->zahost->imageName  = 'Image File';
+$lang->zahost->memorySize   = $lang->zahost->memory;
+$lang->zahost->cpuCoreNum   = $lang->zahost->cpuCores;
+$lang->zahost->os           = 'System';
+$lang->zahost->imageName    = 'Image File';
+$lang->zahost->browseImage  = 'Image List';
 
 $lang->zahost->createZanode        = 'Create Zanode';
 $lang->zahost->initNotice          = 'Save successfully, initialize the ZAhost or return list';
diff --git a/module/zahost/lang/fr.php b/module/zahost/lang/fr.php
index e62e45edcd..f29a6f5ad0 100644
--- a/module/zahost/lang/fr.php
+++ b/module/zahost/lang/fr.php
@@ -5,13 +5,13 @@ $lang->zahost->browse         = 'Host List';
 $lang->zahost->create         = 'Add Host';
 $lang->zahost->view           = 'Host View';
 $lang->zahost->init           = 'Init Host';
-$lang->zahost->edit           = 'Éditer';
+$lang->zahost->edit           = 'Edit';
 $lang->zahost->editAction     = 'Edit Host';
 $lang->zahost->delete         = 'Delete';
 $lang->zahost->cancel         = "Cancel";
-$lang->zahost->editAction     = 'Éditer Hôte';
-$lang->zahost->delete         = 'Supprimer';
-$lang->zahost->deleteAction   = 'Supprimer Hôte';
+$lang->zahost->deleteAction   = 'Delete Host';
+$lang->zahost->byQuery        = 'Search';
+$lang->zahost->all            = 'All';
 $lang->zahost->browseNode     = 'ZAnode Browse';
 $lang->zahost->deleted        = "Deleted";
 $lang->zahost->copy           = 'Click to copy';
@@ -22,7 +22,7 @@ $lang->zahost->IP          = 'Extranet Address';
 $lang->zahost->extranet    = 'Extranet Address';
 $lang->zahost->memory      = 'Memory Size';
 $lang->zahost->cpuCores    = 'CPU';
-$lang->zahost->diskSize    = 'diskSize Size';
+$lang->zahost->diskSize    = 'Disk Size';
 $lang->zahost->desc        = 'Description';
 $lang->zahost->type        = 'Type';
 $lang->zahost->status      = 'Status';
@@ -33,10 +33,11 @@ $lang->zahost->editedBy     = 'EditedBy';
 $lang->zahost->editedDate   = 'EditedDate';
 $lang->zahost->registerDate = 'RegisterDate';
 
-$lang->zahost->memorySize = $lang->zahost->memory;
-$lang->zahost->cpuCoreNum = $lang->zahost->cpuCores;
-$lang->zahost->os         = 'System';
-$lang->zahost->imageName  = 'Image File';
+$lang->zahost->memorySize   = $lang->zahost->memory;
+$lang->zahost->cpuCoreNum   = $lang->zahost->cpuCores;
+$lang->zahost->os           = 'System';
+$lang->zahost->imageName    = 'Image File';
+$lang->zahost->browseImage  = 'Image List';
 
 $lang->zahost->createZanode        = 'Create Zanode';
 $lang->zahost->initNotice          = 'Save successfully, initialize the ZAhost or return list';
@@ -47,7 +48,7 @@ $lang->zahost->uninitNotice        = 'Please init the host first';
 $lang->zahost->netError            = 'Unable to connect to the host, please check the network and try again.';
 
 $lang->zahost->init = new stdclass;
-$lang->zahost->init->checkStatus   = "Check Service Status";
+$lang->zahost->init->statusTitle = "Status";
 $lang->zahost->init->checkStatus   = "Check Service Status";
 $lang->zahost->init->not_install   = "Not installed";
 $lang->zahost->init->not_available = "Installed, Not Started";
@@ -117,7 +118,7 @@ $lang->zahost->cpuUnit = 'CORE';
 $lang->zahost->zaHostType                 = 'Type';
 $lang->zahost->zaHostTypeList['physical'] = 'Physical';
 
-$lang->zahost->confirmDelete           = 'Voulez-vous supprimer cet hôte?';
+$lang->zahost->confirmDelete           = 'Do you want to delete this host?';
 $lang->zahost->cancelDelete            = 'Do you want to cancel this download task?';
 
 $lang->zahost->notice = new stdclass();
diff --git a/module/zahost/lang/zh-cn.php b/module/zahost/lang/zh-cn.php
index 11de845915..8f8465d300 100644
--- a/module/zahost/lang/zh-cn.php
+++ b/module/zahost/lang/zh-cn.php
@@ -33,10 +33,11 @@ $lang->zahost->editedBy     = '由谁修改';
 $lang->zahost->editedDate   = '最后修改时间';
 $lang->zahost->registerDate = '最后注册时间';
 
-$lang->zahost->memorySize = $lang->zahost->memory;
-$lang->zahost->cpuCoreNum = $lang->zahost->cpuCores;
-$lang->zahost->os         = '操作系统';
-$lang->zahost->imageName  = '镜像文件';
+$lang->zahost->memorySize  = $lang->zahost->memory;
+$lang->zahost->cpuCoreNum  = $lang->zahost->cpuCores;
+$lang->zahost->os          = '操作系统';
+$lang->zahost->imageName   = '镜像文件';
+$lang->zahost->browseImage = '镜像列表';
 
 $lang->zahost->createZanode        = '创建执行节点';
 $lang->zahost->initNotice          = '保存成功，请您初始化宿主机或返回列表。';
diff --git a/module/zahost/view/browse.html.php b/module/zahost/view/browse.html.php
index 325e27ad48..0182c0c876 100644
--- a/module/zahost/view/browse.html.php
+++ b/module/zahost/view/browse.html.php
@@ -75,7 +75,7 @@
             <?php $disabled = !empty($nodeList[$host->hostID]) ? 'disabled' : '';?>
             <?php $title    = !empty($nodeList[$host->hostID]) ? $lang->zahost->undeletedNotice : $lang->zahost->delete;?>
             <?php common::printIcon('zahost', 'edit', "hostID={$host->hostID}", $host, 'list');?>
-            <?php echo html::a($this->createLink('zahost', 'delete', "hostID={$host->id}"), '<i class="icon-trash"></i>', 'hiddenwin', "title='$title' class='btn $disabled'");;?>
+            <?php if(common::hasPriv('zahost', 'delete')) echo html::a($this->createLink('zahost', 'delete', "hostID={$host->id}"), '<i class="icon-trash"></i>', 'hiddenwin', "title='$title' class='btn $disabled'");;?>
           </td>
         </tr>
         <?php endforeach;?>
diff --git a/module/zahost/view/view.html.php b/module/zahost/view/view.html.php
index 948c25d4c7..4dc5e4c193 100644
--- a/module/zahost/view/view.html.php
+++ b/module/zahost/view/view.html.php
@@ -112,7 +112,7 @@
             </div>
             <div class='result'>
               <?php $imageLink  = html::a($this->createLink('zahost', 'browseImage', "hostID=$zahost->id", '', true), $lang->zahost->image->downloadImage, '', "class='iframe'");?>
-              <?php $createNode = html::a($this->createLink('zanode', 'create'), $lang->zahost->createZanode);?>
+              <?php $createNode = html::a($this->createLink('zanode', 'create', "hostID=$zahost->id"), $lang->zahost->createZanode);?>
               <div class='hide init-success'><?php echo sprintf($lang->zahost->init->initSuccessNotice, $imageLink, $createNode);?></div>
               <div class='hide init-fail'>
                 <?php echo $lang->zahost->init->initFailNotice;?>
diff --git a/module/zanode/control.php b/module/zanode/control.php
index da6e028ffd..6b50f0dd41 100644
--- a/module/zanode/control.php
+++ b/module/zanode/control.php
@@ -55,13 +55,13 @@ class zanode extends control
     }
 
     /**
-     * Create node page.
+     * Create node.
      *
-     * @param  int    $imageID
+     * @param  int    $hostID
      * @access public
      * @return void
      */
-    public function create()
+    public function create($hostID = 0)
     {
         $this->loadModel('zahost');
         if(!empty($_POST))
@@ -73,9 +73,7 @@ class zanode extends control
 
         $this->view->title     = $this->lang->zanode->create;
         $this->view->hostPairs = array('' => '') + $this->loadModel('zahost')->getPairs('host');
-        $this->view->notice     = $this->lang->zanode->initNotice;
-        $this->view->buttonName = $this->lang->zanode->initButton;
-        $this->view->closeLink  = $this->createLink('zanode', 'browse');
+        $this->view->hostID    = $hostID;
 
         return $this->display();
     }
diff --git a/module/zanode/js/common.js b/module/zanode/js/common.js
index 471e22070d..a9b33c5f1c 100644
--- a/module/zanode/js/common.js
+++ b/module/zanode/js/common.js
@@ -18,6 +18,7 @@ $(function()
         }
     });
 
+    if(hostID) $('#parent').change();
     $(document).on("change", '#image', function()
     {
         var image = $('#image').val();
diff --git a/module/zanode/view/create.html.php b/module/zanode/view/create.html.php
index 65d7386b63..64f706abb5 100644
--- a/module/zanode/view/create.html.php
+++ b/module/zanode/view/create.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include $app->getModuleRoot() . 'common/view/kindeditor.html.php';?>
+<?php js::set('hostID', $hostID);?>
 <div id='mainContent' class='main-row'>
   <div class='main-col main-content'>
     <div class='center-block'>
@@ -23,7 +24,7 @@
         <table class='table table-form'>
           <tr>
             <th><?php echo $lang->zanode->hostName;?></th>
-            <td><?php echo html::select('parent', $hostPairs, '', "class='form-control chosen'")?></td>
+            <td><?php echo html::select('parent', $hostPairs, $hostID, "class='form-control chosen'")?></td>
             <td></td>
           </tr>
           <tr>
@@ -78,5 +79,4 @@
     </div>
   </div>
 </div>
-<?php include $app->getModuleRoot() . 'common/view/successmodal.html.php';?>
 <?php include $app->getModuleRoot() . 'common/view/footer.html.php';?>