diff --git a/web/templates/admin/add_dns.html b/web/templates/admin/add_dns.html
index 8ad414fb..564ca5fa 100644
--- a/web/templates/admin/add_dns.html
+++ b/web/templates/admin/add_dns.html
@@ -108,20 +108,20 @@
                                         <tr>
                                             <td>
                                                 <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo 'value="'.htmlentities($v_ns1).'"'; ?>>
-                                                <span class="remove-ns additional-control delete">delete</span>
+                                                <span class="remove-ns additional-control delete"><?=__('delete')?></span>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
                                                 <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo 'value="'.htmlentities($v_ns2).'"'; ?>>
-                                                <span class="remove-ns additional-control delete">delete</span>
+                                                <span class="remove-ns additional-control delete"><?=__('delete')?></span>
                                             </td>
                                         </tr>
                             <?  if($v_ns3)
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns3" value="'.htmlentities($v_ns3).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -129,7 +129,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns4" value="'.htmlentities($v_ns4).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -137,7 +137,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns5" value="'.htmlentities($v_ns5).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -145,7 +145,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns6" value="'.htmlentities($v_ns6).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -153,7 +153,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns7" value="'.htmlentities($v_ns7).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -161,13 +161,13 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns8" value="'.htmlentities($v_ns8).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
                             ?>
                                 <tr class="add-ns" <? if($v_ns8) echo 'style="display:none;"'; ?> >
                                     <td class="step-top-small">
-                                      <span class="add-ns-button additional-control add">Add one more Name Server</span>
+                                      <span class="add-ns-button additional-control add"><?=__('Add one more Name Server')?></span>
                                     </td>
                                 </tr>
 
diff --git a/web/templates/admin/add_dns_rec.html b/web/templates/admin/add_dns_rec.html
index 23836cac..af105041 100644
--- a/web/templates/admin/add_dns_rec.html
+++ b/web/templates/admin/add_dns_rec.html
@@ -31,7 +31,6 @@
         ?>
         <form id="vstobjects" name="v_add_dns_rec" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
-            <input type="hidden" name="ok" value="Add" />
             <table class="data mode-add">
                 <tr class="data-add">
                     <td class="data-dotted">
diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html
index 1028da28..bf6f33d1 100644
--- a/web/templates/admin/add_user.html
+++ b/web/templates/admin/add_user.html
@@ -69,7 +69,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_username" <?php if (!empty($v_username)) echo "value=".htmlentities($v_username);  ?> >
+                                    <input type="text" size="20" class="vst-input" name="v_username" <?php if (!empty($v_username)) echo "value=".htmlentities($v_username);  ?> tabindex="1" >
                                 </td>
                             </tr>
                             <tr>
@@ -79,7 +79,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input password" name="v_password"  <?php if (!empty($v_password)) echo "value=".htmlentities($v_password);  ?>>
+                                    <input type="text" size="20" class="vst-input password" name="v_password"  <?php if (!empty($v_password)) echo "value=".htmlentities($v_password);  ?> tabindex="2" >
                                 </td>
                             </tr>
                             <tr>
@@ -89,7 +89,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_email" id='v_email' <?php if (!empty($v_email)) echo "value=".htmlentities($v_email); ?>>
+                                    <input type="text" size="20" class="vst-input" name="v_email" id='v_email' <?php if (!empty($v_email)) echo "value=".htmlentities($v_email); ?> tabindex="3" >
                                 </td>
                             </tr>
                             <tr>
