diff --git a/module/testcase/view/automation.html.php b/module/testcase/view/automation.html.php
index 9055ffb25e..0bfc8d1f25 100644
--- a/module/testcase/view/automation.html.php
+++ b/module/testcase/view/automation.html.php
@@ -35,6 +35,7 @@
           <th class='w-100px'><?php echo $lang->zanode->common;?></th>
           <td class='required'><?php echo html::select('node', $nodeList, !empty($automation->node) ? $automation->node : '', "class='form-control picker-select'");?></td>
           <td></td>
+          <td></td>
         </tr>
         <tr>
           <th>
@@ -49,13 +50,13 @@
           <th>
             <?php echo $lang->zanode->shell;?>
           </th>
-          <td><?php echo html::textarea('shell', !empty($automation->shell) ? $automation->shell : '', "rows='6' class='form-control'");?></td>
+          <td colspan='2'><?php echo html::textarea('shell', !empty($automation->shell) ? $automation->shell : '', "rows='6' class='form-control'");?></td>
           <td>
             <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='left' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->zanode->shellTips;?>"></icon>
           </td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center'>
+          <td colspan='3' class='text-center'>
             <?php if($productID) echo html::hidden('product', $productID);?>
             <?php if($automation) echo html::hidden('id', $automation->id);?>
             <?php echo html::submitButton();?>
diff --git a/module/zahost/view/view.html.php b/module/zahost/view/view.html.php
index 4dc5e4c193..13a3a37fa6 100644
--- a/module/zahost/view/view.html.php
+++ b/module/zahost/view/view.html.php
@@ -45,7 +45,7 @@
             <div class="col-4">
               <div class="main-row">
                 <div class="col-4 text-right"><?php echo $lang->zahost->cpuCores;?>:</div>
-                <div class="col-7"><?php echo $zahost->cpuCores . $lang->zahost->cpuUnit;?></div>
+                <div class="col-7"><?php echo $zahost->cpuCores . ' ' . $lang->zahost->cpuUnit;?></div>
               </div>
             </div>
             <div class="col-4">
@@ -65,7 +65,7 @@
             <div class="col-4">
               <div class="main-row">
                 <div class="col-4 text-right"><?php echo $lang->zahost->memory;?>:</div>
-                <div class="col-7"><?php echo $zahost->memory . $lang->zahost->unitList['GB'];;?></div>
+                <div class="col-7"><?php echo $zahost->memory . ' ' . $lang->zahost->unitList['GB'];;?></div>
               </div>
             </div>
             <div class="col-4">
@@ -85,7 +85,7 @@
             <div class="col-4">
               <div class="main-row">
                 <div class="col-4 text-right"><?php echo $lang->zahost->diskSize;?>:</div>
-                <div class="col-7"><?php echo $zahost->diskSize . $lang->zahost->unitList['GB'];?></div>
+                <div class="col-7"><?php echo $zahost->diskSize . ' ' . $lang->zahost->unitList['GB'];?></div>
               </div>
             </div>
             <div class="col-4">