@@ -99,7 +99,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <select class="vst-list" name="v_package">
+                                    <select class="vst-list" name="v_package" tabindex="4" >
                                         <?php
                                             foreach ($data as $key => $value) {
                                                 echo "\n\t\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($key)."\"";
@@ -123,7 +123,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <select class="vst-list" name="v_language">
+                                    <select class="vst-list" name="v_language" tabindex="5" >
                                         <?php
                                             foreach ($languages as $key => $value) {
                                                 echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($value)."\"";
@@ -149,7 +149,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_fname" <?php if (!empty($v_fname)) echo "value=".htmlentities($v_fname); ?>>
+                                    <input type="text" size="20" class="vst-input" name="v_fname" <?php if (!empty($v_fname)) echo "value=".htmlentities($v_fname); ?> tabindex="6" >
                                 </td>
                             </tr>
                             <tr>
@@ -159,7 +159,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_lname" <?php if (!empty($v_lname)) echo "value=".htmlentities($v_lname); ?>>
+                                    <input type="text" size="20" class="vst-input" name="v_lname" <?php if (!empty($v_lname)) echo "value=".htmlentities($v_lname); ?> tabindex="7" >
                                 </td>
                             </tr>
                             <tr>
@@ -169,7 +169,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text"  class="vst-input" name="v_notify" id="v_notify" <?php if (!empty($v_notify)) echo "value=".htmlentities($v_notify); ?>>
+                                    <input type="text"  class="vst-input" name="v_notify" id="v_notify" <?php if (!empty($v_notify)) echo "value=".htmlentities($v_notify); ?> tabindex="8" >
                                 </td>
                             </tr>
 
diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html
index c85e7c22..894a8a2c 100644
--- a/web/templates/admin/edit_user.html
+++ b/web/templates/admin/edit_user.html
@@ -183,20 +183,20 @@
                             <tr>
                                 <td>
                                     <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo 'value="'.htmlentities($v_ns1).'"'; ?>>
-                                    <span class="remove-ns additional-control delete">delete</span>
+                                    <span class="remove-ns additional-control delete"><?=__('delete')?></span>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
                                     <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo 'value="'.htmlentities($v_ns2).'"'; ?>>
-                                    <span class="remove-ns additional-control delete">delete</span>
+                                    <span class="remove-ns additional-control delete"><?=__('delete')?></span>
                                 </td>
                             </tr>
                             <?  if($v_ns3)
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns3" value="'.htmlentities($v_ns3).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -204,7 +204,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns4" value="'.htmlentities($v_ns4).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -212,7 +212,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns5" value="'.htmlentities($v_ns5).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -220,7 +220,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns6" value="'.htmlentities($v_ns6).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -228,7 +228,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns7" value="'.htmlentities($v_ns7).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -236,14 +236,14 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns8" value="'.htmlentities($v_ns8).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
                             ?>
 
                                 <tr class="add-ns" <? if($v_ns8) echo 'style="display:none;"'; ?> >
                                     <td class="step-top-small">
-                                      <span class="add-ns-button additional-control add">Add one more Name Server</span>
+                                      <span class="add-ns-button additional-control add"><?=__('Add one more Name Server')?></span>
                                     </td>
                                 </tr>
 
diff --git a/web/templates/admin/list_backup_detail.html b/web/templates/admin/list_backup_detail.html
index a87bbae8..87115f09 100644
--- a/web/templates/admin/list_backup_detail.html
+++ b/web/templates/admin/list_backup_detail.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/schedule/restore/?backup=<?=$_GET['backup']?>" class="l-sort__create-btn restore" title="<?=str_replace(' ', '&nbsp;', __('Restore All'))?>"></a>
+        <a href="/schedule/restore/?backup=<?=htmlentities($_GET['backup'])?>" class="l-sort__create-btn restore" title="<?=str_replace(' ', '&nbsp;', __('Restore All'))?>"></a>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -18,7 +18,7 @@
               <td>
                 <form action="/bulk/restore/" method="post">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
-                <input type="hidden" name="backup" value="<?php echo $_GET['backup'] ?>">
+                <input type="hidden" name="backup" value="<?=htmlentities($_GET['backup']); ?>">
                 <div class="l-select">
                   <select name="" id="">
                     <option value=""><?=__('apply to selected')?></option>
diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html
index f12500fa..e04033ea 100644
--- a/web/templates/admin/list_dns_rec.html
+++ b/web/templates/admin/list_dns_rec.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/dns/?domain=<?=$_GET['domain']?>" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Record'))?>" class="l-sort__create-btn"></a>
+        <a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Record'))?>" class="l-sort__create-btn"></a>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html
index 253e0194..bc7b6c23 100644
--- a/web/templates/admin/list_mail_acc.html
+++ b/web/templates/admin/list_mail_acc.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/mail/?domain=<?=$_GET['domain']?>" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Mail Account'))?>"></a>
+        <a href="/add/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Mail Account'))?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Account')?></span><span class="up">&nbsp;</span></li>
diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html
index 9106b06c..2a36447b 100644
--- a/web/templates/admin/list_services.html
+++ b/web/templates/admin/list_services.html
@@ -5,9 +5,6 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <td class="step-right">
-                <a class="vst" href="/list/server/?cpu" target="_blank" > <?php print __('show: CPU / MEM / NET / DISK'); ?> </a>
-              </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -15,6 +12,9 @@
                   <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
                 </form>
               </td>
+              <td class="step-right">
+                <a class="vst" href="/list/server/?cpu" target="_blank" > <?=__('show: CPU / MEM / NET / DISK');?> </a>
+              </td>
               <td class="toggle-all">
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html
index 6a7a8270..ecb6f802 100644
--- a/web/templates/user/list_dns_rec.html
+++ b/web/templates/user/list_dns_rec.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/dns/?domain=<?=$_GET['domain']?>" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Record'))?>" class="l-sort__create-btn"></a>
+        <a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Record'))?>" class="l-sort__create-btn"></a>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html
index d510445a..3840b7ad 100644
--- a/web/templates/user/list_mail_acc.html
+++ b/web/templates/user/list_mail_acc.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/mail/?domain=<?=$_GET['domain']?>" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Mail Account'))?>"></a>
+        <a href="/add/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Mail Account'))?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Account')?></span><span class="up">&nbsp;</span></li>