diff --git a/web/css/ie.css b/web/css/ie.css
new file mode 100644
index 00000000..6df370bb
--- /dev/null
+++ b/web/css/ie.css
@@ -0,0 +1,20 @@
+html, body, div, span, applet, object, iframe {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font-size: 100%;
+    font: inherit;
+    vertical-align: baseline;
+}
+
+.vst-advanced {
+    text-decoration: underline;
+}
+
+#vstobjects{
+    padding-top: 182px;
+    min-height: 370px;
+    height: auto !important;
+    height: 370px;
+    width: 1000px;
+}
diff --git a/web/css/main.css b/web/css/main.css
new file mode 100644
index 00000000..907741c8
--- /dev/null
+++ b/web/css/main.css
@@ -0,0 +1,813 @@
+body {
+    font-family: Arial, Helvetica, sans-serif;
+    background-color: #e5e5e5;
+    margin: 0;
+    padding: 0;
+    border: 0;
+}
+
+form {
+    margin: 0;
+}
+
+.hidden {
+    display: none;
+}
+
+.top {
+    width: 1000px;
+    position: fixed; background: #fff;
+    border-bottom: 1px solid #e5e5e5;
+}
+
+.top-menu {
+    height: 22px;
+    background-color: #505050;
+}
+
+.top-link {
+    float: left;
+    color: #f0f0f0;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 10pt;
+    font-weight: bold;
+    text-decoration: none;
+    line-height: 21px;
+    padding: 0 20px 1px;
+}
+
+.top-link:hover {
+    color: #fff;
+    background-color: #999;
+}
+
+.top-link:active{
+    color: #fff;
+    background-color: #f79b44;
+}
+
+.top-selected-link {
+    float: left;
+    color: #174f82;
+    background-color: #fff;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 10pt;
+    font-weight: bold;
+    text-decoration: none;
+    line-height: 21px;
+    padding: 0 20px 1px;
+}
+
+.top-selected-link:hover {
+    color: #fff;
+    background-color: #999;
+}
+
+.top-selected-link:active {
+    color: #fff;
+    background-color: #f79b44;
+}
+
+.top-user {
+    float: left;
+    line-height: 21px;
+    padding: 0 4px 1px;
+    text-decoration: none;
+    color: #ffce4f;
+    font-size: 10pt;
+    font-weight: bold;
+    font-family: Arial, Helvetica, sans-serif;
+}
+
+.top-user:hover {
+    color: #fff;
+}
+
+.top-user:active{
+    color: #fff;
+    background-color: #f79b44;
+}
+
+.top-logout {
+    float: left;
+    color: #f0f0f0;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 10pt;
+    font-weight: bold;
+    text-decoration: none;
+    line-height: 21px;
+    padding: 0 18px 1px 4px;
+}
+
+.top-logout:hover {
+    color: #fff;
+    background-color: #999;
+}
+
+.top-logout:active {
+    color: #fff;
+    background-color: #f79b44;
+}
+
+.nav-logo {
+    float: left;
+    height: 105px;
+    width: 167px;
+    margin: 0;
+    border-bottom: 1px solid #e5e5e5;
+}
+
+.nav-lnk {
+    text-decoration: none;
+    color: #222;
+    float:left;
+}
+
+.nav-lnk:active {
+    color: #f79b44;
+}
+
+.nav-block {
+    font-family: Arial, Helvetica, sans-serif;
+    margin: 0;
+    height: 105px;
+    width: 119px;
+    float:left;
+    cursor: pointer;
+    border-bottom: 1px solid #e5e5e5;
+}
+
+.nav-block:hover {
+    height:102px;
+    border-bottom: 4px solid #f79b44;
+}
+
+.nav-selected-block {
+    font-family: Arial, Helvetica, sans-serif;
+    margin: 0;
+    color: #174f82;
+    height: 102px;
+    width: 119px;
+    float: left;
+    border-bottom: 4px solid #777777;
+    cursor: pointer;
+}
+
+.nav-selected-block:hover {
+    height:100px;
+    border-bottom: 4px solid #f79b44;
+}
+
+.nav-selected-block:active {
+    color: #f79b44;
+}
+
+.nav-header {
+    padding: 12px 0 0 6px;
+    margin: 0;
+    letter-spacing: -1.0px;
+    font-size: 16pt;
+    font-weight: bold;
+}
+
+.nav-selected-header {
+    padding: 12px 0 0 6px;
+    margin: 0;
+    letter-spacing: -1.0px;
+    font-size: 16pt;
+    font-weight: bold;
+}
+
+.nav-counters {
+    padding: 1px 0 0 6px;
+    margin: 0;
+    height: 58px;
+    line-height: 1.4em;
+    font-size: 9pt;
+    color: #333;
+    decoration: none;
+}
+
+.submenu {
+    font-family:Arial, Helvetica, sans-serif;
+    vertical-align: middle;
+    float: left;
+    width: 1000px;
+}
+
+.submenu-button-block {
+    float: left;
+}
+
+.submenu-button {
+    width: 130px;
+    height: 26px;
+    cursor: pointer;
+    color: #555;
+    background-color: #fafafa;
+    border: 1px solid #ccc;
+    border-radius: 3px 3px 3px 3px;
+    padding: 0;
+    font-size: 9pt;
+    font-weight: bold;
+    font-family:Arial, Helvetica, sans-serif;
+}
+
+@-moz-document url-prefix() {
+    .submenu-button {
+        padding-bottom: 2px;
+    }
+}
+
+.submenu-button:hover {
+    border: 1px solid #f79b44;
+}
+
+.submenu-button:active {
+    color: #fff;
+    border: 1px solid #f79b44;
+    background-color: #f79b44;
+}
+.submenu-select-block {
+    float:left;
+    padding-left: 18px;
+}
+
+.submenu-select-link {
+    color: #6A6A6A;
+    display: block;
+    float: left;
+    font-size: 8pt;
+    letter-spacing: 0.1em;
+    margin: 7px 7px 0 0;
+    text-decoration: none;
+    padding: 0 4px 0 14px
+}
+
+.submenu-select-link:hover {
+    text-decoration: underline;
+}
+
+.submenu-select-link:active {
+    color: #fff;
+    background-color: #f79b44;
+    text-decoration: underline;
+}
+
+.submenu-select-dropdown {
+    font-family:Arial, Helvetica, sans-serif;
+    font-size: 9pt;
+    color: #333333;
+    display: block;
+    float: left;
+    height: 26px;
+    margin: 0 4px 0 0;
+    min-width: 138px;
+}
+@-moz-document url-prefix() {
+    .submenu-select-dropdown {
+        padding-top: 3px;
+    }
+}
+
+.submenu-search-block {
+    display: block;
+    text-align: right;
+    float: right;
+}
+
+.submenu-search-field {
+    border: 1px solid #d3d3d3;
+    border-radius: 3px 3px 3px 3px;
+    color: #333;
+    font-size: 14px;
+    background-color: #fff;
+    float: left;
+    padding: 0px 3px 0px 3px;
+    height: 24px;
+    width: 250px;
+    margin: 0 4px 0 0;
+}
+
+.bottom {
+    background-color: #ebe9dc;
+    color: #555;
+    margin: 30px 0 0 0;
+    padding: 4px 20px 8px 0;
+    margin-left: auto;
+    margin-right: auto;
+    font-size: 8pt;
+    text-align: center;
+    vertical-align:top;
+    line-height: 0.8em;
+    border-top: 4px solid #d3d3d3;
+}
+
+.bottom a:link {
+    font-size: 8pt;
+    text-decoration: none;
+    color: #555;
+}
+
+.bottom a:visited {
+    text-decoration: none;
+    color: #555;
+}
+
+.bottom a:hover {
+    text-decoration: underline;
+    color: #7fa1cb;
+}
+
+.vst {
+    padding: 0 4px 0 4px;
+    margin: 0;
+    text-decoration: none;
+    color: #999;
+    font-size: 12pt;
+    float: left;
+}
+
+.vst:hover {
+    text-decoration: underline;
+}
+
+.vst:active {
+    color: #fff;
+    background-color: #f79b44;
+}
+
+.vst-selected {
+    padding: 0 4px 0 4px;
+    margin: 0;
+    text-decoration: none;
+    color: #174f82;
+    font-size: 12pt;
+    float: left;
+}
+
+.vst-selected:hover {
+    text-decoration: underline;
+}
+
+.vst-selected:active {
+    color: #fff;
+    background-color: #f79b44;
+}
+
+.data {
+    width: 1000px;
+    border-collapse:collapse;
+    margin-left: auto;
+    margin-right: auto;
+    font-family:Arial, Helvetica, sans-serif;
+    color: #e5a907;
+    font-size: 12pt;
+    text-align: left;
+    vertical-align:top;
+    margin: 0;
+    behavior:url("/css/csshover3.htc");
+}
+
+.data a {
+    text-decoration: none;
+}
+
+.data-row:hover {
+    margin: 0;
+    background-color: #f7f6ed;
+}
+
+.data-row:active {
+    background-color: #f7f7d8;
+}
+
+.datarowhover {
+    margin: 0;
+    background-color: #f7f6ed;
+}
+
+.data-null {
+    margin: 0;
+    height: 10px;
+    border-top:1px dotted #d3d3d3;
+}
+
+.data-spacer {
+    margin: 0;
+}
+
+.data-add {
+    margin: 0;
+    background-color: #f7f6ed;
+    border-left: 1px solid #e9e9e9;
+    border-right: 1px solid #e9e9e9;
+    border-bottom: 1px solid #e9e9e9;
+}
+
+.data-dotted {
+    text-align: left;
+    vertical-align:top;
+    border-top:1px dotted #d3d3d3;
+    padding: 0 0 26px 0;
+    margin: 0;
+    width: 167px;
+}
+
+.data-dotted td {
+    margin: 0;
+}
+
+.data-col1 {
+    text-align: left;
+    padding:0;
+}
+
+.data-col1 tr td {
+    padding:0 0 6px 24px;
+}
+
+.data-col1 tr:first-child td {
+    padding:22px 0 0 24px;
+}
+
+.data-col2 {
+    text-align: left;
+    padding: 0;
+    overflow: hidden;
+}
+
+.data-col2 a:visited {
+    color: green;
+}
+
+.data-col5 {
+    table-layout: fixed;
+    text-align: left;
+    padding: 0;
+    overflow: hidden;
+    white-space: nowrap;
+}
+
+.data-date {
+    padding: 0 0 0 18;
+    letter-spacing: 0.3em;
+    font-size: 8pt;
+    color: #6A6A6A
+}
+
+.data-active {
+    font-size: 8pt;
+    letter-spacing: 0.1em;
+    color: #81a64f;
+    padding: 0 0 13 18;
+}
+
+.data-suspended {
+    font-size: 8pt;
+    letter-spacing: 0.1em;
+    color: #de5543;
+    padding: 0 0 13 18;
+}
+
+.data-controls {
+    float: right;
+    height: 16px;
+    border-left: 1px solid #d3d3d3;
+    font-size: 8pt;
+    padding: 2px 12px 0 6px;
+    letter-spacing: 0.1em;
+    color: #174f82;
+    text-decoration: none;
+    cursor: pointer;
+}
+
+.data-controls:hover {
+    color: #fff;
+    background-color: #f79b44;
+}
+
+.data-controls:active {
+    background-color: #999
+}
+
+.data-controls img {
+    border: 0px;
+}
+
+.data-count {
+    font-family: Arial, Helvetica, sans-serif;
+    background-color: #f3f3f3;
+    color: #555;
+    font-size: 8pt;
+    margin: 18px 0 0 0;
+    padding: 0 16px 0 0;
+}
+
+.chart1 {
+    color:#000;
+    font-size: 10pt;
+}
+
+.chart2 {
+    color: #484243;
+    font-size: 8pt;
+}
+
+.username {
+    color: #222;
+    font-size: 16pt;
+}
+
+.domain {
+    color: #222;
+    font-size: 16pt;
+}
+
+.cron {
+    color: #222;
+    font-size: 18px;
+}
+
+.log {
+    color: #222;
+    font-size: 12pt;
+}
+
+.aliases {
+    font-size: 12pt;
+    color: #99a7af;
+    padding: 0 0 0 8px;
+}
+
+.nginx-ext {
+    color: black;
+    vertical-align:top;
+    font-size: 10pt;
+}
+
+.fullname {
+    font-size: 18px;
+    color: #99a7af;
+    padding: 0 0 0 8px;
+}
+
+.counter-name {
+    white-space: nowrap;
+    vertical-align:top;
+    line-height: 1.3em;
+    font-size: 10pt;
+    color: #222;
+    padding: 0 4px 0 0;
+}
+
+.cron-counter-name {
+    vertical-align:top;
+    line-height: 0.8em;
+    font-size: 8pt;
+    padding: 4 0 0 0;
+    color: #222;
+}
+
+.counter-value {
+    vertical-align:top;
+    line-height: 1.2em;
+    font-size: 10pt;
+    color: #222;
+    padding: 0 0 0 4px;
+}
+
+.log-counter-value {
+    vertical-align:top;
+    font-size: 12pt;
+    color: #484243;
+}
+
+.cron-counter-value {
+    vertical-align:top;
+    line-height: 1.2em;
+    font-size: 12pt;
+    color: #484243;
+}
+
+.name {
+    font-size: 12pt;
+    color: #777;
+    padding: 0 0 0 10px;
+}
+
+.vst-ok {
+    font-size: 12pt;
+    color: #62a358;
+    padding: 4px;
+}
+
+.vst-ok a{
+    color: #58934f;
+    text-decoration: none;
+}
+
+.vst-ok a:hover{
+    text-decoration: underline;
+}
+
+.vst-error {
+    font-size: 12pt;
+    color: #de6c5d;
+    padding: 4px;
+    font-weight: bold;
+}
+
+.vst-text {
+    color: #222;
+    font-size: 12pt;
+}
+
+.vst-textinput {
+    background-color: #fff;
+    border: 1px solid #c0c0c0;
+    border-radius: 3px 3px 3px 3px;
+    color: #555;
+    font-size: 18px;
+    padding: 5px;
+    width: 360px;
+    height: 120px;
+}
+
+.vst-textinput:hover {
+    border: 1px solid #f79b44;
+}
+
+.vst-textinput:focus {
+    border: 1px solid #f79b44;
+}
+
+.vst-textinput:disabled {
+    background-color: #f1f1f1;
+}
+
+.vst-input {
+    background-color: #fff;
+    border: 1px solid #c0c0c0;
+    border-radius: 3px 3px 3px 3px;
+    color: #555;
+    font-size: 14pt;
+    padding: 5px;
+    width: 360px;
+    height: 28px;
+}
+
+.vst-input:hover {
+    border: 1px solid #f79b44;
+}
+
+.vst-input:focus {
+    border: 1px solid #f79b44;
+}
+
+.vst-input:disabled {
+    background-color: #f1f1f1;
+}
+
+.vst-list {
+    font-family:Arial, Helvetica, sans-serif;
+    font-size: 12pt;
+    color: #555;
+    height: 30px;
+    min-width: 136px;
+}
+
+@-moz-document url-prefix() {
+    .vst-list {
+        padding-top: 2px;
+    }
+}
+
+.vst-checkbox {
+    padding: 5px;
+    font-size: 12pt;
+}
+
+.vst-checkbox:hover {
+    border: 1px solid #f79b44;
+}
+
+.button {
+    filter:chroma(color=#000000);
+    cursor: pointer;
+    color: #505050;
+    background-color: #fafafa;
+    border: 1px solid #c0c0c0;
+    border-radius: 3px 3px 3px 3px;
+    font-size: 14px;
+    font-weight: bold;
+    padding: 2px 16px;
+    width: 108px;
+    height: 34px;
+}
+
+.button:hover {
+    border: 1px solid #f79b44;
+}
+
+.button:active {
+    color: #fff;
+    border: 1px solid #f79b44;
+    background-color: #f79b44;
+}
+
+.genpass {
+    color: #34536a;
+    font-size: 8pt;
+    padding: 0 5px;
+    letter-spacing: 0.1em;
+    text-decoration: underline;
+}
+
+.genpass:hover {
+    color: #7fa1cb;
+}
+
+.genpass:active {
+    background-color: #f79b44;
+    color: #fff;
+}
+
+.vst-advanced {
+    color: #34536a;
+    font-size: 10pt;
+    letter-spacing: 0.1em;
+    text-decoration: none;
+    padding: 0 2px;
+    border-bottom: 1px solid #f79b44;
+}
+
+.vst-advanced:hover {
+    color: #7fa1cb;
+}
+
+.vst-advanced:active {
+    color: #fff;
+    background-color: #f79b44;
+}
+
+.fixed{
+    position: fixed;
+    border: none;
+    top: -3px;
+    border-bottom: 1px solid #d3d3d3;
+    background-color: #fff;
+}
+
+*html .fixed{
+    position:absolute;
+    position:fixed;
+    _position:absolute;
+    top:0;
+    _top:expression( eval(document.body.scrollTop) + 'px' );
+}
+
+#vstobjects{
+    padding-top: 182px;
+    min-height: 370px;
+}
+
+.login {
+    font-family:Arial, Helvetica, sans-serif;
+    margin: 80px 0 80px 0;
+    padding: 0;
+    background-color: #fff;
+    text-align: left;
+    vertical-align:top;
+    width: 500px;
+    box-shadow: 0 2px 6px rgba(100, 100, 100, 0.3);
+}
+
+.login-box {
+    text-align: left;
+    vertical-align:top;
+    color: #222;
+}
+
+.login-bottom {
+    color: #ebe9dc;
+    text-align: right;
+    vertical-align:top;
+    width: 500px;
+    height: 50px;
+    background-color: #ebe9dc;
+    padding: 0 8px 0 0;
+    margin: 0;
+}
+
+.vestacp{
+    font-size: 8pt;
+    color: #222;
+    text-align: right;
+    padding: 20px 0 0 0;
+}
+
+.error {
+    font-size: 10pt;
+    color: #dE6c5d;
+}
diff --git a/web/templates/admin/add_cron.html b/web/templates/admin/add_cron.html
index d7cd2d1d..17c88268 100644
--- a/web/templates/admin/add_cron.html
+++ b/web/templates/admin/add_cron.html
@@ -1,119 +1,115 @@
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                $back = "location.href='/list/cron/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Adding Cron Job');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                }
+                            }
+                        ?>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/cron/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
-
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding Cron Job');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_add_cron" method="post">
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td></td></tr>
-                                    </table>
+        <form id="vstobjects" name="v_add_cron" method="post">
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="600px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Minute');?>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="600px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Minute');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_min" <?php if (!empty($v_min)) echo "value=".$v_min; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Hour');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_hour" <?php if (!empty($v_hour)) echo "value=".$v_hour; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Day');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_day" <?php if (!empty($v_day)) echo "value=".$v_day; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Month');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_month" <?php if (!empty($v_month)) echo "value=".$v_month; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Day of week');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_wday" <?php if (!empty($v_wday)) echo "value=".$v_wday; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Command');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_cmd" <?php if (!empty($v_cmd)) echo "value='".$v_cmd."'"; ?>>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                            </td>
-                                        </tr>
-                                    </table>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_min" <?php if (!empty($v_min)) echo "value=".$v_min; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Hour');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_hour" <?php if (!empty($v_hour)) echo "value=".$v_hour; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Day');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_day" <?php if (!empty($v_day)) echo "value=".$v_day; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Month');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_month" <?php if (!empty($v_month)) echo "value=".$v_month; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Day of week');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_wday" <?php if (!empty($v_wday)) echo "value=".$v_wday; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Command');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_cmd" <?php if (!empty($v_cmd)) echo "value='".$v_cmd."'"; ?>>
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/admin/add_db.html b/web/templates/admin/add_db.html
index 87b992ca..9e9a49b7 100644
--- a/web/templates/admin/add_db.html
+++ b/web/templates/admin/add_db.html
@@ -1,187 +1,184 @@
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/db/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?> 
-
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding database');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?> 
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_add_db" method="post">
-                        <script type="text/javascript">
-                            function elementHideShow(elementToHideOrShow) {
-                                var el = document.getElementById(elementToHideOrShow);
-                                if (el.style.display == "block") {
-                                    el.style.display = "none";
-                                } else {
-                                    el.style.display = "block";
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/db/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?> 
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Adding database');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                 }
                             }
-                            function randomString() {
-                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                                var string_length = 10;
-                                var randomstring = '';
-                                for (var i=0; i<string_length; i++) {
-                                    var rnum = Math.floor(Math.random() * chars.length);
-                                    randomstring += chars.substring(rnum,rnum+1);
-                                }
-                                document.v_add_db.v_password.value = randomstring;
-                            }
-                        </script>
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td></td></tr>
-                                    </table>
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
+
+        <form id="vstobjects" name="v_add_db" method="post">
+            <script type="text/javascript">
+                function elementHideShow(elementToHideOrShow) {
+                    var el = document.getElementById(elementToHideOrShow);
+                    if (el.style.display == "block") {
+                        el.style.display = "none";
+                    } else {
+                        el.style.display = "block";
+                    }
+                }
+                function randomString() {
+                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                    var string_length = 10;
+                    var randomstring = '';
+                    for (var i=0; i<string_length; i++) {
+                        var rnum = Math.floor(Math.random() * chars.length);
+                        randomstring += chars.substring(rnum,rnum+1);
+                    }
+                    document.v_add_db.v_password.value = randomstring;
+                }
+            </script>
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="600px">
+                            <tr>
+                                <td style="padding: 20px 0 0 2px; color:#777;" >
+                                    <?php print __('Prefix will be automaticaly added to database name and database user',$user."_");?>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="600px">
-                                        <tr>
-                                            <td style="padding: 20px 0 0 2px; color:#777;" >
-                                                <?php print __('Prefix will be automaticaly added to database name and database user',$user."_");?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Database');?> 
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_database" <?php if (!empty($v_database)) echo "value=".$v_database; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('User');?> 
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_dbuser" <?php if (!empty($v_dbuser)) echo "value=".$v_dbuser; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_password">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Type');?> 
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_type">
-                                                    <?php
-                                                        foreach ($db_types as $key => $value) {
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            if ((!empty($v_type)) && ( $value == $v_type )) echo ' selected';
-                                                            echo ">".$value."</option>\n";
-                                                        }
-                                                    ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Charset');?> 
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_charset">
-                                                    <option value=big5 <?php if ((!empty($v_charset)) && ( $v_charset == 'big5')) echo 'selected';?> >big5</option>
-                                                    <option value=dec8 <?php if ((!empty($v_charset)) && ( $v_charset == 'dec8')) echo 'selected';?> >dec8</option>
-                                                    <option value=cp850 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp850')) echo 'selected';?> >cp850</option>
-                                                    <option value=hp8 <?php if ((!empty($v_charset)) && ( $v_charset == 'hp8')) echo 'selected';?> >hp8</option>
-                                                    <option value=koi8r <?php if ((!empty($v_charset)) && ( $v_charset == 'koi8r')) echo 'selected';?> >koi8r</option>
-                                                    <option value=latin1 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin1')) echo 'selected';?> >latin1</option>
-                                                    <option value=latin2 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin2')) echo 'selected';?> >latin2</option>
-                                                    <option value=swe7 <?php if ((!empty($v_charset)) && ( $v_charset == 'swe7')) echo 'selected';?> >swe7</option>
-                                                    <option value=ascii <?php if ((!empty($v_charset)) && ( $v_charset == 'ascii')) echo 'selected';?> >ascii</option>
-                                                    <option value=ujis <?php if ((!empty($v_charset)) && ( $v_charset == 'ujis')) echo 'selected';?> >ujis</option>
-                                                    <option value=sjis <?php if ((!empty($v_charset)) && ( $v_charset == 'sjis')) echo 'selected';?> >sjis</option>
-                                                    <option value=hebrew <?php if ((!empty($v_charset)) && ( $v_charset == 'hebrew')) echo 'selected';?> >hebrew</option>
-                                                    <option value=tis620 <?php if ((!empty($v_charset)) && ( $v_charset == 'tis620')) echo 'selected';?> >tis620</option>
-                                                    <option value=euckr <?php if ((!empty($v_charset)) && ( $v_charset == 'euckr')) echo 'selected';?> >euckr</option>
-                                                    <option value=koi8u <?php if ((!empty($v_charset)) && ( $v_charset == 'koi8u')) echo 'selected';?> >koi8u</option>
-                                                    <option value=gb2312 <?php if ((!empty($v_charset)) && ( $v_charset == 'gb2312')) echo 'selected';?> >gb2312</option>
-                                                    <option value=greek <?php if ((!empty($v_charset)) && ( $v_charset == 'greek')) echo 'selected';?> >greek</option>
-                                                    <option value=cp1250 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1250')) echo 'selected';?> >cp1250</option>
-                                                    <option value=gbk <?php if ((!empty($v_charset)) && ( $v_charset == 'gbk')) echo 'selected';?> >gbk</option>
-                                                    <option value=latin5 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin5')) echo 'selected';?> >latin5</option>
-                                                    <option value=armscii8 <?php if ((!empty($v_charset)) && ( $v_charset == 'armscii8')) echo 'selected';?> >armscii8</option>
-                                                    <option value=utf8 <?php if ((!empty($v_charset)) && ( $v_charset == 'utf8')) echo 'selected';?> <?php if (empty($v_charset)) echo 'selected';?> >utf8</option>
-                                                    <option value=ucs2 <?php if ((!empty($v_charset)) && ( $v_charset == 'ucs2')) echo 'selected';?> >ucs2</option>
-                                                    <option value=cp866 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp866')) echo 'selected';?> >cp866</option>
-                                                    <option value=keybcs2 <?php if ((!empty($v_charset)) && ( $v_charset == 'keybcs2')) echo 'selected';?> >keybcs2</option>
-                                                    <option value=macce <?php if ((!empty($v_charset)) && ( $v_charset == 'macce')) echo 'selected';?> >macce</option>
-                                                    <option value=macroman <?php if ((!empty($v_charset)) && ( $v_charset == 'macroman')) echo 'selected';?> >macroman</option>
-                                                    <option value=cp852 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp852')) echo 'selected';?> >cp852</option>
-                                                    <option value=latin7 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin7')) echo 'selected';?> >latin7</option>
-                                                    <option value=cp1251 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1251')) echo 'selected';?> >cp1251</option>
-                                                    <option value=cp1256 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1256')) echo 'selected';?> >cp1256</option>
-                                                    <option value=cp1257 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1257')) echo 'selected';?> >cp1257</option>
-                                                    <option value=binary <?php if ((!empty($v_charset)) && ( $v_charset == 'binary')) echo 'selected';?> >binary</option>
-                                                    <option value=geostd8 <?php if ((!empty($v_charset)) && ( $v_charset == 'geostd8')) echo 'selected';?> >geostd8</option>
-                                                    <option value=cp932 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp932')) echo 'selected';?> >cp932</option>
-                                                    <option value=eucjpms <?php if ((!empty($v_charset)) && ( $v_charset == 'eucjpms')) echo 'selected';?> >eucjpms</option>
-                                                </select>
-                                            </td>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Send login credentials to email address') ?> 
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text"  class="vst-input" name="v_db_email" <?php if (!empty($v_db_email)) echo "value=".$v_db_email; ?>>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                            </td>
-                                        </tr>
-                                    </table>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Database');?> 
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_database" <?php if (!empty($v_database)) echo "value=".$v_database; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('User');?> 
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_dbuser" <?php if (!empty($v_dbuser)) echo "value=".$v_dbuser; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_password">
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Type');?> 
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_type">
+                                        <?php
+                                            foreach ($db_types as $key => $value) {
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                if ((!empty($v_type)) && ( $value == $v_type )) echo ' selected';
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Charset');?> 
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_charset">
+                                        <option value=big5 <?php if ((!empty($v_charset)) && ( $v_charset == 'big5')) echo 'selected';?> >big5</option>
+                                        <option value=dec8 <?php if ((!empty($v_charset)) && ( $v_charset == 'dec8')) echo 'selected';?> >dec8</option>
+                                        <option value=cp850 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp850')) echo 'selected';?> >cp850</option>
+                                        <option value=hp8 <?php if ((!empty($v_charset)) && ( $v_charset == 'hp8')) echo 'selected';?> >hp8</option>
+                                        <option value=koi8r <?php if ((!empty($v_charset)) && ( $v_charset == 'koi8r')) echo 'selected';?> >koi8r</option>
+                                        <option value=latin1 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin1')) echo 'selected';?> >latin1</option>
+                                        <option value=latin2 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin2')) echo 'selected';?> >latin2</option>
+                                        <option value=swe7 <?php if ((!empty($v_charset)) && ( $v_charset == 'swe7')) echo 'selected';?> >swe7</option>
+                                        <option value=ascii <?php if ((!empty($v_charset)) && ( $v_charset == 'ascii')) echo 'selected';?> >ascii</option>
+                                        <option value=ujis <?php if ((!empty($v_charset)) && ( $v_charset == 'ujis')) echo 'selected';?> >ujis</option>
+                                        <option value=sjis <?php if ((!empty($v_charset)) && ( $v_charset == 'sjis')) echo 'selected';?> >sjis</option>
+                                        <option value=hebrew <?php if ((!empty($v_charset)) && ( $v_charset == 'hebrew')) echo 'selected';?> >hebrew</option>
+                                        <option value=tis620 <?php if ((!empty($v_charset)) && ( $v_charset == 'tis620')) echo 'selected';?> >tis620</option>
+                                        <option value=euckr <?php if ((!empty($v_charset)) && ( $v_charset == 'euckr')) echo 'selected';?> >euckr</option>
+                                        <option value=koi8u <?php if ((!empty($v_charset)) && ( $v_charset == 'koi8u')) echo 'selected';?> >koi8u</option>
+                                        <option value=gb2312 <?php if ((!empty($v_charset)) && ( $v_charset == 'gb2312')) echo 'selected';?> >gb2312</option>
+                                        <option value=greek <?php if ((!empty($v_charset)) && ( $v_charset == 'greek')) echo 'selected';?> >greek</option>
+                                        <option value=cp1250 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1250')) echo 'selected';?> >cp1250</option>
+                                        <option value=gbk <?php if ((!empty($v_charset)) && ( $v_charset == 'gbk')) echo 'selected';?> >gbk</option>
+                                        <option value=latin5 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin5')) echo 'selected';?> >latin5</option>
+                                        <option value=armscii8 <?php if ((!empty($v_charset)) && ( $v_charset == 'armscii8')) echo 'selected';?> >armscii8</option>
+                                        <option value=utf8 <?php if ((!empty($v_charset)) && ( $v_charset == 'utf8')) echo 'selected';?> <?php if (empty($v_charset)) echo 'selected';?> >utf8</option>
+                                        <option value=ucs2 <?php if ((!empty($v_charset)) && ( $v_charset == 'ucs2')) echo 'selected';?> >ucs2</option>
+                                        <option value=cp866 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp866')) echo 'selected';?> >cp866</option>
+                                        <option value=keybcs2 <?php if ((!empty($v_charset)) && ( $v_charset == 'keybcs2')) echo 'selected';?> >keybcs2</option>
+                                        <option value=macce <?php if ((!empty($v_charset)) && ( $v_charset == 'macce')) echo 'selected';?> >macce</option>
+                                        <option value=macroman <?php if ((!empty($v_charset)) && ( $v_charset == 'macroman')) echo 'selected';?> >macroman</option>
+                                        <option value=cp852 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp852')) echo 'selected';?> >cp852</option>
+                                        <option value=latin7 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin7')) echo 'selected';?> >latin7</option>
+                                        <option value=cp1251 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1251')) echo 'selected';?> >cp1251</option>
+                                        <option value=cp1256 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1256')) echo 'selected';?> >cp1256</option>
+                                        <option value=cp1257 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1257')) echo 'selected';?> >cp1257</option>
+                                        <option value=binary <?php if ((!empty($v_charset)) && ( $v_charset == 'binary')) echo 'selected';?> >binary</option>
+                                        <option value=geostd8 <?php if ((!empty($v_charset)) && ( $v_charset == 'geostd8')) echo 'selected';?> >geostd8</option>
+                                        <option value=cp932 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp932')) echo 'selected';?> >cp932</option>
+                                        <option value=eucjpms <?php if ((!empty($v_charset)) && ( $v_charset == 'eucjpms')) echo 'selected';?> >eucjpms</option>
+                                    </select>
+                                </td>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Send login credentials to email address') ?> 
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text"  class="vst-input" name="v_db_email" <?php if (!empty($v_db_email)) echo "value=".$v_db_email; ?>>
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/admin/add_dns.html b/web/templates/admin/add_dns.html
index a33bd241..d0794b4a 100644
--- a/web/templates/admin/add_dns.html
+++ b/web/templates/admin/add_dns.html
@@ -1,146 +1,142 @@
-
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/dns/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
-
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding DNS Domain');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_add_dns" method="post">
-                        <script language="javascript">
-                            function elementHideShow(elementToHideOrShow){
-                                var el = document.getElementById(elementToHideOrShow);
-                                    if (el.style.display == "block") {
-                                        el.style.display = "none";
-                                    } else {
-                                        el.style.display = "block";
-                                    }
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/dns/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Adding DNS Domain');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                }
                             }
-                        </script>
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                        <table class="data">
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td></td></tr>
-                                    </table>
+        <form id="vstobjects" name="v_add_dns" method="post">
+            <script language="javascript">
+                function elementHideShow(elementToHideOrShow){
+                    var el = document.getElementById(elementToHideOrShow);
+                        if (el.style.display == "block") {
+                            el.style.display = "none";
+                        } else {
+                            el.style.display = "block";
+                        }
+                }
+            </script>
+
+            <table class="data">
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="600px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Domain');?>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('IP address');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 0px;">
+                                    <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                                         <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="600px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Domain');?>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('Expiration Date');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
+                                                <input type="text" size="20" class="vst-input" name="v_exp" <?php if (!empty($v_exp)) echo "value=".$v_exp; ?>>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('IP address');?>
+                                                TTL
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip; ?>>
+                                                <input type="text" size="20" class="vst-input" name="v_ttl" <?php if (!empty($v_ttl)) echo "value=".$v_ttl; ?>>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
+                                                <?php print __('Name servers');?>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 0px;">
-                                                <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print __('Expiration Date');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_exp" <?php if (!empty($v_exp)) echo "value=".$v_exp; ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            TTL
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_ttl" <?php if (!empty($v_ttl)) echo "value=".$v_ttl; ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print __('Name servers');?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
                                             </td>
                                         </tr>
-                                    </table>
-                                    <table class="data-col2">
                                         <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
                                             </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/admin/add_dns_rec.html b/web/templates/admin/add_dns_rec.html
index bc0b3885..36b4a385 100644
--- a/web/templates/admin/add_dns_rec.html
+++ b/web/templates/admin/add_dns_rec.html
@@ -1,122 +1,118 @@
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/dns/?domain=".$v_domain."'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Adding DNS Record'); ?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                }
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/dns/?domain=".$v_domain."'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
-
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding DNS Record'); ?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_add_dns_rec" method="post">
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td></td></tr>
-                                    </table>
+        <form id="vstobjects" name="v_add_dns_rec" method="post">
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="600px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Domain');?>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="600px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Domain');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_domain" <?php echo "value=".$v_domain;  ?> disabled ><input type="hidden" name="v_domain" <?php echo "value=".$v_domain;  ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Record');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_rec" <?php if (!empty($v_rec)) echo "value=".$v_rec; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Type');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_type">
-                                                    <option value="A" <?php if ($v_type == 'A') echo selected; ?>>A</option>
-                                                    <option value="AAAA" <?php if ($v_type == 'AAAA') echo selected; ?>>AAAA</option>
-                                                    <option value="NS" <?php if ($v_type == 'NS') echo selected; ?>>NS</option>
-                                                    <option value="CNAME" <?php if ($v_type == 'CNAME') echo selected; ?>>CNAME</option>
-                                                    <option value="MX" <?php if ($v_type == 'MX') echo selected; ?>>MX</option>
-                                                    <option value="TXT" <?php if ($v_type == 'TXT') echo selected; ?>>TXT</option>
-                                                    <option value="SRV" <?php if ($v_type == 'SRV') echo selected; ?>>SRV</option>
-                                                    <option value="DNSKEY" <?php if ($v_type == 'DNSKEY') echo selected; ?>>DNSKEY</option>
-                                                    <option value="KEY" <?php if ($v_type == 'KEY') echo selected; ?>>KEY</option>
-                                                    <option value="IPSECKEY" <?php if ($v_type == 'IPSECKEY') echo selected; ?>>IPSECKEY</option>
-                                                    <option value="PTR" <?php if ($v_type == 'PTR') echo selected; ?>>PTR</option>
-                                                    <option value="SPF" <?php if ($v_type == 'SPF') echo selected; ?>>SPF</option>
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('IP or Value');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_val" <?php if (!empty($v_val)) echo "value=".$v_val; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Priority');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_priority" <?php if (!empty($v_priority)) echo "value=".$v_priority; ?>>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" name="ok_rec" value="<?php print __('Add');?>" class="button">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                            </td>
-                                        </tr>
-                                    </table>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_domain" <?php echo "value=".$v_domain;  ?> disabled ><input type="hidden" name="v_domain" <?php echo "value=".$v_domain;  ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Record');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_rec" <?php if (!empty($v_rec)) echo "value=".$v_rec; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Type');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_type">
+                                        <option value="A" <?php if ($v_type == 'A') echo selected; ?>>A</option>
+                                        <option value="AAAA" <?php if ($v_type == 'AAAA') echo selected; ?>>AAAA</option>
+                                        <option value="NS" <?php if ($v_type == 'NS') echo selected; ?>>NS</option>
+                                        <option value="CNAME" <?php if ($v_type == 'CNAME') echo selected; ?>>CNAME</option>
+                                        <option value="MX" <?php if ($v_type == 'MX') echo selected; ?>>MX</option>
+                                        <option value="TXT" <?php if ($v_type == 'TXT') echo selected; ?>>TXT</option>
+                                        <option value="SRV" <?php if ($v_type == 'SRV') echo selected; ?>>SRV</option>
+                                        <option value="DNSKEY" <?php if ($v_type == 'DNSKEY') echo selected; ?>>DNSKEY</option>
+                                        <option value="KEY" <?php if ($v_type == 'KEY') echo selected; ?>>KEY</option>
+                                        <option value="IPSECKEY" <?php if ($v_type == 'IPSECKEY') echo selected; ?>>IPSECKEY</option>
+                                        <option value="PTR" <?php if ($v_type == 'PTR') echo selected; ?>>PTR</option>
+                                        <option value="SPF" <?php if ($v_type == 'SPF') echo selected; ?>>SPF</option>
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('IP or Value');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_val" <?php if (!empty($v_val)) echo "value=".$v_val; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Priority');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_priority" <?php if (!empty($v_priority)) echo "value=".$v_priority; ?>>
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" name="ok_rec" value="<?php print __('Add');?>" class="button">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/admin/add_ip.html b/web/templates/admin/add_ip.html
index 35cbfd65..95b0a6c7 100644
--- a/web/templates/admin/add_ip.html
+++ b/web/templates/admin/add_ip.html
@@ -1,164 +1,160 @@
-
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/ip/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
-
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding IP address');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_add_ip" method="post">
-                        <script type="text/javascript">
-                            function elementHideShow(elementToHideOrShow) {
-                                var el = document.getElementById(elementToHideOrShow);
-                                if (el.style.display == "block") {
-                                    el.style.display = "none";
-                                } else {
-                                    el.style.display = "block";
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/ip/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Adding IP address');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                 }
                             }
-                        </script>
+                        ?>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td></td></tr>
-                                    </table>
+        <form id="vstobjects" name="v_add_ip" method="post">
+            <script type="text/javascript">
+                function elementHideShow(elementToHideOrShow) {
+                    var el = document.getElementById(elementToHideOrShow);
+                    if (el.style.display == "block") {
+                        el.style.display = "none";
+                    } else {
+                        el.style.display = "block";
+                    }
+                }
+            </script>
+
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="600px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('IP address') ?> 
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Netmask');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_netmask" <?php if (!empty($v_netmask)) echo "value=".$v_netmask; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                    <?php print __('Interface');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_interface">
+                                        <?php
+                                            foreach ($interfaces as $key => $value) {
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                if ((!empty($v_interface)) && ( $value == $v_interface )) echo ' selected';
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Shared');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_shared" <?php if (empty($v_dedicated)) echo "checked=yes" ?> onclick="javascript:elementHideShow('usrtable');">
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <table style="display:<?php if (empty($v_dedicated)) { echo 'none';} else {echo 'block';}?> ;" id="usrtable">
                                         <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="600px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('IP address') ?> 
+                                            <td class="vst-text" style="padding: 0 0 0 2px;">
+                                                <?php print __('Assigned user');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Netmask');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_netmask" <?php if (!empty($v_netmask)) echo "value=".$v_netmask; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print __('Interface');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_interface">
+                                                <select class="vst-list" name="v_owner">
                                                     <?php
-                                                        foreach ($interfaces as $key => $value) {
+                                                        foreach ($users as $key => $value) {
                                                             echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            if ((!empty($v_interface)) && ( $value == $v_interface )) echo ' selected';
+                                                            if ((!empty($v_owner)) && ( $value == $v_owner )) echo ' selected';
                                                             echo ">".$value."</option>\n";
                                                         }
-                                                    ?> 
+                                                    ?>
                                                 </select>
                                             </td>
                                         </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Shared');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_shared" <?php if (empty($v_dedicated)) echo "checked=yes" ?> onclick="javascript:elementHideShow('usrtable');">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <table style="display:<?php if (empty($v_dedicated)) { echo 'none';} else {echo 'block';}?> ;" id="usrtable">
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 0 0 0 2px;">
-                                                            <?php print __('Assigned user');?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <select class="vst-list" name="v_owner">
-                                                                <?php
-                                                                    foreach ($users as $key => $value) {
-                                                                        echo "\t\t\t\t<option value=\"".$value."\"";
-                                                                        if ((!empty($v_owner)) && ( $value == $v_owner )) echo ' selected';
-                                                                        echo ">".$value."</option>\n";
-                                                                    }
-                                                                ?>
-                                                            </select>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print __('Assigned domain');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_name" <?php if (!empty($v_name)) echo "value=".$v_name; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print __('NAT IP association');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_nat" <?php if (!empty($v_nat)) echo "value=".$v_nat; ?>>
-                                            </td>
-                                        </tr>
-
-
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                            </td>
-                                        </tr>
                                     </table>
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                    <?php print __('Assigned domain');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_name" <?php if (!empty($v_name)) echo "value=".$v_name; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                    <?php print __('NAT IP association');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_nat" <?php if (!empty($v_nat)) echo "value=".$v_nat; ?>>
+                                </td>
+                            </tr>
+
+
                         </table>
-                    </from>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </from>
diff --git a/web/templates/admin/add_mail.html b/web/templates/admin/add_mail.html
index ab421220..321536a5 100644
--- a/web/templates/admin/add_mail.html
+++ b/web/templates/admin/add_mail.html
@@ -1,99 +1,95 @@
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/mail/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Adding Mail Domain');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                }
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/mail/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
-
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding Mail Domain');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_add_mail" method="post">
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td></td></tr>
-                                    </table>
+        <form id="vstobjects" name="v_add_mail" method="post">
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="600px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Domain');?>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="600px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Domain');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> >
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('AntiSpam Support');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_antispam" <?php if ((empty($v_antispam)) || ($v_antispam == 'yes')) echo "checked=yes"; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('AntiVirus Support');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_antivirus" <?php if ((empty($v_antivirus)) || ($v_antivirus == 'yes')) echo "checked=yes"; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('DKIM Support');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_dkim" <?php if (isset($v_dkim)&&$v_dkim == 'yes') echo "checked=yes"; ?>>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                            </td>
-                                        </tr>
-                                    </table>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> >
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('AntiSpam Support');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_antispam" <?php if ((empty($v_antispam)) || ($v_antispam == 'yes')) echo "checked=yes"; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('AntiVirus Support');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_antivirus" <?php if ((empty($v_antivirus)) || ($v_antivirus == 'yes')) echo "checked=yes"; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('DKIM Support');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_dkim" <?php if (isset($v_dkim)&&$v_dkim == 'yes') echo "checked=yes"; ?>>
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html
index 73658e29..f76f45e5 100644
--- a/web/templates/admin/add_mail_acc.html
+++ b/web/templates/admin/add_mail_acc.html
@@ -1,151 +1,147 @@
-
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/mail/?domain=".$v_domain."'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
-
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding Mail Account');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_add_mail_acc" method="post">
-                        <script type="text/javascript">
-                            function elementHideShow(elementToHideOrShow) {
-                                var el = document.getElementById(elementToHideOrShow);
-                                if (el.style.display == "block") {
-                                    el.style.display = "none";
-                                } else {
-                                    el.style.display = "block";
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/mail/?domain=".$v_domain."'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Adding Mail Account');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                 }
                             }
-                            function randomString() {
-                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                                var string_length = 10;
-                                var randomstring = '';
-                                for (var i=0; i<string_length; i++) {
-                                  var rnum = Math.floor(Math.random() * chars.length);
-                                  randomstring += chars.substring(rnum,rnum+1);
-                                }
-                                document.v_add_mail_acc.v_password.value = randomstring;
-                              }
-                        </script>
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                        <table class='data'>
-                        <tr class="data-add">
-                            <td class="data-dotted" width="150">
-                                <table class="data-col1">
-                                    <tr><td></td></tr>
-                                </table>
+        <form id="vstobjects" name="v_add_mail_acc" method="post">
+            <script type="text/javascript">
+                function elementHideShow(elementToHideOrShow) {
+                    var el = document.getElementById(elementToHideOrShow);
+                    if (el.style.display == "block") {
+                        el.style.display = "none";
+                    } else {
+                        el.style.display = "block";
+                    }
+                }
+                function randomString() {
+                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                    var string_length = 10;
+                    var randomstring = '';
+                    for (var i=0; i<string_length; i++) {
+                      var rnum = Math.floor(Math.random() * chars.length);
+                      randomstring += chars.substring(rnum,rnum+1);
+                    }
+                    document.v_add_mail_acc.v_password.value = randomstring;
+                  }
+            </script>
+
+            <table class='data'>
+            <tr class="data-add">
+                <td class="data-dotted" width="150">
+                    <table class="data-col1">
+                        <tr><td></td></tr>
+                    </table>
+                </td>
+                <td class="data-dotted" width="830px">
+                    <table width="830px">
+                        <tr>
+                            <td></td>
+                        </tr>
+                    </table>
+                    <table class="data-col2" width="600px">
+                        <tr>
+                            <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <?php print __('Domain');?>
                             </td>
-                            <td class="data-dotted" width="830px">
-                                <table width="830px">
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="text" size="20" class="vst-input" name="v_domain" <?php echo "value=".$v_domain;  ?> disabled ><input type="hidden" name="v_domain" <?php echo "value=".$v_domain;  ?>>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Account');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="text" size="20" class="vst-input" name="v_account" <?php if (!empty($v_account)) echo "value=".$v_account; ?>>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="text" size="20" class="vst-input" name="v_password">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <a href="javascript:elementHideShow('advtable');" class="vst-advanced"> <?php print __('Advanced options');?></a>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 9px 0 0 0px;">
+                                <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                                     <tr>
-                                        <td></td>
-                                    </tr>
-                                </table>
-                                <table class="data-col2" width="600px">
-                                    <tr>
-                                        <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                            <?php print __('Domain');?>
+                                        <td class="vst-text" style="padding: 0 0 0 2px;">
+                                            <?php print __('Quota');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('in megabytes');?>)</span>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <input type="text" size="20" class="vst-input" name="v_domain" <?php echo "value=".$v_domain;  ?> disabled ><input type="hidden" name="v_domain" <?php echo "value=".$v_domain;  ?>>
+                                            <input type="text" size="20" class="vst-input" name="v_quota" <?php if (!empty($v_quota)) echo "value=".$v_quota; ?>>
                                         </td>
                                     </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Account');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="text" size="20" class="vst-input" name="v_account" <?php if (!empty($v_account)) echo "value=".$v_account; ?>>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="text" size="20" class="vst-input" name="v_password">
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <a href="javascript:elementHideShow('advtable');" class="vst-advanced"> <?php print __('Advanced options');?></a>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 9px 0 0 0px;">
-                                            <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 0 0 0 2px;">
-                                                        <?php print __('Quota');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('in megabytes');?>)</span>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <input type="text" size="20" class="vst-input" name="v_quota" <?php if (!empty($v_quota)) echo "value=".$v_quota; ?>>
-                                                    </td>
-                                                </tr>
-                                            <tr>
-                                                <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                    <?php print __('Aliases');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('use local-part');?>)</span>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>
-                                                    <textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                    <?php print __('Forward to');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('one or more email addresses');?>)</span>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>
-                                                    <textarea size="20" class="vst-textinput" name="v_fwd"><?php if (!empty($v_fwd)) echo $v_fwd;  ?></textarea>
-                                                </td>
-                                            </tr>
-                                        </table>
+                                <tr>
+                                    <td class="vst-text" style="padding: 10 0 0 2px;">
+                                        <?php print __('Aliases');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('use local-part');?>)</span>
                                     </td>
                                 </tr>
-                            </table>
-                            <table class="data-col2">
                                 <tr>
-                                    <td style="padding: 24px 0 0 0;" width="116px">
-                                        <input type="submit" name="ok_acc" value="<?php print __('Add');?>" class="button">
+                                    <td>
+                                        <textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
                                     </td>
-                                    <td style="padding: 24px 0 0 0;">
-                                        <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </tr>
+                                <tr>
+                                    <td class="vst-text" style="padding: 10 0 0 2px;">
+                                        <?php print __('Forward to');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('one or more email addresses');?>)</span>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <textarea size="20" class="vst-textinput" name="v_fwd"><?php if (!empty($v_fwd)) echo $v_fwd;  ?></textarea>
                                     </td>
                                 </tr>
                             </table>
                         </td>
                     </tr>
-            </table>
+                </table>
+                <table class="data-col2">
+                    <tr>
+                        <td style="padding: 24px 0 0 0;" width="116px">
+                            <input type="submit" name="ok_acc" value="<?php print __('Add');?>" class="button">
+                        </td>
+                        <td style="padding: 24px 0 0 0;">
+                            <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+</table>
         </form>
diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html
index 2bde5cac..4e45053b 100644
--- a/web/templates/admin/add_package.html
+++ b/web/templates/admin/add_package.html
@@ -1,296 +1,293 @@
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/package/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?>
 
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/package/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Adding Package');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                }
+                            }
+                        ?>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding Package');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_add_package" method="post">
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td></td></tr>
-                                    </table>
+        <form id="vstobjects" name="v_add_package" method="post">
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Package Name');?>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Package Name');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_package" <?php if (!empty($v_package)) echo "value=".$v_package;  ?> >
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Web Template');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_web_template">
-                                                    <?php
-                                                        foreach ($web_templates as $key => $value) {
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            if ((!empty($v_web_template)) && ( $value == $v_web_template)){
-                                                                echo 'selected' ;
-                                                            }
-                                                            if ((!empty($v_web_template)) && ( $value == $_POST['v_web_template'])){
-                                                                echo 'selected' ;
-                                                            }
-                                                            echo ">".$value."</option>\n";
-                                                        }
-                                                    ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Proxy Template');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_proxy_template">
-                                                    <?php
-                                                        foreach ($proxy_templates as $key => $value) {
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            if ((!empty($v_proxy_template)) && ( $value == $v_proxy_template)){
-                                                                echo 'selected' ;
-                                                            }
-                                                            if ((!empty($v_proxy_template)) && ( $value == $_POST['v_proxy_template'])){
-                                                                echo 'selected' ;
-                                                            }
-                                                            echo ">".$value."</option>\n";
-                                                        }
-                                                    ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('DNS Template');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_dns_template">
-                                                    <?php
-                                                        foreach ($dns_templates as $key => $value) {
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            if ((!empty($v_dns_template)) && ( $value == $v_dns_template)){
-                                                                echo 'selected' ;
-                                                            }
-                                                            if ((!empty($v_dns_template)) && ( $value == $_POST['v_dns_template'])){
-                                                                echo 'selected' ;
-                                                            }
-                                                            echo ">".$value."</option>\n";
-                                                        }
-                                                    ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('SSH Access');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_shell">
-                                                    <?php
-                                                        foreach ($shells as $key => $value) {
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            if ((!empty($v_shell)) && ( $value == $v_shell)){
-                                                            echo 'selected' ;
-                                                        }
-                                                        if ((!empty($v_shell)) && ( $value == $_POST['v_shell'])){
-                                                            echo 'selected' ;
-                                                        }
-                                                        echo ">".$value."</option>\n";
-                                                        }
-                                                    ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Web Domains');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_web_domains" <?php if (isset($v_web_domains)) echo "value=".$v_web_domains; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Web Aliases');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_web_aliases" <?php if (isset($v_web_aliases)) echo "value=".$v_web_aliases; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('DNS domains');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_dns_domains" <?php if (isset($v_dns_domains)) echo "value=".$v_dns_domains; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('DNS records');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_dns_records" <?php if (isset($v_dns_records)) echo "value=".$v_dns_records; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Mail Domains');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_mail_domains" <?php if (isset($v_mail_domains)) echo "value=".$v_mail_domains; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Mail Accounts');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_mail_accounts" <?php if (isset($v_mail_accounts)) echo "value=".$v_mail_accounts; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Databases');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_databases" <?php if (isset($v_databases)) echo "value=".$v_databases; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Cron Jobs');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_cron_jobs" <?php if (isset($v_cron_jobs)) echo "value=".$v_cron_jobs; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Backups');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_backups" <?php if (isset($v_backups)) echo "value=".$v_backups; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Quota');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_disk_quota" <?php if (isset($v_disk_quota)) echo "value=".$v_disk_quota; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Bandwidth');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_bandwidth" <?php if (isset($v_bandwidth)) echo "value=".$v_bandwidth; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Name servers');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                            </td>
-                                        </tr>
-                                    </table>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_package" <?php if (!empty($v_package)) echo "value=".$v_package;  ?> >
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Web Template');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_web_template">
+                                        <?php
+                                            foreach ($web_templates as $key => $value) {
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                if ((!empty($v_web_template)) && ( $value == $v_web_template)){
+                                                    echo 'selected' ;
+                                                }
+                                                if ((!empty($v_web_template)) && ( $value == $_POST['v_web_template'])){
+                                                    echo 'selected' ;
+                                                }
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Proxy Template');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_proxy_template">
+                                        <?php
+                                            foreach ($proxy_templates as $key => $value) {
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                if ((!empty($v_proxy_template)) && ( $value == $v_proxy_template)){
+                                                    echo 'selected' ;
+                                                }
+                                                if ((!empty($v_proxy_template)) && ( $value == $_POST['v_proxy_template'])){
+                                                    echo 'selected' ;
+                                                }
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('DNS Template');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_dns_template">
+                                        <?php
+                                            foreach ($dns_templates as $key => $value) {
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                if ((!empty($v_dns_template)) && ( $value == $v_dns_template)){
+                                                    echo 'selected' ;
+                                                }
+                                                if ((!empty($v_dns_template)) && ( $value == $_POST['v_dns_template'])){
+                                                    echo 'selected' ;
+                                                }
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('SSH Access');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_shell">
+                                        <?php
+                                            foreach ($shells as $key => $value) {
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                if ((!empty($v_shell)) && ( $value == $v_shell)){
+                                                echo 'selected' ;
+                                            }
+                                            if ((!empty($v_shell)) && ( $value == $_POST['v_shell'])){
+                                                echo 'selected' ;
+                                            }
+                                            echo ">".$value."</option>\n";
+                                            }
+                                        ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Web Domains');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_web_domains" <?php if (isset($v_web_domains)) echo "value=".$v_web_domains; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Web Aliases');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_web_aliases" <?php if (isset($v_web_aliases)) echo "value=".$v_web_aliases; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('DNS domains');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_dns_domains" <?php if (isset($v_dns_domains)) echo "value=".$v_dns_domains; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('DNS records');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_dns_records" <?php if (isset($v_dns_records)) echo "value=".$v_dns_records; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Mail Domains');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_mail_domains" <?php if (isset($v_mail_domains)) echo "value=".$v_mail_domains; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Mail Accounts');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_mail_accounts" <?php if (isset($v_mail_accounts)) echo "value=".$v_mail_accounts; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Databases');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_databases" <?php if (isset($v_databases)) echo "value=".$v_databases; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Cron Jobs');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_cron_jobs" <?php if (isset($v_cron_jobs)) echo "value=".$v_cron_jobs; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Backups');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_backups" <?php if (isset($v_backups)) echo "value=".$v_backups; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Quota');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_disk_quota" <?php if (isset($v_disk_quota)) echo "value=".$v_disk_quota; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Bandwidth');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_bandwidth" <?php if (isset($v_bandwidth)) echo "value=".$v_bandwidth; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Name servers');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html
index bfb1d8fd..b99826c8 100644
--- a/web/templates/admin/add_user.html
+++ b/web/templates/admin/add_user.html
@@ -1,188 +1,184 @@
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/user/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?> 
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Adding User');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                }
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/user/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
+        <form id="vstobjects" name="v_add_user" method="post">
+            <script type="text/javascript">
+                $(function() {
+                    $("#v_email").change(function() {
+                        document.getElementById('v_notify').value = document.getElementById('v_email').value;
+                    });
+                });
 
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding User');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                function randomString() {
+                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                    var string_length = 10;
+                    var randomstring = '';
+                    for (var i=0; i<string_length; i++) {
+                        var rnum = Math.floor(Math.random() * chars.length);
+                        randomstring += chars.substring(rnum,rnum+1);
+                    }
+                    document.v_add_user.v_password.value = randomstring;
+                }
+            </script>
+
+            <table class="data">
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Username');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_username" <?php if (!empty($v_username)) echo "value=".$v_username;  ?> >
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Password');?> <a href="javascript:randomString();" class="genpass" ><?php print __('generate');?></a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_password"  <?php if (!empty($v_password)) echo "value=".$v_password;  ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Email');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_email" id='v_email' <?php if (!empty($v_email)) echo "value=".$v_email; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;" name="v_package">
+                                    <?php print __('Package');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_package">
+                                        <?php
+                                            foreach ($data as $key => $value) {
+                                                echo "\n\t\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
+                                                if ((!empty($v_package)) && ( $key == $_POST['v_package'])){
+                                                    echo 'selected' ;
                                                 } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                                    if ( $key == 'default'){
+                                                        echo 'selected' ;
                                                     }
                                                 }
-                                            ?> 
-                                        </td>
-                                    </tr>
-                                </table>
+                                                echo ">".$key."</option>\n";
+                                            }
+                                        ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;" >
+                                    <?php print __('Language');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_language">
+                                        <?php
+                                            foreach ($languages as $key => $value) {
+                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$value."\"";
+                                                $svalue = "'".$value."'";
+                                                if (( $value == $v_language ) || ( $svalue == $v_language)){
+                                                    echo 'selected' ;
+                                                }
+                                                if (( $value == 'en' ) && (empty($v_language))){
+                                                    echo 'selected' ;
+                                                }
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?>
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('First Name');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_fname" <?php if (!empty($v_fname)) echo "value=".$v_fname; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Last Name');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_lname" <?php if (!empty($v_lname)) echo "value=".$v_lname; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Send login credentials to email address');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text"  class="vst-input" name="v_notify" id="v_notify" <?php if (!empty($v_notify)) echo "value=".$v_notify; ?>>
+                                </td>
+                            </tr>
+
+                        </table>
+                    <table class="data-col2">
+                        <tr>
+                            <td style="padding: 24px 0 0 0;" width="116px">
+                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
+                            </td>
+                            <td style="padding: 24px 0 0 0;">
+                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                             </td>
                         </tr>
                     </table>
-
-                    <form id="vstobjects" name="v_add_user" method="post">
-                        <script type="text/javascript">
-                            $(function() {
-                                $("#v_email").change(function() {
-                                    document.getElementById('v_notify').value = document.getElementById('v_email').value;
-                                });
-                            });
-
-                            function randomString() {
-                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                                var string_length = 10;
-                                var randomstring = '';
-                                for (var i=0; i<string_length; i++) {
-                                    var rnum = Math.floor(Math.random() * chars.length);
-                                    randomstring += chars.substring(rnum,rnum+1);
-                                }
-                                document.v_add_user.v_password.value = randomstring;
-                            }
-                        </script>
-
-                        <table class="data">
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Username');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_username" <?php if (!empty($v_username)) echo "value=".$v_username;  ?> >
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Password');?> <a href="javascript:randomString();" class="genpass" ><?php print __('generate');?></a>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_password"  <?php if (!empty($v_password)) echo "value=".$v_password;  ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Email');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_email" id='v_email' <?php if (!empty($v_email)) echo "value=".$v_email; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;" name="v_package">
-                                                <?php print __('Package');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_package">
-                                                    <?php
-                                                        foreach ($data as $key => $value) {
-                                                            echo "\n\t\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
-                                                            if ((!empty($v_package)) && ( $key == $_POST['v_package'])){
-                                                                echo 'selected' ;
-                                                            } else {
-                                                                if ( $key == 'default'){
-                                                                    echo 'selected' ;
-                                                                }
-                                                            }
-                                                            echo ">".$key."</option>\n";
-                                                        }
-                                                    ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;" >
-                                                <?php print __('Language');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_language">
-                                                    <?php
-                                                        foreach ($languages as $key => $value) {
-                                                            echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$value."\"";
-                                                            $svalue = "'".$value."'";
-                                                            if (( $value == $v_language ) || ( $svalue == $v_language)){
-                                                                echo 'selected' ;
-                                                            }
-                                                            if (( $value == 'en' ) && (empty($v_language))){
-                                                                echo 'selected' ;
-                                                            }
-                                                            echo ">".$value."</option>\n";
-                                                        }
-                                                    ?>
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('First Name');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_fname" <?php if (!empty($v_fname)) echo "value=".$v_fname; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Last Name');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_lname" <?php if (!empty($v_lname)) echo "value=".$v_lname; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Send login credentials to email address');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text"  class="vst-input" name="v_notify" id="v_notify" <?php if (!empty($v_notify)) echo "value=".$v_notify; ?>>
-                                            </td>
-                                        </tr>
-
-                                    </table>
-                                <table class="data-col2">
-                                    <tr>
-                                        <td style="padding: 24px 0 0 0;" width="116px">
-                                            <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
-                                        </td>
-                                        <td style="padding: 24px 0 0 0;">
-                                            <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                        </td>
-                                    </tr>
-                                </table>
-                                </td>
-                            </tr>
-                        </table>
-                    </form>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html
index ff49af84..565eea05 100644
--- a/web/templates/admin/add_web.html
+++ b/web/templates/admin/add_web.html
@@ -1,363 +1,359 @@
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/web/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?> 
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Adding Domain');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                }
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/web/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
+        <form id="vstobjects" name="v_add_web" method="post">
+            <script type="text/javascript">
+                $(function() {
+                    $("#v_domain").change(function() {
+                        var prefix = 'www.';
+                        document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value;
+                    });
+                });
+                function WEBrandom() {
+                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                    var string_length = 10;
+                    var webrandom = '';
+                    for (var i=0; i<string_length; i++) {
+                        var rnum = Math.floor(Math.random() * chars.length);
+                        webrandom += chars.substring(rnum,rnum+1);
+                    }
+                    document.v_add_web.v_stats_password.value = webrandom;
+                }
 
-                                <table class="submenu">
+                function FTPrandom() {
+                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                    var string_length = 10;
+                    var ftprandomstring = '';
+                    for (var i=0; i<string_length; i++) {
+                        var rnum = Math.floor(Math.random() * chars.length);
+                        ftprandomstring += chars.substring(rnum,rnum+1);
+                    }
+                    document.v_add_web.v_ftp_password.value = ftprandomstring;
+                }
+
+                function elementHideShow(elementToHideOrShow){
+                    var el = document.getElementById(elementToHideOrShow);
+                    if (el.style.display == "block") {
+                        el.style.display = "none";
+                    } else {
+                        el.style.display = "block";
+                    }
+                }
+            </script>
+
+            <table class='data'>
+                <tr class="data-add">
+                <td class="data-dotted" width="150">
+                    <table class="data-col1">
+                        <tr>
+                            <td></td>
+                        </tr>
+                    </table>
+                </td>
+                <td class="data-dotted" width="830px">
+                    <table width="830px">
+                        <tr>
+                            <td></td>
+                        </tr>
+                    </table>
+                    <table class="data-col2" width="600px">
+                        <tr>
+                            <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <?php print __('Domain');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="text" size="20" class="vst-input" name="v_domain" id="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('IP address');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <select class="vst-list" name="v_ip">
+                                    <?php
+                                        foreach ($ips as $key => $value) {
+                                            $display_ip = $key;
+                                            if (!empty($value['NAT'])) $display_ip = $value['NAT'];
+                                            echo "\t\t\t\t<option value=\"".$display_ip."\"";
+                                            if ((!empty($v_ip)) && ( $display_ip == $_POST['v_ip'])){
+                                                echo ' selected';
+                                            }
+                                            echo ">".$display_ip."</option>\n";
+                                        }
+                                    ?>
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('DNS Support');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="checkbox" size="20" class="vst-checkbox" name="v_dns" <?php if (empty($v_dns)) echo "checked=yes"; ?>>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Mail Support');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="checkbox" size="20" class="vst-checkbox" name="v_mail" <?php if (empty($v_mail)) echo "checked=yes"; ?>>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
+                            </td>
+                        </tr>
+                    </table>
+                    <table class="data-col2" width="600px" style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Aliases');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <textarea size="20" class="vst-textinput" name="v_aliases" id="v_aliases" ><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Proxy Support');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if ($v_proxy !== 'off') echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table style="display:<?php if ($v_proxy == 'off') { echo 'none';} else {echo 'block';}?>;" id="proxytable" >
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding Domain');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
+                                        <td class="vst-text" style="padding: 9px 0 0 0;">
+                                            <?php print __('Proxy Extentions');?>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_ext;} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; }  ?></textarea>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('SSL Support');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table style="display:<?php if (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable">
+                                    <tr>
+                                        <td class="vst-text" style="padding: 9px 0 0 0;">
+                                            <?php print __('SSL Home Directory');?>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <select class="vst-list" name="v_ssl_home">
+                                                <option value='same' <?php if ($v_ssl_home == 'same') echo "selected";?>>
+                                                     public_html
+                                                </option>
+                                                <option value='single' <?php if ($v_ssl_home == 'single') echo "selected";?>>
+                                                    public_shtml
+                                                </option>
+                                            </select>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <?php print __('SSL Certificate');?>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <?php print __('SSL Key');?>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Web Statistics');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <select class="vst-list" name="v_stats">
+                                    <?php
+                                        foreach ($stats as $key => $value) {
+                                            $svalue = "'".$value."'";
+                                            echo "\t\t\t\t<option value=\"".$value."\"";
+                                            if (empty($v_stats)) $v_stats = 'none';
+                                            if (( $value == $v_stats ) || ($svalue == $v_stats )){
+                                                echo ' selected' ;
+                                            }
+                                            echo ">" . __($value) . "</option>\n";
+                                        }
+                                    ?> 
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Statistics Authorization');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
+                                    <tr>
+                                        <td class="vst-text" style="padding: 9px 0 0 0;">
+                                            <?php print __('Username');?>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password">
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Additional FTP Account');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <?php print __('Username');?><br>
+                                            <span style="font-size: 10pt; color:#777;"><?php print __('Prefix will be automaticaly added to username',$user."_");?></span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user; ?>>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <input type="text" class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password; ?>>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                             <?php print __('Send FTP credentials to email');?>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email; ?>>
                                         </td>
                                     </tr>
                                 </table>
                             </td>
                         </tr>
                     </table>
-
-                    <form id="vstobjects" name="v_add_web" method="post">
-                        <script type="text/javascript">
-                            $(function() {
-                                $("#v_domain").change(function() {
-                                    var prefix = 'www.';
-                                    document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value;
-                                });
-                            });
-                            function WEBrandom() {
-                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                                var string_length = 10;
-                                var webrandom = '';
-                                for (var i=0; i<string_length; i++) {
-                                    var rnum = Math.floor(Math.random() * chars.length);
-                                    webrandom += chars.substring(rnum,rnum+1);
-                                }
-                                document.v_add_web.v_stats_password.value = webrandom;
-                            }
-
-                            function FTPrandom() {
-                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                                var string_length = 10;
-                                var ftprandomstring = '';
-                                for (var i=0; i<string_length; i++) {
-                                    var rnum = Math.floor(Math.random() * chars.length);
-                                    ftprandomstring += chars.substring(rnum,rnum+1);
-                                }
-                                document.v_add_web.v_ftp_password.value = ftprandomstring;
-                            }
-
-                            function elementHideShow(elementToHideOrShow){
-                                var el = document.getElementById(elementToHideOrShow);
-                                if (el.style.display == "block") {
-                                    el.style.display = "none";
-                                } else {
-                                    el.style.display = "block";
-                                }
-                            }
-                        </script>
-
-                        <table class='data'>
-                            <tr class="data-add">
-                            <td class="data-dotted" width="150">
-                                <table class="data-col1">
-                                    <tr>
-                                        <td></td>
-                                    </tr>
-                                </table>
+                    <table class="data-col2">
+                        <tr>
+                            <td style="padding: 33px 0 0 0;" width="116px">
+                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                             </td>
-                            <td class="data-dotted" width="830px">
-                                <table width="830px">
-                                    <tr>
-                                        <td></td>
-                                    </tr>
-                                </table>
-                                <table class="data-col2" width="600px">
-                                    <tr>
-                                        <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                            <?php print __('Domain');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="text" size="20" class="vst-input" name="v_domain" id="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('IP address');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <select class="vst-list" name="v_ip">
-                                                <?php
-                                                    foreach ($ips as $key => $value) {
-                                                        $display_ip = $key;
-                                                        if (!empty($value['NAT'])) $display_ip = $value['NAT'];
-                                                        echo "\t\t\t\t<option value=\"".$display_ip."\"";
-                                                        if ((!empty($v_ip)) && ( $display_ip == $_POST['v_ip'])){
-                                                            echo ' selected';
-                                                        }
-                                                        echo ">".$display_ip."</option>\n";
-                                                    }
-                                                ?>
-                                            </select>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('DNS Support');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_dns" <?php if (empty($v_dns)) echo "checked=yes"; ?>>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Mail Support');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_mail" <?php if (empty($v_mail)) echo "checked=yes"; ?>>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <table class="data-col2" width="600px" style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Aliases');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <textarea size="20" class="vst-textinput" name="v_aliases" id="v_aliases" ><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Proxy Support');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if ($v_proxy !== 'off') echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <table style="display:<?php if ($v_proxy == 'off') { echo 'none';} else {echo 'block';}?>;" id="proxytable" >
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                        <?php print __('Proxy Extentions');?>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_ext;} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; }  ?></textarea>
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('SSL Support');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');">
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <table style="display:<?php if (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable">
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                        <?php print __('SSL Home Directory');?>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <select class="vst-list" name="v_ssl_home">
-                                                            <option value='same' <?php if ($v_ssl_home == 'same') echo "selected";?>>
-                                                                 public_html
-                                                            </option>
-                                                            <option value='single' <?php if ($v_ssl_home == 'single') echo "selected";?>>
-                                                                public_shtml
-                                                            </option>
-                                                        </select>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print __('SSL Certificate');?>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print __('SSL Key');?>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Web Statistics');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <select class="vst-list" name="v_stats">
-                                                <?php
-                                                    foreach ($stats as $key => $value) {
-                                                        $svalue = "'".$value."'";
-                                                        echo "\t\t\t\t<option value=\"".$value."\"";
-                                                        if (empty($v_stats)) $v_stats = 'none';
-                                                        if (( $value == $v_stats ) || ($svalue == $v_stats )){
-                                                            echo ' selected' ;
-                                                        }
-                                                        echo ">" . __($value) . "</option>\n";
-                                                    }
-                                                ?> 
-                                            </select>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Statistics Authorization');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                        <?php print __('Username');?>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password">
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Additional FTP Account');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print __('Username');?><br>
-                                                        <span style="font-size: 10pt; color:#777;"><?php print __('Prefix will be automaticaly added to username',$user."_");?></span>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user; ?>>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <input type="text" class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password; ?>>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                         <?php print __('Send FTP credentials to email');?>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email; ?>>
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <table class="data-col2">
-                                    <tr>
-                                        <td style="padding: 33px 0 0 0;" width="116px">
-                                            <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
-                                        </td>
-                                        <td style="padding: 33px 0 0 0;">
-                                            <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                        </td>
-                                    </tr>
-                                </table>
+                            <td style="padding: 33px 0 0 0;">
+                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                             </td>
                         </tr>
                     </table>
-                </form>
+                </td>
+            </tr>
+        </table>
+    </form>
diff --git a/web/templates/admin/edit_cron.html b/web/templates/admin/edit_cron.html
index e1560f2f..9be88c14 100644
--- a/web/templates/admin/edit_cron.html
+++ b/web/templates/admin/edit_cron.html
@@ -1,126 +1,122 @@
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/cron/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?> 
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Editing Cron Job');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                }
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/cron/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?> 
-
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing Cron Job');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_edit_cron" method="post">
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr>
-                                            <td style="padding: 24px 0 2px 18px;">
-                                                <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                                <a class="data-date"><?php echo $v_time?></a>
-                                            </td>
-                                        </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
-                                    </table>
+        <form id="vstobjects" name="v_edit_cron" method="post">
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr>
+                                <td>
+                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                    <a class="data-date"><?php echo $v_time?></a>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
+                            </tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
 
-                                    <table class="data-col2" width="600px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Minute');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_min" <?php if (!empty($v_min)) echo "value=".$v_min; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Hour');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_hour" <?php if (!empty($v_hour)) echo "value=".$v_hour; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Day');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_day" <?php if (!empty($v_day)) echo "value=".$v_day; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Month');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_month" <?php if (!empty($v_month)) echo "value=".$v_month; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Day of week');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_wday" <?php if (!empty($v_wday)) echo "value=".$v_wday; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Command');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_cmd" <?php if (!empty($v_cmd)) echo "value='".$v_cmd."'"; ?>>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                            </td>
-                                        </tr>
-                                    </table>
+                        <table class="data-col2" width="600px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Minute');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_min" <?php if (!empty($v_min)) echo "value=".$v_min; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Hour');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_hour" <?php if (!empty($v_hour)) echo "value=".$v_hour; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Day');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_day" <?php if (!empty($v_day)) echo "value=".$v_day; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Month');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_month" <?php if (!empty($v_month)) echo "value=".$v_month; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Day of week');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_wday" <?php if (!empty($v_wday)) echo "value=".$v_wday; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Command');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_cmd" <?php if (!empty($v_cmd)) echo "value='".$v_cmd."'"; ?>>
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/admin/edit_db.html b/web/templates/admin/edit_db.html
index 08227dfa..7e5e70cb 100644
--- a/web/templates/admin/edit_db.html
+++ b/web/templates/admin/edit_db.html
@@ -1,145 +1,142 @@
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/db/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
-
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing Database');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_edit_db" method="post">
-                        <script type="text/javascript">
-                            function elementHideShow(elementToHideOrShow) {
-                                var el = document.getElementById(elementToHideOrShow);
-                                if (el.style.display == "block") {
-                                    el.style.display = "none";
-                                } else {
-                                    el.style.display = "block";
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/db/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?> 
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Editing Database');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                 }
                             }
-                            function randomString() {
-                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                                var string_length = 10;
-                                var randomstring = '';
-                                for (var i=0; i<string_length; i++) {
-                                    var rnum = Math.floor(Math.random() * chars.length);
-                                    randomstring += chars.substring(rnum,rnum+1);
-                                }
-                                document.v_edit_db.v_password.value = randomstring;
-                            }
-                        </script>
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                       <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr>
-                                            <td style="padding: 24px 0 2px 18px;">
-                                                <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                                <a class="data-date"><?php echo $v_time?></a>
-                                            </td>
-                                        </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
-                                    </table>
+        <form id="vstobjects" name="v_edit_db" method="post">
+            <script type="text/javascript">
+                function elementHideShow(elementToHideOrShow) {
+                    var el = document.getElementById(elementToHideOrShow);
+                    if (el.style.display == "block") {
+                        el.style.display = "none";
+                    } else {
+                        el.style.display = "block";
+                    }
+                }
+                function randomString() {
+                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                    var string_length = 10;
+                    var randomstring = '';
+                    for (var i=0; i<string_length; i++) {
+                        var rnum = Math.floor(Math.random() * chars.length);
+                        randomstring += chars.substring(rnum,rnum+1);
+                    }
+                    document.v_edit_db.v_password.value = randomstring;
+                }
+            </script>
+
+           <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr>
+                                <td>
+                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                    <a class="data-date"><?php echo $v_time?></a>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="600px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Database');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_database" <?php if (!empty($v_database)) echo "value=".$v_database; ?> disabled>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('User');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_dbuser" <?php if (!empty($v_dbuser)) echo "value=".$v_dbuser; ?> disabled>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_password"  <?php if (!empty($v_password)) echo "value=".$v_password; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Type');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_type" <?php if (!empty($v_type)) echo "value=".$v_type; ?> disabled>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Host');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_host" <?php if (!empty($v_host)) echo "value=".$v_host; ?> disabled>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Charset');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_charset" <?php if (!empty($v_charset)) echo "value=".$v_charset; ?> disabled>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                            </td>
-                                        </tr>
-                                    </table>
+                            </tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="600px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Database');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_database" <?php if (!empty($v_database)) echo "value=".$v_database; ?> disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('User');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_dbuser" <?php if (!empty($v_dbuser)) echo "value=".$v_dbuser; ?> disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_password"  <?php if (!empty($v_password)) echo "value=".$v_password; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Type');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_type" <?php if (!empty($v_type)) echo "value=".$v_type; ?> disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Host');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_host" <?php if (!empty($v_host)) echo "value=".$v_host; ?> disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Charset');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_charset" <?php if (!empty($v_charset)) echo "value=".$v_charset; ?> disabled>
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/admin/edit_dns.html b/web/templates/admin/edit_dns.html
index 9973a98a..9aeb9f30 100644
--- a/web/templates/admin/edit_dns.html
+++ b/web/templates/admin/edit_dns.html
@@ -1,135 +1,132 @@
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/dns/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/dns/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?> 
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Editing DNS Domain');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                }
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing DNS Domain');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_edit_dns" method="post">
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr>
-                                            <td style="padding: 24px 0 2px 18px;">
-                                                <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                                <a class="data-date"><?php echo $v_time?></a>
-                                            </td>
-                                        </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
-                                    </table>
+        <form id="vstobjects" name="v_edit_dns" method="post">
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr>
+                                <td>
+                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                    <a class="data-date"><?php echo $v_time?></a>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Domain');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> disabled> <input type="hidden" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('IP Address');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip;  ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Template');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_template">
-                                                    <?php
-                                                        foreach ($templates as $key => $value) {
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            $svalue = "'".$value."'";
-                                                            if ((!empty($v_template)) && ( $value == $v_template ) || ($svalue == $v_template)){
-                                                                echo ' selected' ;
-                                                            }
-                                                            echo ">".$value."</option>\n";
-                                                        }
-                                                    ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Expiration Date');?><span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_exp" <?php if (!empty($v_exp)) echo "value=".$v_exp; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                SOA
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_soa" <?php if (!empty($v_soa)) echo "value=".$v_soa; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                TTL
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ttl" <?php if (!empty($v_ttl)) echo "value=".$v_ttl; ?>>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                            </td>
-                                        </tr>
-                                    </table>
+                            </tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Domain');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> disabled> <input type="hidden" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('IP Address');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip;  ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Template');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_template">
+                                        <?php
+                                            foreach ($templates as $key => $value) {
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                $svalue = "'".$value."'";
+                                                if ((!empty($v_template)) && ( $value == $v_template ) || ($svalue == $v_template)){
+                                                    echo ' selected' ;
+                                                }
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Expiration Date');?><span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_exp" <?php if (!empty($v_exp)) echo "value=".$v_exp; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    SOA
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_soa" <?php if (!empty($v_soa)) echo "value=".$v_soa; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    TTL
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ttl" <?php if (!empty($v_ttl)) echo "value=".$v_ttl; ?>>
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/admin/edit_dns_rec.html b/web/templates/admin/edit_dns_rec.html
index a9f6eeeb..121fadf3 100644
--- a/web/templates/admin/edit_dns_rec.html
+++ b/web/templates/admin/edit_dns_rec.html
@@ -1,127 +1,124 @@
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/dns/?domain=".$_GET['domain']."'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/dns/?domain=".$_GET['domain']."'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?> 
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Editing DNS Record');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                }
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing DNS Record');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_edit_dns_rec" method="post">
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr>
-                                            <td style="padding: 24px 0 2px 18px;">
-                                                <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                                <a class="data-date"><?php echo $v_time?></a>
-                                            </td>
-                                        </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
-                                    </table>
+        <form id="vstobjects" name="v_edit_dns_rec" method="post">
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr>
+                                <td>
+                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                    <a class="data-date"><?php echo $v_time?></a>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Domain');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_domain" <?php echo "value=".$v_domain;  ?> disabled >
-                                                <input type="hidden" name="v_domain" <?php echo "value=".$v_domain; 	 ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Record');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_rec" <?php if (!empty($v_rec)) echo "value=".$v_rec; ?> disabled> <input type="hidden" name="v_record_id" <?php if (!empty($v_record_id)) echo "value=".$v_record_id; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Type');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_type" <?php if (!empty($v_rec)) echo "value=".$v_type; ?> disabled>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('IP or Value');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_val" <?php if (!empty($v_val)) echo "value='".$v_val."'"; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Priority');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_priority" <?php if (!empty($v_priority)) echo "value=".$v_priority; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Record Number');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('internal');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_record_id" <?php if (!empty($v_record_id)) echo "value=".$v_record_id; ?>>
-                                            </td>
-                                        </tr>
-
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                            </td>
-                                        </tr>
-                                    </table>
+                            </tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Domain');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_domain" <?php echo "value=".$v_domain;  ?> disabled >
+                                    <input type="hidden" name="v_domain" <?php echo "value=".$v_domain; 	 ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Record');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_rec" <?php if (!empty($v_rec)) echo "value=".$v_rec; ?> disabled> <input type="hidden" name="v_record_id" <?php if (!empty($v_record_id)) echo "value=".$v_record_id; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Type');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_type" <?php if (!empty($v_rec)) echo "value=".$v_type; ?> disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('IP or Value');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_val" <?php if (!empty($v_val)) echo "value='".$v_val."'"; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Priority');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_priority" <?php if (!empty($v_priority)) echo "value=".$v_priority; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Record Number');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('internal');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_record_id" <?php if (!empty($v_record_id)) echo "value=".$v_record_id; ?>>
+                                </td>
+                            </tr>
 
+                        </table>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>
                         </table>
-                    </form>
+
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/admin/edit_ip.html b/web/templates/admin/edit_ip.html
index a4c6c92c..9b94e7f2 100644
--- a/web/templates/admin/edit_ip.html
+++ b/web/templates/admin/edit_ip.html
@@ -1,155 +1,152 @@
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/ip/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
-
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing IP Address');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_edit_ip" method="post">
-
-                        <script type="text/javascript">
-                            function elementHideShow(elementToHideOrShow) {
-                                var el = document.getElementById(elementToHideOrShow);
-                                if (el.style.display == "block") {
-                                    el.style.display = "none";
-                                } else {
-                                    el.style.display = "block";
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/ip/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?> 
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Editing IP Address');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                 }
                             }
-                        </script>
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr>
-                                            <td style="padding: 24px 0 2px 18px;">
-                                                <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                                <a class="data-date"><?php echo $v_time?></a>
-                                            </td>
-                                        </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
-                                    </table>
+        <form id="vstobjects" name="v_edit_ip" method="post">
+
+            <script type="text/javascript">
+                function elementHideShow(elementToHideOrShow) {
+                    var el = document.getElementById(elementToHideOrShow);
+                    if (el.style.display == "block") {
+                        el.style.display = "none";
+                    } else {
+                        el.style.display = "block";
+                    }
+                }
+            </script>
+
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr>
+                                <td>
+                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                    <a class="data-date"><?php echo $v_time?></a>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="600px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('IP address'); ?> 
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip; ?> disabled> <input type="hidden" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Netmask');?> 
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_netmask" <?php if (!empty($v_netmask)) echo "value=".$v_netmask; ?> disabled>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print __('Interface'); ?> 
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_netmask" <?php if (!empty($v_interace)) echo "value=".$v_interace; ?> disabled>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Shared'); ?> 
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_shared" <?php if (empty($v_dedicated)) echo "checked=yes" ?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Assigned user'); ?> 
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_owner">
-                                                    <?php
-                                                        foreach ($users as $key => $value) {
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            if ((!empty($v_owner)) && ( $value == $v_owner )) echo ' selected';
-                                                            echo ">".$value."</option>\n";
-                                                        }
-                                                    ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print __('Assigned domain');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_name" <?php if (!empty($v_name)) echo "value=".$v_name; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print __('NAT IP association');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_nat" <?php if (!empty($v_nat)) echo "value=".$v_nat; ?>>
-                                            </td>
-                                        </tr>
+                            </tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="600px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('IP address'); ?> 
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip; ?> disabled> <input type="hidden" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Netmask');?> 
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_netmask" <?php if (!empty($v_netmask)) echo "value=".$v_netmask; ?> disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                    <?php print __('Interface'); ?> 
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_netmask" <?php if (!empty($v_interace)) echo "value=".$v_interace; ?> disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Shared'); ?> 
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_shared" <?php if (empty($v_dedicated)) echo "checked=yes" ?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Assigned user'); ?> 
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_owner">
+                                        <?php
+                                            foreach ($users as $key => $value) {
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                if ((!empty($v_owner)) && ( $value == $v_owner )) echo ' selected';
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                    <?php print __('Assigned domain');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_name" <?php if (!empty($v_name)) echo "value=".$v_name; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                    <?php print __('NAT IP association');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_nat" <?php if (!empty($v_nat)) echo "value=".$v_nat; ?>>
+                                </td>
+                            </tr>
 
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                            </td>
-                                        </tr>
-                                    </table>
+                        </table>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/admin/edit_mail.html b/web/templates/admin/edit_mail.html
index 5f09f264..60d9e0f3 100644
--- a/web/templates/admin/edit_mail.html
+++ b/web/templates/admin/edit_mail.html
@@ -1,114 +1,111 @@
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/mail/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/mail/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?> 
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Editing Mail Domain');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                }
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing Mail Domain');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_edit_mail" method="post">
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr>
-                                            <td style="padding: 24px 0 2px 18px;">
-                                                <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                                <a class="data-date"><?php echo $v_time?></a>
-                                            </td>
-                                        </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>
-                                    </table>
+        <form id="vstobjects" name="v_edit_mail" method="post">
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr>
+                                <td>
+                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                    <a class="data-date"><?php echo $v_time?></a>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Domain');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> disabled> <input type="hidden" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('AntiSpam Support');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_antispam" <?php if ($v_antispam == 'yes') echo "checked=yes"; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('AntiVirus Support');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_antivirus" <?php if ($v_antivirus == 'yes') echo "checked=yes"; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('DKIM Support');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_dkim" <?php if ($v_dkim == 'yes') echo "checked=yes"; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Catchall email');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_catchall" <?php if (!empty($v_catchall)) echo "value=".$v_catchall;  ?> >
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                            </td>
-                                        </tr>
-                                    </table>
+                            </tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Domain');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> disabled> <input type="hidden" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('AntiSpam Support');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_antispam" <?php if ($v_antispam == 'yes') echo "checked=yes"; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('AntiVirus Support');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_antivirus" <?php if ($v_antivirus == 'yes') echo "checked=yes"; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('DKIM Support');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_dkim" <?php if ($v_dkim == 'yes') echo "checked=yes"; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Catchall email');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_catchall" <?php if (!empty($v_catchall)) echo "value=".$v_catchall;  ?> >
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html
index 2ddb5167..ecb1ea95 100644
--- a/web/templates/admin/edit_mail_acc.html
+++ b/web/templates/admin/edit_mail_acc.html
@@ -1,163 +1,161 @@
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/mail/?domain=".$_GET['domain']."'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/mail/?domain=".$_GET['domain']."'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?> 
 
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing Mail Account');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_edit_mail_acc" method="post">
-                        <script type="text/javascript">
-                            function elementHideShow(elementToHideOrShow) {
-                                var el = document.getElementById(elementToHideOrShow);
-                                if (el.style.display == "block") {
-                                    el.style.display = "none";
-                                } else {
-                                    el.style.display = "block";
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Editing Mail Account');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                 }
                             }
-                            function randomString() {
-                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                                var string_length = 10;
-                                var randomstring = '';
-                                for (var i=0; i<string_length; i++) {
-                                    var rnum = Math.floor(Math.random() * chars.length);
-                                    randomstring += chars.substring(rnum,rnum+1);
-                                }
-                                document.v_edit_mail_acc.v_password.value = randomstring;
-                            }
-                        </script>
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr>
-                                            <td style="padding: 24px 0 2px 18px;">
-                                                <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                                <a class="data-date"><?php echo $v_time?></a>
-                                            </td>
-                                        </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
-                                    </table>
+        <form id="vstobjects" name="v_edit_mail_acc" method="post">
+            <script type="text/javascript">
+                function elementHideShow(elementToHideOrShow) {
+                    var el = document.getElementById(elementToHideOrShow);
+                    if (el.style.display == "block") {
+                        el.style.display = "none";
+                    } else {
+                        el.style.display = "block";
+                    }
+                }
+                function randomString() {
+                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                    var string_length = 10;
+                    var randomstring = '';
+                    for (var i=0; i<string_length; i++) {
+                        var rnum = Math.floor(Math.random() * chars.length);
+                        randomstring += chars.substring(rnum,rnum+1);
+                    }
+                    document.v_edit_mail_acc.v_password.value = randomstring;
+                }
+            </script>
+
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr>
+                                <td>
+                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                    <a class="data-date"><?php echo $v_time?></a>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                </table>
-                                <table class="data-col2" width="600px">
+                            </tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                    </table>
+                    <table class="data-col2" width="600px">
+                        <tr>
+                            <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <?php print __('Account');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="text" size="20" class="vst-input" name="v_email" <?php if (!empty($v_account)) echo "value=".$_GET['account']."@".$_GET['domain']; ?> disabled >
+                                <input type="hidden" name="v_domain" <?php echo "value=".$v_domain; ?>>
+                                <input type="hidden" name="v_account" <?php if (!empty($v_account)) echo "value=".$v_account; ?> >
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="text" size="20" class="vst-input" name="v_password" <?php if (!empty($v_password)) echo "value=".$v_password; ?>
+                            </td>
+                         </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Quota');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('in megabytes');?>)</span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="text" size="20" class="vst-input" name="v_quota" <?php if (!empty($v_quota)) {echo "value=".$v_quota;} else { echo "value=0";}; ?>>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10 0 0 2px;">
+                                <?php print __('Aliases');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('use local-part');?>)</span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10 0 0 2px;">
+                                <?php print __('Forward to');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('one or more email addresses');?>)</span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <textarea size="20" class="vst-textinput" name="v_fwd"><?php if (!empty($v_fwd)) echo $v_fwd;  ?></textarea>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Autoreply');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="checkbox" size="20" class="vst-checkbox" name="v_autoreply" <?php if ($v_autoreply == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('autoreplytable');">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table style="display:<?php if ($v_autoreply == 'no') { echo 'none';} else {echo 'block';}?> ;" id="autoreplytable">
                                     <tr>
-                                        <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                            <?php print __('Account');?>
+                                        <td class="vst-text" style="padding: 9px 0 0 2px;">
+                                            <?php print __('Message');?>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td>
-                                            <input type="text" size="20" class="vst-input" name="v_email" <?php if (!empty($v_account)) echo "value=".$_GET['account']."@".$_GET['domain']; ?> disabled >
-                                            <input type="hidden" name="v_domain" <?php echo "value=".$v_domain; ?>>
-                                            <input type="hidden" name="v_account" <?php if (!empty($v_account)) echo "value=".$v_account; ?> >
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="text" size="20" class="vst-input" name="v_password" <?php if (!empty($v_password)) echo "value=".$v_password; ?>
-                                        </td>
-                                     </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Quota');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('in megabytes');?>)</span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="text" size="20" class="vst-input" name="v_quota" <?php if (!empty($v_quota)) {echo "value=".$v_quota;} else { echo "value=0";}; ?>>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10 0 0 2px;">
-                                            <?php print __('Aliases');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('use local-part');?>)</span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10 0 0 2px;">
-                                            <?php print __('Forward to');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('one or more email addresses');?>)</span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <textarea size="20" class="vst-textinput" name="v_fwd"><?php if (!empty($v_fwd)) echo $v_fwd;  ?></textarea>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Autoreply');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_autoreply" <?php if ($v_autoreply == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('autoreplytable');">
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <table style="display:<?php if ($v_autoreply == 'no') { echo 'none';} else {echo 'block';}?> ;" id="autoreplytable">
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 9px 0 0 2px;">
-                                                        <?php print __('Message');?>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <textarea size="20" class="vst-textinput" name="v_autoreply_message"><?php if (!empty($v_autoreply_message)) echo $v_autoreply_message; ?></textarea>
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <table class="data-col2">
-                                    <tr>
-                                        <td style="padding: 24px 0 0 0;" width="116px">
-                                            <input type="submit" name="save" value="<?php print __('Save');?>" class="button">
-                                        </td>
-                                        <td style="padding: 24px 0 0 0;">
-                                            <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                            <textarea size="20" class="vst-textinput" name="v_autoreply_message"><?php if (!empty($v_autoreply_message)) echo $v_autoreply_message; ?></textarea>
                                         </td>
                                     </tr>
                                 </table>
                             </td>
                         </tr>
                     </table>
-                </form>
+                    <table class="data-col2">
+                        <tr>
+                            <td style="padding: 24px 0 0 0;" width="116px">
+                                <input type="submit" name="save" value="<?php print __('Save');?>" class="button">
+                            </td>
+                            <td style="padding: 24px 0 0 0;">
+                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
+    </form>
diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html
index b4d41475..2c210d95 100644
--- a/web/templates/admin/edit_package.html
+++ b/web/templates/admin/edit_package.html
@@ -1,302 +1,299 @@
-                                <?php
-                                    $back = getenv("HTTP_REFERER");
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/package/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?> 
+            <?php
+                $back = getenv("HTTP_REFERER");
+                if (empty($back)) {
+                    $back = "location.href='/list/package/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?> 
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Editing Package');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                }
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing Package');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_edit_package" method="post">
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr>
-                                            <td style="padding: 24px 0 2px 18px;">
-                                                <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                                <a class="data-date"><?php echo $v_time?></a>
-                                            </td>
-                                        </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
-                                    </table>
+        <form id="vstobjects" name="v_edit_package" method="post">
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr>
+                                <td>
+                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                    <a class="data-date"><?php echo $v_time?></a>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Package Name');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_package" <?php if (!empty($v_package)) echo "value=".$v_package; ?> disabled >
-                                                <input type="hidden" name="v_package" <?php if (!empty($v_package)) echo "value=".$v_package; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Web Template');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_web_template">
-                                                    <?php
-                                                        foreach ($web_templates as $key => $value) {
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            if ((!empty($v_web_template)) && ( $value == $v_web_template)){
-                                                                echo ' selected' ;
-                                                            }
-                                                            if ((!empty($v_web_template)) && ( $value == $_POST['v_web_template'])){
-                                                                echo ' selected' ;
-                                                            }
-                                                            echo ">".$value."</option>\n";
-                                                        }
-                                                    ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Proxy Template');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_proxy_template">
-                                                    <?php
-                                                        foreach ($proxy_templates as $key => $value) {
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            if ((!empty($v_proxy_template)) && ( $value == $v_proxy_template)){
-                                                                echo ' selected' ;
-                                                            }
-                                                            if ((!empty($v_proxy_template)) && ( $value == $_POST['v_proxy_template'])){
-                                                                echo ' selected' ;
-                                                            }
-                                                            echo ">".$value."</option>\n";
-                                                        }
-                                                    ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('DNS Template');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_dns_template">
-                                                    <?php
-                                                        foreach ($dns_templates as $key => $value) {
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            if ((!empty($v_dns_template)) && ( $value == $v_dns_template)){
-                                                                echo ' selected' ;
-                                                            }
-                                                            if ((!empty($v_dns_template)) && ( $value == $_POST['v_dns_template'])){
-                                                                echo ' selected' ;
-                                                            }
-                                                            echo ">".$value."</option>\n";
-                                                        }
-                                                    ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('SSH Access');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_shell">
-                                                    <?php
-                                                        foreach ($shells as $key => $value) {
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            if ((!empty($v_shell)) && ( $value == $v_shell)){
-                                                                echo ' selected' ;
-                                                            }
-                                                            if ((!empty($v_shell)) && ( $value == $_POST['v_shell'])){
-                                                                echo ' selected' ;
-                                                            }
-                                                            echo ">".$value."</option>\n";
-                                                        }
-                                                    ?>
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Web Domains');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_web_domains" <?php if (isset($v_web_domains)) echo "value=".$v_web_domains; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Web Aliases');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_web_aliases" <?php if (isset($v_web_aliases)) echo "value=".$v_web_aliases; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('DNS domains');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_dns_domains" <?php if (isset($v_dns_domains)) echo "value=".$v_dns_domains; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('DNS records');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_dns_records" <?php if (isset($v_dns_records)) echo "value=".$v_dns_records; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Mail Domains');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_mail_domains" <?php if (isset($v_mail_domains)) echo "value=".$v_mail_domains; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Mail Accounts');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_mail_accounts" <?php if (isset($v_mail_accounts)) echo "value=".$v_mail_accounts; ?>>
-                                            <td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Databases');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_databases" <?php if (isset($v_databases)) echo "value=".$v_databases; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Cron Jobs');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_cron_jobs" <?php if (isset($v_cron_jobs)) echo "value=".$v_cron_jobs; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Backups');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_backups" <?php if (isset($v_backups)) echo "value=".$v_backups; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Quota');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_disk_quota" <?php if (isset($v_disk_quota)) echo "value=".$v_disk_quota; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Bandwidth');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_bandwidth" <?php if (isset($v_bandwidth)) echo "value=".$v_bandwidth; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Name Servers');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                            </td>
-                                        </tr>
-                                    </table>
+                            </tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Package Name');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_package" <?php if (!empty($v_package)) echo "value=".$v_package; ?> disabled >
+                                    <input type="hidden" name="v_package" <?php if (!empty($v_package)) echo "value=".$v_package; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Web Template');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_web_template">
+                                        <?php
+                                            foreach ($web_templates as $key => $value) {
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                if ((!empty($v_web_template)) && ( $value == $v_web_template)){
+                                                    echo ' selected' ;
+                                                }
+                                                if ((!empty($v_web_template)) && ( $value == $_POST['v_web_template'])){
+                                                    echo ' selected' ;
+                                                }
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Proxy Template');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_proxy_template">
+                                        <?php
+                                            foreach ($proxy_templates as $key => $value) {
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                if ((!empty($v_proxy_template)) && ( $value == $v_proxy_template)){
+                                                    echo ' selected' ;
+                                                }
+                                                if ((!empty($v_proxy_template)) && ( $value == $_POST['v_proxy_template'])){
+                                                    echo ' selected' ;
+                                                }
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('DNS Template');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_dns_template">
+                                        <?php
+                                            foreach ($dns_templates as $key => $value) {
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                if ((!empty($v_dns_template)) && ( $value == $v_dns_template)){
+                                                    echo ' selected' ;
+                                                }
+                                                if ((!empty($v_dns_template)) && ( $value == $_POST['v_dns_template'])){
+                                                    echo ' selected' ;
+                                                }
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('SSH Access');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_shell">
+                                        <?php
+                                            foreach ($shells as $key => $value) {
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                if ((!empty($v_shell)) && ( $value == $v_shell)){
+                                                    echo ' selected' ;
+                                                }
+                                                if ((!empty($v_shell)) && ( $value == $_POST['v_shell'])){
+                                                    echo ' selected' ;
+                                                }
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?>
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Web Domains');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_web_domains" <?php if (isset($v_web_domains)) echo "value=".$v_web_domains; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Web Aliases');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_web_aliases" <?php if (isset($v_web_aliases)) echo "value=".$v_web_aliases; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('DNS domains');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_dns_domains" <?php if (isset($v_dns_domains)) echo "value=".$v_dns_domains; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('DNS records');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_dns_records" <?php if (isset($v_dns_records)) echo "value=".$v_dns_records; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Mail Domains');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_mail_domains" <?php if (isset($v_mail_domains)) echo "value=".$v_mail_domains; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Mail Accounts');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_mail_accounts" <?php if (isset($v_mail_accounts)) echo "value=".$v_mail_accounts; ?>>
+                                <td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Databases');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_databases" <?php if (isset($v_databases)) echo "value=".$v_databases; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Cron Jobs');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_cron_jobs" <?php if (isset($v_cron_jobs)) echo "value=".$v_cron_jobs; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Backups');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_backups" <?php if (isset($v_backups)) echo "value=".$v_backups; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Quota');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_disk_quota" <?php if (isset($v_disk_quota)) echo "value=".$v_disk_quota; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Bandwidth');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_bandwidth" <?php if (isset($v_bandwidth)) echo "value=".$v_bandwidth; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Name Servers');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html
index 7daafbed..871c2908 100644
--- a/web/templates/admin/edit_user.html
+++ b/web/templates/admin/edit_user.html
@@ -1,218 +1,215 @@
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/user/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
-
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing User');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" method="post" name="v_edit_user">
-                        <script type="text/javascript">
-                            function randomString() {
-                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                                var string_length = 10;
-                                var randomstring = '';
-                                for (var i=0; i<string_length; i++) {
-                                    var rnum = Math.floor(Math.random() * chars.length);
-                                    randomstring += chars.substring(rnum,rnum+1);
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/user/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?> 
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Editing User');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                 }
-                                document.v_edit_user.v_password.value = randomstring;
                             }
-                        </script>
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr>
-                                            <td style="padding: 24px 0 2px 18px;">
-                                                <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                                <a class="data-date"><?php echo $v_time?></a>
-                                            </td>
-                                        </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Username');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_user" <?php if (!empty($v_username)) echo "value=".$v_username;  ?> disabled> <input type="hidden" name="v_username" <?php if (!empty($v_username)) echo "value=".$v_username;  ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_password" <?php if (!empty($v_password)) echo "value=".$v_password;  ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Email');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_email" <?php if (!empty($v_email)) echo "value=".$v_email; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;" >
-                                                <?php print __('Package');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_package">
-                                                    <?php
-                                                        foreach ($packages as $key => $value) {
-                                                            echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
-                                                            $skey = "'".$key."'";
-                                                            if (( $key == $v_package ) || ( $skey == $v_package)){
-                                                                echo 'selected' ;
-                                                            }
-                                                            echo ">".$key."</option>\n";
-                                                        }
-                                                    ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;" >
-                                                <?php print __('Language');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_language">
-                                                    <?php
-                                                        foreach ($languages as $key => $value) {
-                                                            echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$value."\"";
-                                                            $svalue = "'".$value."'";
-                                                            if (( $value == $v_language ) || ( $svalue == $v_language)){
-                                                                echo 'selected' ;
-                                                            }
-                                                            if (( $value == 'en' ) && (empty($v_language))){
-                                                                echo 'selected' ;
-                                                            }
-                                                            echo ">".$value."</option>\n";
-                                                        }
-                                                    ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('First Name');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_fname" <?php if (!empty($v_fname)) echo "value=".$v_fname; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Last Name');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_lname" <?php if (!empty($v_lname)) echo "value=".$v_lname; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;" >
-                                                <?php print __('SSH Access');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_shell">
-                                                    <?php
-                                                        foreach ($shells as $key => $value) {
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            $svalue = "'".$value."'";
-                                                            if (( $value == $v_shell ) || ($svalue == $v_shell )){
-                                                                echo 'selected' ;
-                                                            }
-                                                            echo ">".$value."</option>\n";
-                                                        }
-                                                    ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Default Name Servers');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                            </td>
-                                        </tr>
-                                    </table>
+        <form id="vstobjects" method="post" name="v_edit_user">
+            <script type="text/javascript">
+                function randomString() {
+                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                    var string_length = 10;
+                    var randomstring = '';
+                    for (var i=0; i<string_length; i++) {
+                        var rnum = Math.floor(Math.random() * chars.length);
+                        randomstring += chars.substring(rnum,rnum+1);
+                    }
+                    document.v_edit_user.v_password.value = randomstring;
+                }
+            </script>
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr>
+                                <td>
+                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                    <a class="data-date"><?php echo $v_time?></a>
+                                </td>
+                            </tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Username');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_user" <?php if (!empty($v_username)) echo "value=".$v_username;  ?> disabled> <input type="hidden" name="v_username" <?php if (!empty($v_username)) echo "value=".$v_username;  ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_password" <?php if (!empty($v_password)) echo "value=".$v_password;  ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Email');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_email" <?php if (!empty($v_email)) echo "value=".$v_email; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;" >
+                                    <?php print __('Package');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_package">
+                                        <?php
+                                            foreach ($packages as $key => $value) {
+                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
+                                                $skey = "'".$key."'";
+                                                if (( $key == $v_package ) || ( $skey == $v_package)){
+                                                    echo 'selected' ;
+                                                }
+                                                echo ">".$key."</option>\n";
+                                            }
+                                        ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;" >
+                                    <?php print __('Language');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_language">
+                                        <?php
+                                            foreach ($languages as $key => $value) {
+                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$value."\"";
+                                                $svalue = "'".$value."'";
+                                                if (( $value == $v_language ) || ( $svalue == $v_language)){
+                                                    echo 'selected' ;
+                                                }
+                                                if (( $value == 'en' ) && (empty($v_language))){
+                                                    echo 'selected' ;
+                                                }
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('First Name');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_fname" <?php if (!empty($v_fname)) echo "value=".$v_fname; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Last Name');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_lname" <?php if (!empty($v_lname)) echo "value=".$v_lname; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;" >
+                                    <?php print __('SSH Access');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_shell">
+                                        <?php
+                                            foreach ($shells as $key => $value) {
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                $svalue = "'".$value."'";
+                                                if (( $value == $v_shell ) || ($svalue == $v_shell )){
+                                                    echo 'selected' ;
+                                                }
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Default Name Servers');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html
index ed562c88..3941fcbe 100644
--- a/web/templates/admin/edit_web.html
+++ b/web/templates/admin/edit_web.html
@@ -1,140 +1,174 @@
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/web/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
-
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing Domain');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_edit_web" method="post">
-                        <script language="javascript">
-                            function WEBrandom() {
-                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                                var string_length = 10;
-                                var webrandom = '';
-                                for (var i=0; i<string_length; i++) {
-                                    var rnum = Math.floor(Math.random() * chars.length);
-                                    webrandom += chars.substring(rnum,rnum+1);
-                                }
-                                document.v_edit_web.v_stats_password.value = webrandom;
-                            }
-
-                            function FTPrandom() {
-                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                                var string_length = 10;
-                                var ftprandomstring = '';
-                                for (var i=0; i<string_length; i++) {
-                                    var rnum = Math.floor(Math.random() * chars.length);
-                                    ftprandomstring += chars.substring(rnum,rnum+1);
-                                }
-                                document.v_edit_web.v_ftp_password.value = ftprandomstring;
-                            }
-
-                            function elementHideShow(elementToHideOrShow){
-                                var el = document.getElementById(elementToHideOrShow);
-                                if (el.style.display == "block") {
-                                    el.style.display = "none";
-                                } else {
-                                    el.style.display = "block";
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/web/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Editing Domain');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                 }
                             }
-                        </script>
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr>
-                                            <td style="padding: 24px 0 2px 18px;">
-                                                <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                                <a class="data-date"><?php echo $v_time?></a>
-                                            </td>
-                                        </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
-                                    </table>
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
+
+        <form id="vstobjects" name="v_edit_web" method="post">
+            <script language="javascript">
+                function WEBrandom() {
+                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                    var string_length = 10;
+                    var webrandom = '';
+                    for (var i=0; i<string_length; i++) {
+                        var rnum = Math.floor(Math.random() * chars.length);
+                        webrandom += chars.substring(rnum,rnum+1);
+                    }
+                    document.v_edit_web.v_stats_password.value = webrandom;
+                }
+
+                function FTPrandom() {
+                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                    var string_length = 10;
+                    var ftprandomstring = '';
+                    for (var i=0; i<string_length; i++) {
+                        var rnum = Math.floor(Math.random() * chars.length);
+                        ftprandomstring += chars.substring(rnum,rnum+1);
+                    }
+                    document.v_edit_web.v_ftp_password.value = ftprandomstring;
+                }
+
+                function elementHideShow(elementToHideOrShow){
+                    var el = document.getElementById(elementToHideOrShow);
+                    if (el.style.display == "block") {
+                        el.style.display = "none";
+                    } else {
+                        el.style.display = "block";
+                    }
+                }
+            </script>
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr>
+                                <td>
+                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                    <a class="data-date"><?php echo $v_time?></a>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
+                            </tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Domain');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> disabled> <input type="hidden" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('IP Address');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_ip">
+                                        <?php
+                                            foreach ($ips as $key => $value) {
+                                                $display_ip = $key;
+                                                if (!empty($value['NAT'])) $display_ip = $value['NAT'];
+                                                $skey = "'".$display_ip."'";
+                                                echo "\n\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".$display_ip."\"";
+                                                if ((!empty($v_ip)) && ( $display_ip == $v_ip ) || ( $skey == $v_ip )){
+                                                    echo ' selected';
+                                                }
+                                                echo ">".$display_ip."</option>\n";
+                                            }
+                                        ?>
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Aliases');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Web Template');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_template">
+                                        <?php
+                                            foreach ($templates as $key => $value) {
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                $svalue = "'".$value."'";
+                                                if ((!empty($v_template)) && ( $value == $v_template ) || ($svalue == $v_template)){
+                                                    echo ' selected' ;
+                                                }
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Proxy Support');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <table style="display:<?php if (empty($v_proxy)) { echo 'none';} else {echo 'block';}?> ;" id="proxytable">
                                         <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Domain');?>
+                                            <td class="vst-text" style="padding: 9px 0 0 2px;">
+                                                <?php print __('Proxy Template');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> disabled> <input type="hidden" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('IP Address');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_ip">
+                                                <select class="vst-list" name="v_proxy_template">
                                                     <?php
-                                                        foreach ($ips as $key => $value) {
-                                                            $display_ip = $key;
-                                                            if (!empty($value['NAT'])) $display_ip = $value['NAT'];
-                                                            $skey = "'".$display_ip."'";
-                                                            echo "\n\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".$display_ip."\"";
-                                                            if ((!empty($v_ip)) && ( $display_ip == $v_ip ) || ( $skey == $v_ip )){
-                                                                echo ' selected';
-                                                            }
-                                                            echo ">".$display_ip."</option>\n";
-                                                        }
-                                                    ?>
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Aliases');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Web Template');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_template">
-                                                    <?php
-                                                        foreach ($templates as $key => $value) {
+                                                        foreach ($proxy_templates as $key => $value) {
                                                             echo "\t\t\t\t<option value=\"".$value."\"";
                                                             $svalue = "'".$value."'";
-                                                            if ((!empty($v_template)) && ( $value == $v_template ) || ($svalue == $v_template)){
+                                                            if ((!empty($v_proxy_template)) && ( $value == $v_proxy_template ) || ($svalue == $v_proxy_template)){
+                                                                echo ' selected' ;
+                                                            }
+                                                            if ((empty($v_proxy_template)) && ($value == 'default')){
                                                                 echo ' selected' ;
                                                             }
                                                             echo ">".$value."</option>\n";
@@ -144,243 +178,206 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Proxy Support');?>
+                                            <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                <?php print __('Proxy Extensions');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <table style="display:<?php if (empty($v_proxy)) { echo 'none';} else {echo 'block';}?> ;" id="proxytable">
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 9px 0 0 2px;">
-                                                            <?php print __('Proxy Template');?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <select class="vst-list" name="v_proxy_template">
-                                                                <?php
-                                                                    foreach ($proxy_templates as $key => $value) {
-                                                                        echo "\t\t\t\t<option value=\"".$value."\"";
-                                                                        $svalue = "'".$value."'";
-                                                                        if ((!empty($v_proxy_template)) && ( $value == $v_proxy_template ) || ($svalue == $v_proxy_template)){
-                                                                            echo ' selected' ;
-                                                                        }
-                                                                        if ((empty($v_proxy_template)) && ($value == 'default')){
-                                                                            echo ' selected' ;
-                                                                        }
-                                                                        echo ">".$value."</option>\n";
-                                                                    }
-                                                                ?> 
-                                                            </select>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                            <?php print __('Proxy Extensions');?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_ext;} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; }  ?></textarea>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('SSL Support');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                            <?php print __('SSL Home Directory');?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <select class="vst-list" name="v_ssl_home">
-                                                                <option value='same' <?php if ($v_ssl_home == 'same') echo "selected";?>>
-                                                                     public_html
-                                                                </option>
-                                                                <option value='single' <?php if ($v_ssl_home == 'single') echo "selected";?>>
-                                                                    public_shtml
-                                                                </option>
-                                                            </select>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print __('SSL Certificate');?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print __('SSL Key');?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Web Statistics');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_stats">
-                                                    <?php
-                                                        foreach ($stats as $key => $value) {
-                                                            $svalue = "'".$value."'";
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            if (empty($v_stats)) $v_stats = 'none';
-                                                            if (( $value == $v_stats ) || ($svalue == $v_stats )){
-                                                                echo ' selected' ;
-                                                            }
-                                                        echo ">". __($value) ."</option>\n";
-                                                        }
-                                                ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Statistics Authorization');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 9px 0 0 2px;">
-                                                            <?php print __('Username');?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password">
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Additional FTP Account');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
-                                                </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                            <?php print __('Username');?>
-                                                            <?php if (empty($v_ftp_user)) echo '<br><span style="font-size: 10pt; color:#777;">' . __('Prefix will be automaticaly added to username',$user."_") . '</span>' ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user;  ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                            <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text"  class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password;  ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <?php
-                                                        if (empty($v_ftp_user)) {
-                                                            echo '';
-                                                     ?> 
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                            <?php print __('Send FTP credentials to email');?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email;  ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <?php
-                                                        }
-                                                    ?> 
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                                <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_ext;} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; }  ?></textarea>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('SSL Support');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');">
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
+                                        <tr>
+                                            <td class="vst-text" style="padding: 9px 0 0 0;">
+                                                <?php print __('SSL Home Directory');?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <select class="vst-list" name="v_ssl_home">
+                                                    <option value='same' <?php if ($v_ssl_home == 'same') echo "selected";?>>
+                                                         public_html
+                                                    </option>
+                                                    <option value='single' <?php if ($v_ssl_home == 'single') echo "selected";?>>
+                                                        public_shtml
+                                                    </option>
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('SSL Certificate');?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('SSL Key');?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Web Statistics');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_stats">
+                                        <?php
+                                            foreach ($stats as $key => $value) {
+                                                $svalue = "'".$value."'";
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                if (empty($v_stats)) $v_stats = 'none';
+                                                if (( $value == $v_stats ) || ($svalue == $v_stats )){
+                                                    echo ' selected' ;
+                                                }
+                                            echo ">". __($value) ."</option>\n";
+                                            }
+                                    ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Statistics Authorization');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
+                                        <tr>
+                                            <td class="vst-text" style="padding: 9px 0 0 2px;">
+                                                <?php print __('Username');?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password">
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Additional FTP Account');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
+                                    </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                <?php print __('Username');?>
+                                                <?php if (empty($v_ftp_user)) echo '<br><span style="font-size: 10pt; color:#777;">' . __('Prefix will be automaticaly added to username',$user."_") . '</span>' ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user;  ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text"  class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password;  ?>>
+                                            </td>
+                                        </tr>
+                                        <?php
+                                            if (empty($v_ftp_user)) {
+                                                echo '';
+                                         ?> 
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                <?php print __('Send FTP credentials to email');?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email;  ?>>
+                                            </td>
+                                        </tr>
+                                        <?php
+                                            }
+                                        ?> 
+                                    </table>
+                                </td>
+                            </tr>
                         </table>
-                    </form>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </form>
 
diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html
index e5fb6754..5e106e9e 100644
--- a/web/templates/admin/list_backup.html
+++ b/web/templates/admin/list_backup.html
@@ -1,186 +1,184 @@
-                               <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/schedule/backup/'"> <?php print __('Create Backup');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/backup/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="delete"><?php print __('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                            <?php
-                                                if (!empty($_SESSION['backup_msg'])) {
-                                            ?>
-                                            <div>
-                                                <script type="text/javascript">
-                                                    $(function() {
-                                                        $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                                                        $( "#dialog-message" ).dialog({
-                                                            modal: true,
-                                                            buttons: {
-                                                                Ok: function() {
-                                                                    $( this ).dialog( "close" );
-                                                                }
-                                                            }
-                                                        });
-                                                    });
-                                                </script>
-                                                <div id="dialog-message" title="<?php print __('Backup System') ?>">
-                                                    <p><?php echo $_SESSION['backup_msg'] ?></p>
-                                                </div>
-                                            </div>
-                                            <?php
-                                                    unset($_SESSION['backup_msg']);
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <div id="vstobjects">
-                        <table class="data">
-
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    $web = __('no');
-                                    $dns = __('no');
-                                    $mail = __('no');
-                                    $db = __('no');
-                                    $cron = __('no');
-                                    $udir = __('no');
-
-                                    if (!empty($data[$key]['WEB'])) $web = __('yes');
-                                    if (!empty($data[$key]['DNS'])) $dns = __('yes');
-                                    if (!empty($data[$key]['MAIL'])) $mail = __('yes');
-                                    if (!empty($data[$key]['DB'])) $db = __('yes');
-                                    if (!empty($data[$key]['CRON'])) $cron = __('yes');
-                                    if (!empty($data[$key]['UDIR'])) $udir = __('yes');
-
-                            ?> 
-
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="backup[]" value="<?php echo $key ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-active"><b><?php print __('active');?></b></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                        <span class="do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print __('delete');?> 
-                                            <input type="hidden" name="delete_url" value="/delete/backup/?backup=<?php echo "$key" ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __('DELETE_BACKUP_CONFIRMATION',$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a href="/list/backup/?backup=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/more.png" width="8px" height="8px">
-                                            <?php print __('configure restore settings') ?>
-                                        </span>
-                                    </a>
-                                    <a href="/download/backup/?backup=<?php echo $key ?>" target="_blank" class="data-controls">
-                                        <span>
-                                            <img src="/images/download.png" width="8px" height="8px">
-                                            <?php print __('download');?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="chart1" style="padding: 10px 0 0px 2px"><?php print __('Backup Size');?>: <?php echo humanize_usage($data[$key]['SIZE']) ?>
-                                                            <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['SIZE'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="250">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Type');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['TYPE'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Consistent');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <a class="counter-value" title="<?php echo str_replace(',', ', ', $data[$key]['WEB']) ?>">
-                                                                <?php print __($web) ?> 
-                                                            </a>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td rowspan=4 style="vertical-align:top;" width="300">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Run Time');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo humanize_time($data[$key]['RUNTIME']) ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-
-                            <?php
-                                }
-                            ?> 
-
-                        </table>
-                        </form>
-
-                        <table class="data-count">
-                            <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('one archive');
-                                        } else {
-                                            echo __('%s archives',$i);
+           <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/schedule/backup/'"> <?php print __('Create Backup');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/backup/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                        <?php
+                            if (!empty($_SESSION['backup_msg'])) {
+                        ?> 
+                        <div>
+                            <script type="text/javascript">
+                                $(function() {
+                                    $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                                    $( "#dialog-message" ).dialog({
+                                        modal: true,
+                                        buttons: {
+                                            Ok: function() {
+                                                $( this ).dialog( "close" );
+                                            }
                                         }
-                                    ?>
+                                    });
+                                });
+                            </script>
+                            <div id="dialog-message" title="<?php print __('Backup System') ?>">
+                                <p><?php echo $_SESSION['backup_msg'] ?></p>
+                            </div>
+                        </div>
+                        <?php
+                                unset($_SESSION['backup_msg']);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
+
+        <div id="vstobjects">
+            <table class="data">
+
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        $web = __('no');
+                        $dns = __('no');
+                        $mail = __('no');
+                        $db = __('no');
+                        $cron = __('no');
+                        $udir = __('no');
+
+                        if (!empty($data[$key]['WEB'])) $web = __('yes');
+                        if (!empty($data[$key]['DNS'])) $dns = __('yes');
+                        if (!empty($data[$key]['MAIL'])) $mail = __('yes');
+                        if (!empty($data[$key]['DB'])) $db = __('yes');
+                        if (!empty($data[$key]['CRON'])) $cron = __('yes');
+                        if (!empty($data[$key]['UDIR'])) $udir = __('yes');
+
+                ?> 
+
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="backup[]" value="<?php echo $key ?>" ></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
+                            <tr><td class="data-active"><b><?php print __('active');?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                <?php print __('delete');?> 
+                                <input type="hidden" name="delete_url" value="/delete/backup/?backup=<?php echo "$key" ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('DELETE_BACKUP_CONFIRMATION',$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a href="/list/backup/?backup=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/more.png" width="8px" height="8px">
+                                <?php print __('configure restore settings') ?>
+                            </span>
+                        </a>
+                        <a href="/download/backup/?backup=<?php echo $key ?>" target="_blank" class="data-controls">
+                            <span>
+                                <img src="/images/download.png" width="8px" height="8px">
+                                <?php print __('download');?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="chart1" style="padding: 10px 0 0px 2px"><?php print __('Backup Size');?>: <?php echo humanize_usage($data[$key]['SIZE']) ?>
+                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['SIZE'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="250">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Type');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['TYPE'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Consistent');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <a class="counter-value" title="<?php echo str_replace(',', ', ', $data[$key]['WEB']) ?>">
+                                                    <?php print __($web) ?> 
+                                                </a>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Run Time');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo humanize_time($data[$key]['RUNTIME']) ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+
+                <?php
+                    }
+                ?> 
+
+            </table>
+            </form>
+
+            <table class="data-count">
+                <tr>
+                    <td width="168px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('one archive');
+                            } else {
+                                echo __('%s archives',$i);
+                            }
+                        ?>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
diff --git a/web/templates/admin/list_backup_detail.html b/web/templates/admin/list_backup_detail.html
index 7514c17c..9872c39f 100644
--- a/web/templates/admin/list_backup_detail.html
+++ b/web/templates/admin/list_backup_detail.html
@@ -1,296 +1,294 @@
-                               <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/schedule/restore/'"> <?php print __('Restore All');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/restore/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="restore"><?php print __('restore');?></option>
-                                                </select>
-                                                <input type="hidden" name="backup" value="<?php echo $_GET['backup'] ?>">
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                            <?php
-                                                if (!empty($_SESSION['restore_msg'])) {
-                                            ?>
-                                            <div>
-                                                <script type="text/javascript">
-                                                    $(function() {
-                                                        $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                                                        $( "#dialog-message" ).dialog({
-                                                            modal: true,
-                                                            buttons: {
-                                                                Ok: function() {
-                                                                    $( this ).dialog( "close" );
-                                                                }
-                                                            }
-                                                        });
-                                                    });
-                                                </script>
-                                                <div id="dialog-message" title="<?php print __('Backup System') ?>">
-                                                    <p><?php echo $_SESSION['restore_msg'] ?></p>
-                                                </div>
-                                            </div>
-                                            <?php
-                                                    unset($_SESSION['restore_msg']);
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+           <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/schedule/restore/'"> <?php print __('Restore All');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/restore/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="restore"><?php print __('restore');?></option>
+                            </select>
+                            <input type="hidden" name="backup" value="<?php echo $_GET['backup'] ?>">
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                        <?php
+                            if (!empty($_SESSION['restore_msg'])) {
+                        ?> 
+                        <div>
+                            <script type="text/javascript">
+                                $(function() {
+                                    $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                                    $( "#dialog-message" ).dialog({
+                                        modal: true,
+                                        buttons: {
+                                            Ok: function() {
+                                                $( this ).dialog( "close" );
+                                            }
+                                        }
+                                    });
+                                });
+                            </script>
+                            <div id="dialog-message" title="<?php print __('Backup System') ?>">
+                                <p><?php echo $_SESSION['restore_msg'] ?></p>
+                            </div>
+                        </div>
+                        <?php
+                                unset($_SESSION['restore_msg']);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <div style="height:10px; font-size:0;"></div>
-                        <table class="data" style="background: #ebe9dc;">
+        <div id="vstobjects">
+            <div style="height:10px; font-size:0;"></div>
+            <table class="data" style="background: #ebe9dc;">
+                <tr>
+                    <td style="padding: 8px 2px 8px 0;">
+                        <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['backup'] ?> </b></a>
+                    </td>
+                </tr>
+            </table>
+            <div style="height:10px; font-size:0;"></div>
+            <table class="data">
+
+
+                <?php
+                    $backup = $_GET['backup'];
+                    $web = explode(',',$data[$backup]['WEB']);
+                    foreach ($web as $key) {
+                        if (!empty($key)) {
+                ?> 
+
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="web[]" value="<?php echo $key ?>" ></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=web&object=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/restore.png" width="6px" height="8px">
+                                <?php print __('restore');?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
                             <tr>
-                                <td style="padding: 8px 2px 8px 0;">
-                                    <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['backup'] ?> </b></a>
+                                <td class="cron" style="width: 170px; font-size: 14px;">
+                                    <?php echo 'web ' . __('domain') ?> 
+                                </td>
+                                <td class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b>
                                 </td>
                             </tr>
                         </table>
-                        <div style="height:10px; font-size:0;"></div>
-                        <table class="data">
+                    </td>
+                </tr>
 
+                <?php
+                        }
+                    }
+                ?> 
 
-                            <?php
-                                $backup = $_GET['backup'];
-                                $web = explode(',',$data[$backup]['WEB']);
-                                foreach ($web as $key) {
-                                    if (!empty($key)) {
-                            ?> 
-
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="web[]" value="<?php echo $key ?>" ></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=web&object=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/restore.png" width="6px" height="8px">
-                                            <?php print __('restore');?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="cron" style="width: 170px; font-size: 14px;">
-                                                <?php echo 'web ' . __('domain') ?> 
-                                            </td>
-                                            <td class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-
-                            <?php
-                                    }
-                                }
-                            ?> 
-
-                            <?php
-                                $dns = explode(',',$data[$backup]['DNS']);
-                                foreach ($dns as $key) {
-                                    if (!empty($key)) {
-                            ?> 
-
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="dns[]" value="<?php echo $key ?>" ></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=dns&object=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/restore.png" width="6px" height="8px">
-                                            <?php print __('restore');?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="cron" style="width: 170px; font-size: 14px;">
-                                                <?php echo 'dns ' . __('domain') ?>
-                                            </td>
-                                            <td class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-
-                            <?php
-                                    }
-                                }
-                            ?> 
-
-                            <?php
-                                $mail = explode(',',$data[$backup]['MAIL']);
-                                foreach ($mail as $key) {
-                                    if (!empty($key)) {
-                            ?> 
-
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="mail[]" value="<?php echo $key ?>" ></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=mail&object=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/restore.png" width="6px" height="8px">
-                                            <?php print __('restore');?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="cron" style="width: 170px; font-size: 14px;">
-                                                <?php echo 'mail ' . __('domain') ?>
-                                            </td>
-                                            <td class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-
-                            <?php
-                                    }
-                                }
-                            ?> 
-
-                            <?php
-                                $db = explode(',',$data[$backup]['DB']);
-                                foreach ($db as $key) {
-                                    if (!empty($key)) {
-                            ?> 
-
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="db[]" value="<?php echo $key ?>" ></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=db&object=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/restore.png" width="6px" height="8px">
-                                            <?php print __('restore');?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="cron" style="width: 170px; font-size: 14px;">
-                                                <?php echo __('database') ?>
-                                            </td>
-                                            <td class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-
-                            <?php
-                                    }
-                                }
-                            ?> 
-
-                            <?php
-                                $backup = $_GET['backup'];
-                                if (!empty($data[$backup]['CRON'])) {
-                                    if (!empty($key)) {
-                            ?> 
-
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="cron[]" value="<?php echo 'yes' ?>" ></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=cron&object=records" class="data-controls">
-                                        <span>
-                                            <img src="/images/restore.png" width="6px" height="8px">
-                                            <?php print __('restore');?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="cron" style="width: 170px; font-size: 14px;">
-                                                <?php echo __('cron') ?>
-                                            </td>
-                                            <td class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo 'cron ' . __('records') ?></b>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-
-                            <?php
-                                    }
-                                }
-                            ?> 
-
-                            <?php
-                                $udir = explode(',',$data[$backup]['UDIR']);
-                                foreach ($udir as $key) {
-                                    if (!empty($key)) {
-                            ?> 
-
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="udir[]" value="<?php echo $key ?>" ></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=udir&object=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/restore.png" width="6px" height="8px">
-                                            <?php print __('restore');?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="cron" style="width: 170px; font-size: 14px;">
-                                                <?php echo __('user dir') ?>
-                                            </td>
-                                            <td class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-
-                            <?php
-                                    }
-                                }
-                            ?> 
-
+                <?php
+                    $dns = explode(',',$data[$backup]['DNS']);
+                    foreach ($dns as $key) {
+                        if (!empty($key)) {
+                ?> 
 
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="dns[]" value="<?php echo $key ?>" ></td></tr>
                         </table>
-                        </form>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=dns&object=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/restore.png" width="6px" height="8px">
+                                <?php print __('restore');?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td class="cron" style="width: 170px; font-size: 14px;">
+                                    <?php echo 'dns ' . __('domain') ?>
+                                </td>
+                                <td class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
 
-                    </div>
+                <?php
+                        }
+                    }
+                ?> 
+
+                <?php
+                    $mail = explode(',',$data[$backup]['MAIL']);
+                    foreach ($mail as $key) {
+                        if (!empty($key)) {
+                ?> 
+
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="mail[]" value="<?php echo $key ?>" ></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=mail&object=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/restore.png" width="6px" height="8px">
+                                <?php print __('restore');?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td class="cron" style="width: 170px; font-size: 14px;">
+                                    <?php echo 'mail ' . __('domain') ?>
+                                </td>
+                                <td class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+
+                <?php
+                        }
+                    }
+                ?> 
+
+                <?php
+                    $db = explode(',',$data[$backup]['DB']);
+                    foreach ($db as $key) {
+                        if (!empty($key)) {
+                ?> 
+
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="db[]" value="<?php echo $key ?>" ></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=db&object=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/restore.png" width="6px" height="8px">
+                                <?php print __('restore');?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td class="cron" style="width: 170px; font-size: 14px;">
+                                    <?php echo __('database') ?>
+                                </td>
+                                <td class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+
+                <?php
+                        }
+                    }
+                ?> 
+
+                <?php
+                    $backup = $_GET['backup'];
+                    if (!empty($data[$backup]['CRON'])) {
+                        if (!empty($key)) {
+                ?> 
+
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="cron[]" value="<?php echo 'yes' ?>" ></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=cron&object=records" class="data-controls">
+                            <span>
+                                <img src="/images/restore.png" width="6px" height="8px">
+                                <?php print __('restore');?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td class="cron" style="width: 170px; font-size: 14px;">
+                                    <?php echo __('cron') ?>
+                                </td>
+                                <td class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo 'cron ' . __('records') ?></b>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+
+                <?php
+                        }
+                    }
+                ?> 
+
+                <?php
+                    $udir = explode(',',$data[$backup]['UDIR']);
+                    foreach ($udir as $key) {
+                        if (!empty($key)) {
+                ?> 
+
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="udir[]" value="<?php echo $key ?>" ></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=udir&object=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/restore.png" width="6px" height="8px">
+                                <?php print __('restore');?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td class="cron" style="width: 170px; font-size: 14px;">
+                                    <?php echo __('user dir') ?>
+                                </td>
+                                <td class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+
+                <?php
+                        }
+                    }
+                ?> 
+
+
+            </table>
+            </form>
+
+        </div>
 
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html
index 0bc263e3..58643e2d 100644
--- a/web/templates/admin/list_cron.html
+++ b/web/templates/admin/list_cron.html
@@ -1,186 +1,184 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/cron/'"> <?php print __('Add Cron Job');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/cron/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="suspend"><?php print __('suspend');?></option>
-                                                    <option value="unsuspend"><?php print __('unsuspend');?></option>
-                                                    <option value="delete"><?php print __('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/add/cron/'"> <?php print __('Add Cron Job');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/cron/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="suspend"><?php print __('suspend');?></option>
+                                <option value="unsuspend"><?php print __('unsuspend');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <table class='data'>
+        <div id="vstobjects">
+            <table class='data'>
 
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend';
-                                        $spnd_confirmation = 'UNSUSPEND_CRON_CONFIRMATION' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend';
-                                        $spnd_confirmation = 'SUSPEND_CRON_CONFIRMATION' ;
-                                    }
-                            ?> 
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend';
+                            $spnd_confirmation = 'UNSUSPEND_CRON_CONFIRMATION' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend';
+                            $spnd_confirmation = 'SUSPEND_CRON_CONFIRMATION' ;
+                        }
+                ?> 
 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="job[]" value="<?php echo $data[$key]['JOB'] ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                        <span class="do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print __('delete');?> 
-                                            <input type="hidden" name="delete_url" value="/delete/cron/?job=<?php echo $data[$key]['JOB']; ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __('DELETE_CRON_CONFIRMATION');?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
-                                        <span class="do_<?php echo $spnd_action ?>" width="80px">
-                                            <img src="/images/suspend.png" width="7px" height="8px">
-                                            <?php echo __($spnd_action); ?> 
-                                            <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/cron/?job=<?php echo $data[$key]['JOB']; ?>" />
-                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __($spnd_confirmation);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a href="/edit/cron/?job=<?php echo $data[$key]['JOB'] ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit');?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="800px">
-                                        <tr>
-                                            <td colspan=5 class="cron" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $data[$key]['CMD'] ?></b>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;"  width="80px">
-                                                <table>
-                                                    <tr>
-                                                        <td class="cron-counter-name">
-                                                            <?php print __('Min');?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="cron-counter-value">
-                                                            <?php echo $data[$key]['MIN'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;"  width="80px">
-                                                <table>
-                                                    <tr>
-                                                        <td class="cron-counter-name">
-                                                            <?php print __('Hour');?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="cron-counter-value">
-                                                            <?php echo $data[$key]['HOUR'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;"  width="80px">
-                                                <table>
-                                                    <tr>
-                                                        <td class="cron-counter-name">
-                                                            <?php print __('Day');?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="cron-counter-value">
-                                                            <?php echo $data[$key]['DAY'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;"  width="80px">
-                                                <table>
-                                                    <tr>
-                                                        <td class="cron-counter-name">
-                                                            <?php print __('Month');?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="cron-counter-value">
-                                                            <?php echo $data[$key]['MONTH'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;">
-                                                <table>
-                                                    <tr>
-                                                        <td class="cron-counter-name">
-                                                            <?php print __('Day of week');?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="cron-counter-value">
-                                                            <?php echo $data[$key]['WDAY'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-
-                            <?php
-                                }
-                            ?> 
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="job[]" value="<?php echo $data[$key]['JOB'] ?>" ></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                         </table>
-                        </from>
-
-                        <table class="data-count">
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                <?php print __('delete');?> 
+                                <input type="hidden" name="delete_url" value="/delete/cron/?job=<?php echo $data[$key]['JOB']; ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('DELETE_CRON_CONFIRMATION');?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
+                            <span class="do_<?php echo $spnd_action ?>" width="80px">
+                                <img src="/images/suspend.png" width="7px" height="8px">
+                                <?php echo __($spnd_action); ?> 
+                                <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/cron/?job=<?php echo $data[$key]['JOB']; ?>" />
+                                <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __($spnd_confirmation);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a href="/edit/cron/?job=<?php echo $data[$key]['JOB'] ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit');?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="800px">
                             <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 cron job');
-                                        } else {
-                                            echo __('%s cron jobs',$i);
-                                        }
-                                    ?> 
+                                <td colspan=5 class="cron" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $data[$key]['CMD'] ?></b>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;"  width="80px">
+                                    <table>
+                                        <tr>
+                                            <td class="cron-counter-name">
+                                                <?php print __('Min');?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="cron-counter-value">
+                                                <?php echo $data[$key]['MIN'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;"  width="80px">
+                                    <table>
+                                        <tr>
+                                            <td class="cron-counter-name">
+                                                <?php print __('Hour');?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="cron-counter-value">
+                                                <?php echo $data[$key]['HOUR'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;"  width="80px">
+                                    <table>
+                                        <tr>
+                                            <td class="cron-counter-name">
+                                                <?php print __('Day');?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="cron-counter-value">
+                                                <?php echo $data[$key]['DAY'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;"  width="80px">
+                                    <table>
+                                        <tr>
+                                            <td class="cron-counter-name">
+                                                <?php print __('Month');?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="cron-counter-value">
+                                                <?php echo $data[$key]['MONTH'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;">
+                                    <table>
+                                        <tr>
+                                            <td class="cron-counter-name">
+                                                <?php print __('Day of week');?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="cron-counter-value">
+                                                <?php echo $data[$key]['WDAY'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+
+                <?php
+                    }
+                ?> 
+            </table>
+            </from>
+
+            <table class="data-count">
+                <tr>
+                    <td width="168px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 cron job');
+                            } else {
+                                echo __('%s cron jobs',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html
index 3a484248..ee6f77e7 100644
--- a/web/templates/admin/list_db.html
+++ b/web/templates/admin/list_db.html
@@ -1,175 +1,173 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/db/'"> <?php print __('Add Database');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/db/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="suspend"><?php print __('suspend');?></option>
-                                                    <option value="unsuspend"><?php print __('unsuspend');?></option>
-                                                    <option value="delete"><?php print __('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/add/db/'"> <?php print __('Add Database');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/db/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="suspend"><?php print __('suspend');?></option>
+                                <option value="unsuspend"><?php print __('unsuspend');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <table class='data'>
-                            <?php
-                                list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
-                                        $spnd_confirmation = 'UNSUSPEND_DATABASE_CONFIRMATION' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend' ;
-                                        $spnd_confirmation = 'SUSPEND_DATABASE_CONFIRMATION' ;
-                                    }
-                                    if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
-                                    if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
-                                    if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/";
-                                    if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin";
-                                    if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/";
-                            ?> 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="database[]" value="<?php echo $key ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                        <span class="do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php echo __('delete') ?> 
-                                            <input type="hidden" name="delete_url" value="/delete/db/?database=<?php echo "$key" ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __('DELETE_DATABASE_CONFIRMATION',$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
-                                        <span class="do_<?php echo $spnd_action ?>">
-                                            <img src="/images/suspend.png" width="7px" height="8px">
-                                            <?php echo __($spnd_action) ?> 
-                                            <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/db/?database=<?php echo "$key" ?>" />
-                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a href="/edit/db/?database=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit');?> 
-                                        </span>
-                                    </a>
-                                    <a href="<?php echo $db_admin_link; ?>" target="_blank" class="data-controls">
-                                        <span>
-                                            <img src="/images/new_window.png" width="8px" height="8px">
-                                            <?php print __('open %s',$db_admin);?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="chart1" style="padding: 10px 0 0px 2px"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                            <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="260">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('User');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['DBUSER'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Host');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['HOST'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td rowspan=4 style="vertical-align:top;" width="300">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Charset');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['CHARSET'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Type');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['TYPE'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                            <?php
-                                }
-                            ?>
+        <div id="vstobjects">
+            <table class='data'>
+                <?php
+                    list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend' ;
+                            $spnd_confirmation = 'UNSUSPEND_DATABASE_CONFIRMATION' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend' ;
+                            $spnd_confirmation = 'SUSPEND_DATABASE_CONFIRMATION' ;
+                        }
+                        if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
+                        if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
+                        if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/";
+                        if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin";
+                        if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/";
+                ?> 
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="database[]" value="<?php echo $key ?>" ></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                         </table>
-                        </form>
-
-                        <table class="data-count">
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                <?php echo __('delete') ?> 
+                                <input type="hidden" name="delete_url" value="/delete/db/?database=<?php echo "$key" ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('DELETE_DATABASE_CONFIRMATION',$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
+                            <span class="do_<?php echo $spnd_action ?>">
+                                <img src="/images/suspend.png" width="7px" height="8px">
+                                <?php echo __($spnd_action) ?> 
+                                <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/db/?database=<?php echo "$key" ?>" />
+                                <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a href="/edit/db/?database=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit');?> 
+                            </span>
+                        </a>
+                        <a href="<?php echo $db_admin_link; ?>" target="_blank" class="data-controls">
+                            <span>
+                                <img src="/images/new_window.png" width="8px" height="8px">
+                                <?php print __('open %s',$db_admin);?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
                             <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 database');
-                                        } else {
-                                            echo __('%s databases',$i);
-                                        }
-                                    ?>
+                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="chart1" style="padding: 10px 0 0px 2px"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="260">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('User');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['DBUSER'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Host');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['HOST'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Charset');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['CHARSET'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Type');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['TYPE'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+                <?php
+                    }
+                ?>
+            </table>
+            </form>
+
+            <table class="data-count">
+                <tr>
+                    <td width="168px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 database');
+                            } else {
+                                echo __('%s databases',$i);
+                            }
+                        ?>
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html
index 42d49272..956cbdbd 100644
--- a/web/templates/admin/list_dns.html
+++ b/web/templates/admin/list_dns.html
@@ -1,162 +1,160 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/dns/'"> <?php print __('Add DNS Domain');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/dns/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="suspend"><?php print __('suspend');?></option>
-                                                    <option value="unsuspend"><?php print __('unsuspend');?></option>
-                                                    <option value="delete"><?php print __('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/add/dns/'"> <?php print __('Add DNS Domain');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/dns/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="suspend"><?php print __('suspend');?></option>
+                                <option value="unsuspend"><?php print __('unsuspend');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <table class="data">
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
-                                        $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend' ;
-                                        $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
-                                    }
-                            ?> 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo "$key" ?>" > </td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status) ?></b></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                        <span class="do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print __('delete');?> 
-                                            <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
-                                        <span class="do_<?php echo $spnd_action ?>">
-                                            <img src="/images/suspend.png" width="7px" height="8px">
-                                            <?php echo __($spnd_action); ?> 
-                                            <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/dns/?domain=<?php echo $key ?>" />
-                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a href="/edit/dns/?domain=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit');?> 
-                                        </span>
-                                    </a>
-                                    <a href="/add/dns/?domain=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/add.png" width="8px" height="8px">
-                                            <?php print __('add record');?> 
-                                        </span>
-                                    </a>
-                                    <a href="/list/dns/?domain=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/more.png" width="8px" height="8px">
-                                            <?php print __('list records',$data[$key]['RECORDS']); ?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name" style="padding: 0 0 0 2px;">
-                                                            <?php echo $data[$key]['IP'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name" style="padding: 0 0 0 2px;">
-                                                            <?php print $data[$key]['SRC'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="270">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Template') ?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['TPL'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('SOA') ?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td rowspan=4 style="vertical-align:top;" width="300">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('TTL') ?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Expire');?>:</td>
-                                                        <td class="counter-value"><?php echo strftime("%d %b %Y", strtotime($data[$key]['EXP'])) ?></td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                            <?php
-                                }
-                            ?> 
+        <div id="vstobjects">
+            <table class="data">
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend' ;
+                            $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend' ;
+                            $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
+                        }
+                ?> 
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo "$key" ?>" > </td></tr>
+                            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status) ?></b></td></tr>
                         </table>
-                        </form>
-
-                        <table class="data-count">
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                <?php print __('delete');?> 
+                                <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $key ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
+                            <span class="do_<?php echo $spnd_action ?>">
+                                <img src="/images/suspend.png" width="7px" height="8px">
+                                <?php echo __($spnd_action); ?> 
+                                <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/dns/?domain=<?php echo $key ?>" />
+                                <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a href="/edit/dns/?domain=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit');?> 
+                            </span>
+                        </a>
+                        <a href="/add/dns/?domain=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/add.png" width="8px" height="8px">
+                                <?php print __('add record');?> 
+                            </span>
+                        </a>
+                        <a href="/list/dns/?domain=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/more.png" width="8px" height="8px">
+                                <?php print __('list records',$data[$key]['RECORDS']); ?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
                             <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 domain');
-                                        } else {
-                                            echo __('%s domains',$i);
-                                        }
-                                    ?> 
+                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name" style="padding: 0 0 0 2px;">
+                                                <?php echo $data[$key]['IP'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name" style="padding: 0 0 0 2px;">
+                                                <?php print $data[$key]['SRC'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="270">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Template') ?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['TPL'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('SOA') ?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('TTL') ?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Expire');?>:</td>
+                                            <td class="counter-value"><?php echo strftime("%d %b %Y", strtotime($data[$key]['EXP'])) ?></td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+                <?php
+                    }
+                ?> 
+            </table>
+            </form>
+
+            <table class="data-count">
+                <tr>
+                    <td width="168px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 domain');
+                            } else {
+                                echo __('%s domains',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html
index 93c8abc3..23bbc444 100644
--- a/web/templates/admin/list_dns_rec.html
+++ b/web/templates/admin/list_dns_rec.html
@@ -1,108 +1,107 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add DNS Record');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/dns/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="suspend"><?php print __('suspend');?></option>
-                                                    <option value="unsuspend"><?php print __('unsuspend');?></option>
-                                                    <option value="delete"><?php print __('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-                    <div id="vstobjects">
-                        <div style="height:10px; font-size:0;"></div>
-                            <table class="data" style="background: #ebe9dc;">
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add DNS Record');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/dns/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="suspend"><?php print __('suspend');?></option>
+                                <option value="unsuspend"><?php print __('unsuspend');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
+
+        <div id="vstobjects">
+            <div style="height:10px; font-size:0;"></div>
+                <table class="data" style="background: #ebe9dc;">
+                    <tr>
+                        <td style="padding: 8px 2px 8px 0;">
+                            <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
+                        </td>
+                    </tr>
+                </table>
+                <div style="height:10px; font-size:0;"></div>
+                <table class="data">
+                    <?php
+                        foreach ($data as $key => $value) {
+                            ++$i;
+                            if ($data[$key]['SUSPENDED'] == 'yes') {
+                                $status = 'suspended';
+                                $spnd_action = 'unsuspend' ;
+                                $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ;
+                            } else {
+                                $status = 'active';
+                                $spnd_action = 'suspend' ;
+                                $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ;
+                            }
+                    ?> 
+                    <tr class="data-row">
+                        <td class="data-dotted" width="150">
+                            <table class="data-col1">
+                                <tr><td><input type="checkbox" class="ch-toggle" name="record[]" value="<?php echo $data[$key]['ID']?>" > <input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
+                                <tr><td></td></tr>
+                            </table>
+                        </td>
+                        <td class="data-dotted" width="830px">
+                            <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                                <span class="do_delete">
+                                    <img src="/images/delete.png" width="7px" height="7px">
+                                    <?php print __('delete');?>
+                                    <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
+                                    <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                        <p class="counter-value"><?php print __('DELETE_RECORD_CONFIRMATION',$data[$key]['RECORD']);?></p>
+                                    </div>
+                                </span>
+                            </a>
+                            <a href="/edit/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" class="data-controls">
+                                <span>
+                                    <img src="/images/edit.png" width="8px" height="8px">
+                                    <?php print __('edit');?> 
+                                </span>
+                            </a>
+                            <table class="data-col5" width="780px">
                                 <tr>
-                                    <td style="padding: 8px 2px 8px 0;">
-                                        <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
-                                    </td>
+                                    <td class="log" style="padding: 0 0 0 4px;" width="200"><b><?php echo $data[$key]['RECORD'] ?></b></td>
+                                    <td class="log-counter-value" width="80"><?php echo $data[$key]['TYPE'] ?></td>
+                                    <td class="log-counter-value" width="80"><?php echo $data[$key]['PRIORITY'] ?></td>
+                                    <td class="log-counter-value" ><?php echo $data[$key]['VALUE'] ?></td>
                                 </tr>
                             </table>
-                            <div style="height:10px; font-size:0;"></div>
-                            <table class="data">
-                                <?php
-                                    foreach ($data as $key => $value) {
-                                        ++$i;
-                                        if ($data[$key]['SUSPENDED'] == 'yes') {
-                                            $status = 'suspended';
-                                            $spnd_action = 'unsuspend' ;
-                                            $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ;
-                                        } else {
-                                            $status = 'active';
-                                            $spnd_action = 'suspend' ;
-                                            $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ;
-                                        }
-                                ?> 
-                                <tr class="data-row">
-                                    <td class="data-dotted" width="150">
-                                        <table class="data-col1">
-                                            <tr><td><input type="checkbox" class="ch-toggle" name="record[]" value="<?php echo $data[$key]['ID']?>" > <input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
-                                            <tr><td></td></tr>
-                                        </table>
-                                    </td>
-                                    <td class="data-dotted" width="830px">
-                                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                            <span class="do_delete">
-                                                <img src="/images/delete.png" width="7px" height="7px">
-                                                <?php print __('delete');?>
-                                                <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
-                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                    <p class="counter-value"><?php print __('DELETE_RECORD_CONFIRMATION',$data[$key]['RECORD']);?></p>
-                                                </div>
-                                            </span>
-                                        </a>
-                                        <a href="/edit/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" class="data-controls">
-                                            <span>
-                                                <img src="/images/edit.png" width="8px" height="8px">
-                                                <?php print __('edit');?> 
-                                            </span>
-                                        </a>
-                                        <table class="data-col5" width="780px">
-                                            <tr>
-                                                <td class="log" style="padding: 0 0 0 4px;" width="200"><b><?php echo $data[$key]['RECORD'] ?></b></td>
-                                                <td class="log-counter-value" width="80"><?php echo $data[$key]['TYPE'] ?></td>
-                                                <td class="log-counter-value" width="80"><?php echo $data[$key]['PRIORITY'] ?></td>
-                                                <td class="log-counter-value" ><?php echo $data[$key]['VALUE'] ?></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                </tr>
-                                <?php
-                                    }
-                                ?>
-                            </table>
-                        </form>
-                        <table class="data-count">
-                            <tr>
-                                <td width="160px">
-                                </td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 record');
-                                        } else {
-                                            echo __('%s records',$i);
-                                        }
-                                    ?> 
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
+                        </td>
+                    </tr>
+                    <?php
+                        }
+                    ?>
+                </table>
+            </form>
+            <table class="data-count">
+                <tr>
+                    <td width="168px">
+                    </td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 record');
+                            } else {
+                                echo __('%s records',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html
index 46a55d18..3b674e1d 100644
--- a/web/templates/admin/list_ip.html
+++ b/web/templates/admin/list_ip.html
@@ -1,178 +1,176 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/ip/'"> <?php print __('Add IP');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/ip/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="reread IP"><?php print __('reread IP');?></option>
-                                                    <option value="delete"><?php print __('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                            ?> 
-                                            <div>
-                                                <script type="text/javascript">
-                                                    $(function() {
-                                                        $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                                                        $( "#dialog-message" ).dialog({
-                                                            modal: true,
-                                                            buttons: {
-                                                                Ok: function() {
-                                                                    $( this ).dialog( "close" );
-                                                                }
-                                                            }
-                                                        });
-                                                    });
-                                                </script>
-                                                <div id="dialog-message" title="Error">
-                                                    <p><?php echo $_SESSION['error_msg'] ?></p>
-                                                </div>
-                                            </div>
-                                            <?php
-                                                    unset($_SESSION['error_msg']);
-                                                }
-                                            ?> 
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <div id="vstobjects">
-                        <table class='data'>
-
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                            ?> 
-
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="ip[]" value="<?php echo $key ?>"></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
-                                        <tr><td class="data-active"><b><?php print __('active');?></b></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                        <span class="do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print __('delete');?> 
-                                            <input type="hidden" name="delete_url" value="/delete/ip/?ip=<?php echo "$key" ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __('DELETE_IP_CONFIRMATION',$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a href="/edit/ip/?ip=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit');?>
-                                        </span>
-                                    </a>
-
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b>
-                                                <?php if (!empty($data[$key]['NAT'])) echo ' → <b>' . $data[$key]['NAT'] . '</b>'; ?>
-                                                <a class="aliases" style="padding:0 0 0 8px;"><?php echo  $data[$key]['NAME'] ?></a>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php echo $data[$key]['NETMASK'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php echo $data[$key]['INTERFACE'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="250">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Domains');?>:
-                                                        </td>
-                                                        <td>
-                                                            <a class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?></a>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Status');?>:
-                                                        </td>
-                                                        <td>
-                                                            <a class="counter-value"> <?php echo __($data[$key]['STATUS']) ?></a>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td rowspan=4 style="vertical-align:top;" width="300">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Owner');?>:
-                                                        </td>
-                                                        <td>
-                                                            <a class="counter-value"> <?php echo __($data[$key]['OWNER']) ?></a>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Users');?>:
-                                                        </td>
-                                                        <td>
-                                                            <a class="counter-value"> <?php echo str_replace(',', ', ', $data[$key]['U_SYS_USERS']) ?></a>
-                                                        </td>
-
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-
-                            <?php
-                                }
-                            ?> 
-                        </table>
-                        </form>
-
-                        <table class="data-count">
-                            <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 IP address');
-                                        } else {
-                                            echo __('%s IP addresses',$i);
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/add/ip/'"> <?php print __('Add IP');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/ip/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="reread IP"><?php print __('reread IP');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                        ?> 
+                        <div>
+                            <script type="text/javascript">
+                                $(function() {
+                                    $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                                    $( "#dialog-message" ).dialog({
+                                        modal: true,
+                                        buttons: {
+                                            Ok: function() {
+                                                $( this ).dialog( "close" );
+                                            }
                                         }
-                                    ?> 
+                                    });
+                                });
+                            </script>
+                            <div id="dialog-message" title="Error">
+                                <p><?php echo $_SESSION['error_msg'] ?></p>
+                            </div>
+                        </div>
+                        <?php
+                                unset($_SESSION['error_msg']);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
+
+        <div id="vstobjects">
+            <table class='data'>
+
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                ?> 
+
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="ip[]" value="<?php echo $key ?>"></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
+                            <tr><td class="data-active"><b><?php print __('active');?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                <?php print __('delete');?> 
+                                <input type="hidden" name="delete_url" value="/delete/ip/?ip=<?php echo "$key" ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('DELETE_IP_CONFIRMATION',$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a href="/edit/ip/?ip=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit');?>
+                            </span>
+                        </a>
+
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b>
+                                    <?php if (!empty($data[$key]['NAT'])) echo ' → <b>' . $data[$key]['NAT'] . '</b>'; ?>
+                                    <a class="aliases" style="padding:0 0 0 8px;"><?php echo  $data[$key]['NAME'] ?></a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php echo $data[$key]['NETMASK'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php echo $data[$key]['INTERFACE'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="250">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Domains');?>:
+                                            </td>
+                                            <td>
+                                                <a class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?></a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Status');?>:
+                                            </td>
+                                            <td>
+                                                <a class="counter-value"> <?php echo __($data[$key]['STATUS']) ?></a>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Owner');?>:
+                                            </td>
+                                            <td>
+                                                <a class="counter-value"> <?php echo __($data[$key]['OWNER']) ?></a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Users');?>:
+                                            </td>
+                                            <td>
+                                                <a class="counter-value"> <?php echo str_replace(',', ', ', $data[$key]['U_SYS_USERS']) ?></a>
+                                            </td>
+
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+
+                <?php
+                    }
+                ?> 
+            </table>
+            </form>
+
+            <table class="data-count">
+                <tr>
+                    <td width="168px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 IP address');
+                            } else {
+                                echo __('%s IP addresses',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/admin/list_log.html b/web/templates/admin/list_log.html
index 0db33131..38101ecd 100644
--- a/web/templates/admin/list_log.html
+++ b/web/templates/admin/list_log.html
@@ -1,64 +1,62 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <table class='data'>
+        <div id="vstobjects">
+            <table class='data'>
 
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                            ?>
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                ?>
 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150px">
-                                    <table class="data-col1" width="150">
-                                        <tr><td style="padding: 14 0 4 0;"><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo  strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo $data[$key]['TIME']?></a></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <div style="height:20px; width:20px;"></div>
-                                <table class="data-col5" width="720px">
-                                    <tr>
-                                        <td class="username" style="padding: 0 0 20 0" >
-                                            <?php echo $data[$key]['CMD'] ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-
-                        <?php
-                            }
-                        ?> 
-
-                    </table>
-
-                    <table class="data-count">
+                <tr class="data-row">
+                    <td class="data-dotted" width="150px">
+                        <table class="data-col1" width="150">
+                            <tr><td style="padding: 14 0 4 0;"><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo  strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo $data[$key]['TIME']?></a></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <div style="height:20px; width:20px;"></div>
+                    <table class="data-col5" width="720px">
                         <tr>
-                            <td width="160px"></td>
-                            <td>
-                                <?php
-                                    if ( $i == 1) {
-                                        echo __('one log record');
-                                    } else {
-                                        echo __('%s log records',$i);
-                                    }
-                                ?>
+                            <td class="username" style="padding: 0 0 20 0" >
+                                <?php echo $data[$key]['CMD'] ?>
                             </td>
                         </tr>
                     </table>
-                </div>
+                </td>
+            </tr>
+
+            <?php
+                }
+            ?> 
+
+        </table>
+
+        <table class="data-count">
+            <tr>
+                <td width="168px"></td>
+                <td>
+                    <?php
+                        if ( $i == 1) {
+                            echo __('one log record');
+                        } else {
+                            echo __('%s log records',$i);
+                        }
+                    ?>
+                </td>
+            </tr>
+        </table>
+    </div>
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html
index 116d3a4e..3860fb89 100644
--- a/web/templates/admin/list_mail.html
+++ b/web/templates/admin/list_mail.html
@@ -1,184 +1,183 @@
-                               <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/mail/'"> <?php print __('Add Mail Domain');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/mail/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                    <select class="submenu-select-dropdown" name="action">
-                                                        <option value=""><?php print __('apply to selected');?></option>
-                                                        <option value="suspend"><?php print __('suspend');?></option>
-                                                        <option value="unsuspend"><?php print __('unsuspend');?></option>
-                                                        <option value="delete"><?php print __('delete');?></option>
-                                                    </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-                    <div id="vstobjects">
-                        <table class="data">
-                            <?php
-                                list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
-                                        $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend' ;
-                                        $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
-                                    }
-                                    if (empty($data[$key]['CATCHALL'])) {
-                                        $data[$key]['CATCHALL'] = '/dev/null';
-                                    }
-                            ?> 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                        <span class="do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print __('delete');?> 
-                                            <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
-                                        <span class="do_<?php echo $spnd_action ?>">
-                                            <img src="/images/suspend.png" width="7px" height="8px">
-                                            <?php echo __($spnd_action); ?> 
-                                            <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/mail/?domain=<?php echo $key ?>" />
-                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a href="/edit/mail/?domain=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit');?> 
-                                        </span>
-                                    </a>
-                                    <a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank" class="data-controls">
-                                        <span>
-                                            <img src="/images/new_window.png" width="8px" height="8px">
-                                            <?php print __('open webmail');?> 
-                                        </span>
-                                    </a>
-                                    <a href="/add/mail/?domain=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/add.png" width="8px" height="8px">
-                                            <?php print __('add account');?> 
-                                        </span>
-                                    </a>
-                                    <a href="?domain=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/more.png" width="8px" height="8px">
-                                            <?php print __('list accounts',$data[$key]['ACCOUNTS']); ?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="chart1" style="padding: 10px 0 2px 0">
-                                                            <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                            <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="260">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('AntiVirus Support');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo __($data[$key]['ANTIVIRUS']) ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('AntiSpam Support');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo __($data[$key]['ANTISPAM']) ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td rowspan=4 style="vertical-align:top;" width="300">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('DKIM Support');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo __($data[$key]['DKIM']) ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Catchall email');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['CATCHALL'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                            <?php
-                                }
-                            ?> 
+           <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/add/mail/'"> <?php print __('Add Mail Domain');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/mail/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                                <select class="submenu-select-dropdown" name="action">
+                                    <option value=""><?php print __('apply to selected');?></option>
+                                    <option value="suspend"><?php print __('suspend');?></option>
+                                    <option value="unsuspend"><?php print __('unsuspend');?></option>
+                                    <option value="delete"><?php print __('delete');?></option>
+                                </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
+
+        <div id="vstobjects">
+            <table class="data">
+                <?php
+                    list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend' ;
+                            $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend' ;
+                            $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
+                        }
+                        if (empty($data[$key]['CATCHALL'])) {
+                            $data[$key]['CATCHALL'] = '/dev/null';
+                        }
+                ?> 
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                         </table>
-                        </form>
-                        <table class="data-count">
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                <?php print __('delete');?> 
+                                <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $key ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
+                            <span class="do_<?php echo $spnd_action ?>">
+                                <img src="/images/suspend.png" width="7px" height="8px">
+                                <?php echo __($spnd_action); ?> 
+                                <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/mail/?domain=<?php echo $key ?>" />
+                                <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a href="/edit/mail/?domain=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit');?> 
+                            </span>
+                        </a>
+                        <a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank" class="data-controls">
+                            <span>
+                                <img src="/images/new_window.png" width="8px" height="8px">
+                                <?php print __('open webmail');?> 
+                            </span>
+                        </a>
+                        <a href="/add/mail/?domain=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/add.png" width="8px" height="8px">
+                                <?php print __('add account');?> 
+                            </span>
+                        </a>
+                        <a href="?domain=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/more.png" width="8px" height="8px">
+                                <?php print __('list accounts',$data[$key]['ACCOUNTS']); ?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
                             <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 domain');
-                                        } else {
-                                            echo __('%s domains',$i);
-                                        }
-                                    ?> 
+                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="chart1" style="padding: 10px 0 2px 0">
+                                                <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="260">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('AntiVirus Support');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo __($data[$key]['ANTIVIRUS']) ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('AntiSpam Support');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo __($data[$key]['ANTISPAM']) ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('DKIM Support');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo __($data[$key]['DKIM']) ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Catchall email');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['CATCHALL'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+                <?php
+                    }
+                ?> 
+            </table>
+            </form>
+            <table class="data-count">
+                <tr>
+                    <td width="168px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 domain');
+                            } else {
+                                echo __('%s domains',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html
index dcbc622f..0aad5f02 100644
--- a/web/templates/admin/list_mail_acc.html
+++ b/web/templates/admin/list_mail_acc.html
@@ -1,165 +1,163 @@
-                               <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/mail/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add Mail Account');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/mail/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="suspend"><?php print __('suspend');?></option>
-                                                    <option value="unsuspend"><?php print __('unsuspend');?></option>
-                                                    <option value="delete"><?php print __('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+           <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/add/mail/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add Mail Account');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/mail/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="suspend"><?php print __('suspend');?></option>
+                                <option value="unsuspend"><?php print __('unsuspend');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <div style="height:10px; font-size:0;"></div>
-                        <table class="data" style="background: #ebe9dc;">
-                            <tr>
-                                <td style="padding: 8px 2px 8px 0;">
-                                    <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
-                                </td>
-                            </tr>
+        <div id="vstobjects">
+            <div style="height:10px; font-size:0;"></div>
+            <table class="data" style="background: #ebe9dc;">
+                <tr>
+                    <td style="padding: 8px 2px 8px 0;">
+                        <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
+                    </td>
+                </tr>
+            </table>
+            <div style="height:10px; font-size:0;"></div>
+            <table class="data">
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend' ;
+                            $spnd_confirmation = 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend';
+                            $spnd_confirmation = 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' ;
+                        }
+                ?>
+
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="account[]" value="<?php echo $key?>" ><input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                         </table>
-                        <div style="height:10px; font-size:0;"></div>
-                        <table class="data">
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
-                                        $spnd_confirmation = 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend';
-                                        $spnd_confirmation = 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' ;
-                                    }
-                            ?>
-
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="account[]" value="<?php echo $key?>" ><input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                <?php print __('delete');?> 
+                                <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('DELETE_MAIL_ACCOUNT_CONFIRMATION',$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
+                            <span class="do_<?php echo $spnd_action ?>">
+                                <img src="/images/suspend.png" width="7px" height="8px">
+                                <?php echo __($spnd_action); ?> 
+                                <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
+                                <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a href="/edit/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit');?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
+                            <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name" style="padding: 4px 0 0 0;">
+                                            </td>
+                                        <tr>
+                                            <td class="chart1" style="padding: 2px 0 2px 0">
+                                                <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
                                     </table>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                        <span class="do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print __('delete');?> 
-                                            <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __('DELETE_MAIL_ACCOUNT_CONFIRMATION',$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
-                                        <span class="do_<?php echo $spnd_action ?>">
-                                            <img src="/images/suspend.png" width="7px" height="8px">
-                                            <?php echo __($spnd_action); ?> 
-                                            <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
-                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a href="/edit/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit');?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
+                                <td style="vertical-align:top;" width="200">
+                                    <table>
                                         <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name" style="padding: 4px 0 0 0;">
-                                                        </td>
-                                                    <tr>
-                                                        <td class="chart1" style="padding: 2px 0 2px 0">
-                                                            <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                            <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                            <td class="counter-name">
+                                                <?php print __('Quota');?>:
                                             </td>
-                                            <td style="vertical-align:top;" width="200">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Quota');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['QUOTA'] ?> 
-                                                        </td>
-                                                        </tr>
-                                                        <tr>
-                                                            <td class="counter-name">
-                                                                <?php print __('Autoreply');?>:
-                                                            </td>
-                                                            <td class="counter-value">
-                                                                <?php echo __($data[$key]['AUTOREPLY']) ?> 
-                                                            </td>
-                                                        </tr>
-                                                </table>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['QUOTA'] ?> 
                                             </td>
-                                            <td rowspan=4 style="vertical-align:top;" width="350">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Forward to');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo str_replace(',', ', ', $data[$key]['FWD']) ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                            </tr>
+                                            <tr>
+                                                <td class="counter-name">
+                                                    <?php print __('Autoreply');?>:
+                                                </td>
+                                                <td class="counter-value">
+                                                    <?php echo __($data[$key]['AUTOREPLY']) ?> 
+                                                </td>
+                                            </tr>
+                                    </table>
+                                </td>
+                                <td rowspan=4 style="vertical-align:top;" width="350">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Forward to');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo str_replace(',', ', ', $data[$key]['FWD']) ?> 
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
                             </tr>
-                            <?php
-                                }
-                            ?> 
                         </table>
-                        </form>
+                    </td>
+                </tr>
+                <?php
+                    }
+                ?> 
+            </table>
+            </form>
 
-                        <table class="data-count">
-                            <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 mail account');
-                                        } else {
-                                            echo __('%s mail accounts',$i);
-                                        }
-                                    ?> 
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
+            <table class="data-count">
+                <tr>
+                    <td width="168px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 mail account');
+                            } else {
+                                echo __('%s mail accounts',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html
index f3363aeb..ccc062ed 100644
--- a/web/templates/admin/list_packages.html
+++ b/web/templates/admin/list_packages.html
@@ -1,177 +1,175 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/package/'"> <?php print __('Add Package');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/package/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="delete"><?php print __('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/add/package/'"> <?php print __('Add Package');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/package/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <table class='data'>
+        <div id="vstobjects">
+            <table class='data'>
 
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                            ?> 
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                ?> 
 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="package[]" value="<?php echo $key ?>"></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                        <span class="do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px" >
-                                            <?php print __('delete');?> 
-                                            <input type="hidden" name="delete_url" value="/delete/package/?package=<?php echo "$key" ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __('DELETE_PACKAGE_CONFIRMATION',$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-
-                                    <a href="/edit/package/?package=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                        <?php print __('edit');?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td colspan=3 class="username" style="padding: 10px 0 0 4px;">
-                                                <b><?php echo $key?></b>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Web Template');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['WEB_TEMPLATE'] ?> </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Proxy Template');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['PROXY_TEMPLATE'] ?> </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('DNS Template');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['DNS_TEMPLATE'] ?> </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="chart1" colspan=2 style="padding: 8px 0 0 2px;">
-                                                            <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['BANDWIDTH']) ?> 
-                                                            <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:0%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
-                                                            <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['DISK_QUOTA']) ?> 
-                                                            <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:0%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="300">
-                                                <table width="300">
-                                                    <tr>
-                                                        <td class="counter-name" width="37%"><?php print __('Web Domains');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['WEB_DOMAINS'] ?> </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Web Aliases');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> <?php print __('per domain');?> </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('DNS domains');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['DNS_DOMAINS'] ?> </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('DNS records');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> <?php print __('per domain');?> </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Name Servers');?>:</td>
-                                                        <td class="counter-value"><?php echo str_replace(',', ', ',$data[$key]['NS']) ?> </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="280">
-                                                <table class="data-col4" width="280">
-                                                    <tr>
-                                                        <td class="counter-name" width="48%"><?php print __('Mail Domains');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['MAIL_DOMAINS'] ?> </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Mail Accounts');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> <?php print __('per domain');?> </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Databases');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['DATABASES'] ?> </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Cron Jobs');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['CRON_JOBS'] ?> </td>
-                                                    </tr>
-                                                        <td class="counter-name"><?php print __('SSH Access');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['SHELL'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Backups');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['BACKUPS'] ?></td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-
-                            <?php
-                                }
-                            ?> 
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="package[]" value="<?php echo $key ?>"></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
                         </table>
-                        </form>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px" >
+                                <?php print __('delete');?> 
+                                <input type="hidden" name="delete_url" value="/delete/package/?package=<?php echo "$key" ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('DELETE_PACKAGE_CONFIRMATION',$key);?></p>
+                                </div>
+                            </span>
+                        </a>
 
-                        <table class="data-count">
+                        <a href="/edit/package/?package=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                            <?php print __('edit');?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
                             <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 package');
-                                        } else {
-                                            echo __('%s packages',$i);
-                                        }
-                                    ?> 
+                                <td colspan=3 class="username" style="padding: 10px 0 0 4px;">
+                                    <b><?php echo $key?></b>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Web Template');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['WEB_TEMPLATE'] ?> </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Proxy Template');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['PROXY_TEMPLATE'] ?> </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('DNS Template');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['DNS_TEMPLATE'] ?> </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="chart1" colspan=2 style="padding: 8px 0 0 2px;">
+                                                <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['BANDWIDTH']) ?> 
+                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:0%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
+                                                <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['DISK_QUOTA']) ?> 
+                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:0%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="300">
+                                    <table width="300">
+                                        <tr>
+                                            <td class="counter-name" width="37%"><?php print __('Web Domains');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['WEB_DOMAINS'] ?> </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Web Aliases');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> <?php print __('per domain');?> </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('DNS domains');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['DNS_DOMAINS'] ?> </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('DNS records');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> <?php print __('per domain');?> </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Name Servers');?>:</td>
+                                            <td class="counter-value"><?php echo str_replace(',', ', ',$data[$key]['NS']) ?> </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="280">
+                                    <table class="data-col4" width="280">
+                                        <tr>
+                                            <td class="counter-name" width="48%"><?php print __('Mail Domains');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['MAIL_DOMAINS'] ?> </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Mail Accounts');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> <?php print __('per domain');?> </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Databases');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['DATABASES'] ?> </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Cron Jobs');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['CRON_JOBS'] ?> </td>
+                                        </tr>
+                                            <td class="counter-name"><?php print __('SSH Access');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['SHELL'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Backups');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['BACKUPS'] ?></td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+
+                <?php
+                    }
+                ?> 
+            </table>
+            </form>
+
+            <table class="data-count">
+                <tr>
+                    <td width="168px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 package');
+                            } else {
+                                echo __('%s packages',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/admin/list_rrd.html b/web/templates/admin/list_rrd.html
index 71c1296e..3eddb5a1 100644
--- a/web/templates/admin/list_rrd.html
+++ b/web/templates/admin/list_rrd.html
@@ -1,71 +1,69 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div style="submenu-button-block">
-                                                <a class="vst<?php if ((empty($_GET['period'])) || ($_GET['period'] == 'daily')) echo "-selected" ?>" href="?period=daily"><?php print __('Daily');?></a>
-                                                <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'weekly')) echo "-selected" ?>" href="?period=weekly"><?php print __('Weekly');?></a>
-                                                <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'monthly')) echo "-selected" ?>" href="?period=monthly"><?php print __('Monthly');?></a>
-                                                <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'yearly')) echo "-selected" ?>" href="?period=yearly"><?php print __('Yearly');?></a>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div style="submenu-button-block">
+                            <a class="vst<?php if ((empty($_GET['period'])) || ($_GET['period'] == 'daily')) echo "-selected" ?>" href="?period=daily"><?php print __('Daily');?></a>
+                            <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'weekly')) echo "-selected" ?>" href="?period=weekly"><?php print __('Weekly');?></a>
+                            <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'monthly')) echo "-selected" ?>" href="?period=monthly"><?php print __('Monthly');?></a>
+                            <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'yearly')) echo "-selected" ?>" href="?period=yearly"><?php print __('Yearly');?></a>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <table class='data'>
-                            <?php
-                                if (empty($_GET['period'])) {
-                                    $period='daily';
-                                } else {
-                                    $period=$_GET['period'];
-                                }
-                                foreach ($data as $key => $value) {
-                            ?>
+        <div id="vstobjects">
+            <table class='data'>
+                <?php
+                    if (empty($_GET['period'])) {
+                        $period='daily';
+                    } else {
+                        $period=$_GET['period'];
+                    }
+                    foreach ($data as $key => $value) {
+                ?>
 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150px">
-                                    <table class="data-col1" width="150">
-                                        <tr><td style="padding: 24 0 4px 0;"><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo $data[$key]['TIME']?></a></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a href="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>" target="_blank" class="data-controls">
-                                        <span>
-                                            <img src="/images/download.png" width="8px" height="8px">
-                                            <?php print __('download');?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr><td colspan=3 class="domain" style="padding: 0 0 4 4;"><b><?php echo __($data[$key]['TITLE']); ?></b></td></tr>
-                                        <tr>
-                                            <td style="vertical-align:top;" width="630px">
-                                                <table width="630px">
-                                                    </tr>
-                                                        <td style="background: #7a766d;" width="630px" height="250px">
-                                                            <img style="padding: 0 0 0 36px;" src="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>">
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;">
+                <tr class="data-row">
+                    <td class="data-dotted" width="150px">
+                        <table class="data-col1" width="150">
+                            <tr><td style="padding: 24 0 4px 0;"><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo $data[$key]['TIME']?></a></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a href="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>" target="_blank" class="data-controls">
+                            <span>
+                                <img src="/images/download.png" width="8px" height="8px">
+                                <?php print __('download');?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
+                            <tr><td colspan=3 class="domain" style="padding: 0 0 4 4;"><b><?php echo __($data[$key]['TITLE']); ?></b></td></tr>
+                            <tr>
+                                <td style="vertical-align:top;" width="630px">
+                                    <table width="630px">
+                                        </tr>
+                                            <td style="background: #7a766d;" width="630px" height="250px">
+                                                <img style="padding: 0 0 0 36px;" src="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>">
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
+                                <td style="vertical-align:top;">
+                                </td>
                             </tr>
+                        </table>
+                    </td>
+                </tr>
 
-                        <?php
-                            }
-                        ?> 
-                    </table>
-                </div>
\ No newline at end of file
+            <?php
+                }
+            ?> 
+        </table>
+    </div>
\ No newline at end of file
diff --git a/web/templates/admin/list_search.html b/web/templates/admin/list_search.html
index 1dfe625c..12acadc7 100644
--- a/web/templates/admin/list_search.html
+++ b/web/templates/admin/list_search.html
@@ -1,214 +1,212 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div style="submenu-button-block">
-                                                <a style="float:left; font-size: 16pt; color: #555;"><b><?php print __('Search Results');?></b></a>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div style="submenu-button-block">
+                            <a style="float:left; font-size: 16pt; color: #555;"><b><?php print __('Search Results');?></b></a>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <table class="data">
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend';
-                                    }
-                                    if ($data[$key]['TYPE'] == 'db') {
-                                        $object = 'database';
-                                    } else {
-                                        $object = strtolower($data[$key]['TYPE']." ".$data[$key]['KEY']);
-                                    }
-                            ?>
+        <div id="vstobjects">
+            <table class="data">
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend';
+                        }
+                        if ($data[$key]['TYPE'] == 'db') {
+                            $object = 'database';
+                        } else {
+                            $object = strtolower($data[$key]['TYPE']." ".$data[$key]['KEY']);
+                        }
+                ?>
 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150px">
-                                    <table class="data-col1" width="150">
-                                        <tr><td style="padding: 24 0 4 0;"><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
+                <tr class="data-row">
+                    <td class="data-dotted" width="150px">
+                        <table class="data-col1" width="150">
+                            <tr><td style="padding: 24 0 4 0;"><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <?php
+                            if ($data[$key]['KEY'] == 'RECORD') {
+                                $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'RECORD_ACTION_CONFIRMATION';
+                            }
+                            if ($data[$key]['KEY'] == 'ACCOUNT') {
+                                $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'USER_ACTION_CONFIRMATION';
+                            }
+                            if ($data[$key]['KEY'] == 'JOB') {
+                                $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'CRON_ACTION_CONFIRMATION';
+                            }
+                            if ($data[$key]['KEY'] == 'DATABASE') {
+                                $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'DATABASE_ACTION_CONFIRMATION';
+                            }
+                            if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
+                                $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'DOMAIN_ACTION_CONFIRMATION';
+                            }
+                        ?> 
+                        <a id="delete_link_<?php echo $i ?>" class="do_delete">
+                            <span class="data-controls do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                <?php print __('delete');?> 
+                                <input type="hidden" name="delete_url" value="<?php echo $delete_lnk; ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
+                                    <p class="counter-value"><?php print __($cnfrm,__('delete'),$data[$key]['RESULT']);?></p>
+                                </div>
+                            </span>
+                        </a>
+
+                        <?php
+
+                            if ($data[$key]['KEY'] == 'RECORD') {
+                                $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'RECORD_ACTION_CONFIRMATION';
+                            }
+                            if ($data[$key]['KEY'] == 'ACCOUNT') {
+                                $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'USER_ACTION_CONFIRMATION';
+                            }
+                            if ($data[$key]['KEY'] == 'JOB') {
+                                $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'CRON_ACTION_CONFIRMATION';
+                            }
+                            if ($data[$key]['KEY'] == 'DATABASE') {
+                                $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'DATABASE_ACTION_CONFIRMATION';
+                            }
+                            if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
+                                $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'DOMAIN_ACTION_CONFIRMATION';
+                            }
+                        ?> 
+                        <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>">
+                            <span class="data-controls do_<?php echo $spnd_action ?>">
+                                <img src="/images/suspend.png" width="7px" height="8px">
+                                <?php echo __($spnd_action); ?> 
+                                <input type="hidden" name="<?php echo $spnd_action ?>_url" value="<?php echo $spnd_lnk ?>" />
+                                <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __($cnfrm,__($spnd_action),$data[$key]['RESULT']);?></p>
+                                </div>
+                            </span>
+                        </a>
+
+                        <?php
+                            if ($data[$key]['KEY'] == 'RECORD') {
+                                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                            }
+                            if ($data[$key]['KEY'] == 'ACCOUNT') {
+                                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                            }
+                            if ($data[$key]['KEY'] == 'JOB') {
+                                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                            }
+                            if ($data[$key]['KEY'] == 'DATABASE') {
+                                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                            }
+                            if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
+                                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                            }
+                        ?> 
+                        <a href="<?php echo $edit_lnk; ?>">
+                            <span class="data-controls">
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit'); ?> 
+                            </span>
+                        </a>
+
+                        <?php
+                            if ($data[$key]['USER'] != $user) {
+                        ?> 
+                        <a href="/login/?loginas=<?php echo $data[$key]['USER'] ?>">
+                            <span class="data-controls">
+                                <img src="/images/login-as.png" width="8px" height="8px">
+                                <?php print __('login as'). ' ' . $data[$key]['USER'];?> 
+                            </span>
+                        </a>
+                        <?php
+                            }
+                        ?> 
+
+                        <table class="data-col2" width="830px">
+                            <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $data[$key]['RESULT'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Object');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $object ?> 
+                                            </td>
+                                        </tr>
                                     </table>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <?php
-                                        if ($data[$key]['KEY'] == 'RECORD') {
-                                            $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'RECORD_ACTION_CONFIRMATION';
-                                        }
-                                        if ($data[$key]['KEY'] == 'ACCOUNT') {
-                                            $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'USER_ACTION_CONFIRMATION';
-                                        }
-                                        if ($data[$key]['KEY'] == 'JOB') {
-                                            $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'CRON_ACTION_CONFIRMATION';
-                                        }
-                                        if ($data[$key]['KEY'] == 'DATABASE') {
-                                            $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'DATABASE_ACTION_CONFIRMATION';
-                                        }
-                                        if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
-                                            $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'DOMAIN_ACTION_CONFIRMATION';
-                                        }
-                                    ?> 
-                                    <a id="delete_link_<?php echo $i ?>" class="do_delete">
-                                        <span class="data-controls do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print __('delete');?> 
-                                            <input type="hidden" name="delete_url" value="<?php echo $delete_lnk; ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
-                                                <p class="counter-value"><?php print __($cnfrm,__('delete'),$data[$key]['RESULT']);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-
-                                    <?php
-
-                                        if ($data[$key]['KEY'] == 'RECORD') {
-                                            $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'RECORD_ACTION_CONFIRMATION';
-                                        }
-                                        if ($data[$key]['KEY'] == 'ACCOUNT') {
-                                            $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'USER_ACTION_CONFIRMATION';
-                                        }
-                                        if ($data[$key]['KEY'] == 'JOB') {
-                                            $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'CRON_ACTION_CONFIRMATION';
-                                        }
-                                        if ($data[$key]['KEY'] == 'DATABASE') {
-                                            $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'DATABASE_ACTION_CONFIRMATION';
-                                        }
-                                        if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
-                                            $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'DOMAIN_ACTION_CONFIRMATION';
-                                        }
-                                    ?> 
-                                    <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>">
-                                        <span class="data-controls do_<?php echo $spnd_action ?>">
-                                            <img src="/images/suspend.png" width="7px" height="8px">
-                                            <?php echo __($spnd_action); ?> 
-                                            <input type="hidden" name="<?php echo $spnd_action ?>_url" value="<?php echo $spnd_lnk ?>" />
-                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __($cnfrm,__($spnd_action),$data[$key]['RESULT']);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-
-                                    <?php
-                                        if ($data[$key]['KEY'] == 'RECORD') {
-                                            $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                        }
-                                        if ($data[$key]['KEY'] == 'ACCOUNT') {
-                                            $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                        }
-                                        if ($data[$key]['KEY'] == 'JOB') {
-                                            $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                        }
-                                        if ($data[$key]['KEY'] == 'DATABASE') {
-                                            $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
-                                        }
-                                        if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
-                                            $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
-                                        }
-                                    ?> 
-                                    <a href="<?php echo $edit_lnk; ?>">
-                                        <span class="data-controls">
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit'); ?> 
-                                        </span>
-                                    </a>
-
-                                    <?php
-                                        if ($data[$key]['USER'] != $user) {
-                                    ?> 
-                                    <a href="/login/?loginas=<?php echo $data[$key]['USER'] ?>">
-                                        <span class="data-controls">
-                                            <img src="/images/login-as.png" width="8px" height="8px">
-                                            <?php print __('login as'). ' ' . $data[$key]['USER'];?> 
-                                        </span>
-                                    </a>
-                                    <?php
-                                        }
-                                    ?> 
-
-                                    <table class="data-col2" width="830px">
-                                        <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $data[$key]['RESULT'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
+                                <td style="vertical-align:top;" width="200">
+                                    <table>
                                         <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Object');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $object ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                            <td class="counter-name">
+                                                <?php print __('Owner');?>:
                                             </td>
-                                            <td style="vertical-align:top;" width="200">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Owner');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['USER'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['USER'] ?> 
                                             </td>
-                                            <td style="vertical-align:top;" width="350">
-                                                <table >
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Status');?>:
-                                                        </td>
-                                                        <td class="counter-value" style="padding: 0 0 0 8px;">
-                                                            <?php echo __($status); ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="350">
+                                    <table >
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Status');?>:
+                                            </td>
+                                            <td class="counter-value" style="padding: 0 0 0 8px;">
+                                                <?php echo __($status); ?> 
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
                             </tr>
-                            <?php
-                                }
-                            ?> 
                         </table>
-                        </form>
+                    </td>
+                </tr>
+                <?php
+                    }
+                ?> 
+            </table>
+            </form>
 
-                        <table class="data-count">
-                            <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1){
-                                            echo __('1 object');
-                                        } else {
-                                            echo __('%s objects',$i);
-                                        }
-                                    ?> 
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
+            <table class="data-count">
+                <tr>
+                    <td width="168px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1){
+                                echo __('1 object');
+                            } else {
+                                echo __('%s objects',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html
index 94f582d0..d0f710f8 100644
--- a/web/templates/admin/list_services.html
+++ b/web/templates/admin/list_services.html
@@ -1,156 +1,154 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-button-block">
-                                                <form action="/bulk/service/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="stop"><?php print __('stop');?></option>
-                                                    <option value="start"><?php print __('start');?></option>
-                                                    <option value="restart"><?php print __('restart');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                            <?php
-                                                if (!empty($_SESSION['error_srv'])) {
-                                            ?>
-                                            <div>
-                                                <script type="text/javascript">
-                                                    $(function() {
-                                                        $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                                                        $( "#dialog-message" ).dialog({
-                                                            modal: true,
-                                                            buttons: {
-                                                                Ok: function() {
-                                                                    $( this ).dialog( "close" );
-                                                                }
-                                                            }
-                                                        });
-                                                    });
-                                                </script>
-                                                <div id="dialog-message" title="Error">
-                                                    <p><?php echo $_SESSION['error_srv'] ?></p>
-                                                </div>
-                                            </div>
-                                            <?php
-                                                    unset($_SESSION['error_srv']);
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-button-block">
+                            <form action="/bulk/service/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="stop"><?php print __('stop');?></option>
+                                <option value="start"><?php print __('start');?></option>
+                                <option value="restart"><?php print __('restart');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                        <?php
+                            if (!empty($_SESSION['error_srv'])) {
+                        ?> 
+                        <div>
+                            <script type="text/javascript">
+                                $(function() {
+                                    $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                                    $( "#dialog-message" ).dialog({
+                                        modal: true,
+                                        buttons: {
+                                            Ok: function() {
+                                                $( this ).dialog( "close" );
+                                            }
+                                        }
+                                    });
+                                });
+                            </script>
+                            <div id="dialog-message" title="Error">
+                                <p><?php echo $_SESSION['error_srv'] ?></p>
+                            </div>
+                        </div>
+                        <?php
+                                unset($_SESSION['error_srv']);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <table class='data'>
+        <div id="vstobjects">
+            <table class='data'>
 
-                           <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['STATE'] == 'running') {
-                                        $status = 'active';
-                                        $action = 'stop';
-                                    } else {
-                                        $status = 'suspended';
-                                        $action = 'start';
-                                    }
+               <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['STATE'] == 'running') {
+                            $status = 'active';
+                            $action = 'stop';
+                        } else {
+                            $status = 'suspended';
+                            $action = 'start';
+                        }
 
-                                    $cpu = $data[$key]['CPU'] / 10;
-                                    $cpu = number_format($cpu, 1);
-                                    if ($cpu == '0.0')  $cpu = 0;
-                                ?>
+                        $cpu = $data[$key]['CPU'] / 10;
+                        $cpu = number_format($cpu, 1);
+                        if ($cpu == '0.0')  $cpu = 0;
+                    ?>
 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="service[]" value="<?php echo $key ?>" ></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($data[$key]['STATE']); ?></b></td></tr>
-                                    </table>
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="service[]" value="<?php echo $key ?>" ></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($data[$key]['STATE']); ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a href="/restart/service/?srv=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/reload.png" width="6px" height="7px">
+                                <?php print __('restart'); ?> 
+                            </span>
+                        </a>
+                        <a href="/<?php echo $action ?>/service/?srv=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/<?php echo $action ?>.png" width="7px" height="7px">
+                                <?php print __($action); ?> 
+                            </span>
+                        </a>
+
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td colspan=4 class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <a href="/restart/service/?srv=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/reload.png" width="6px" height="7px">
-                                            <?php print __('restart'); ?> 
-                                        </span>
-                                    </a>
-                                    <a href="/<?php echo $action ?>/service/?srv=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/<?php echo $action ?>.png" width="7px" height="7px">
-                                            <?php print __($action); ?> 
-                                        </span>
-                                    </a>
-
-                                    <table class="data-col2" width="830px">
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;" width="200px">
+                                    <table>
                                         <tr>
-                                            <td colspan=4 class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b>
+                                            <td class="counter-name" style="padding: 2px 0 0 0">
+                                                <?php echo __($data[$key]['SYSTEM']) ?> 
                                             </td>
                                         </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="150px">
+                                    <table>
                                         <tr>
-                                            <td style="vertical-align:top;" width="200px">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name" style="padding: 2px 0 0 0">
-                                                            <?php echo __($data[$key]['SYSTEM']) ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                            <td class="counter-name">
+                                                <?php print __('CPU');?>:
                                             </td>
-                                            <td style="vertical-align:top;" width="150px">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('CPU');?>:
-                                                        </td>
-                                                        <td>
-                                                            <a class="counter-value"> <?php echo $cpu ?>%</a>
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                            <td>
+                                                <a class="counter-value"> <?php echo $cpu ?>%</a>
                                             </td>
-                                            <td style="vertical-align:top;" width="180px">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Memory');?>:
-                                                        </td>
-                                                        <td>
-                                                            <a class="counter-value"><?php echo $data[$key]['MEM'] ?> <?php print __('mb');?></a>
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="180px">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Memory');?>:
                                             </td>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Uptime');?>:
-                                                        </td>
-                                                        <td>
-                                                            <a class="counter-value"><?php echo humanize_time($data[$key]['RTIME']) ?> </a>
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                            <td>
+                                                <a class="counter-value"><?php echo $data[$key]['MEM'] ?> <?php print __('mb');?></a>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Uptime');?>:
+                                            </td>
+                                            <td>
+                                                <a class="counter-value"><?php echo humanize_time($data[$key]['RTIME']) ?> </a>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
                             </tr>
-
-                            <?php
-                                }
-                            ?> 
                         </table>
-                        </form>
+                    </td>
+                </tr>
 
-                    </div>
+                <?php
+                    }
+                ?> 
+            </table>
+            </form>
+
+        </div>
diff --git a/web/templates/admin/list_stats.html b/web/templates/admin/list_stats.html
index 07834a87..0dd6661b 100644
--- a/web/templates/admin/list_stats.html
+++ b/web/templates/admin/list_stats.html
@@ -1,214 +1,211 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block" style="padding-left:8px;">
-                                                <form action="/list/stats/" method="get" id="objects">
-                                                <a class="vst<?php if (empty($_GET['user'])) echo "-selected"; ?>" style="padding: 0 12px 0 0;" href='/list/stats/'><?php print __('Overall Statistics');?></a> 
-                                                <select class="submenu-select-dropdown" name="user">
-                                                    <option value=""><?php print __('show per user');?></option>
-                                                <?php
-                                                    foreach ($users as $key => $value) {
-                                                        echo "\t\t\t\t<option value=\"".$value."\"";
-                                                        if ((!empty($v_user)) && ( $value == $_GET['user'])){
-                                                            echo ' selected';
-                                                        }
-                                                        echo ">".$value."</option>\n";
-                                                    }
-                                                ?> 
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <div id="vstobjects">
-                        <table class='data'>
-
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                            ?>
-
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150px">
-                                    <table class="data-col1" width="150">
-                                        <tr><td style="padding: 24 0 4 0;"><a class="data-date" ><?php echo strftime("%d %b %Y", strtotime($key))?></a></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <div style="height:20px; width:20px;"></div>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td colspan=3 class="username" style="padding: 10 0 0 4px;">
-                                                <b><?php echo strftime("%b %Y", strtotime($key))?></b>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="chart1" colspan=2 style="padding: 4px 0 0 2px;">
-                                                            <?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
-                                                            <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
-                                                            <?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
-                                                            <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan=2>
-                                                            <table class="chart2">
-                                                                <tr>
-                                                                    <td>
-                                                                        <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?>
-                                                                    </td>
-                                                                    <td style="padding: 0px 0px 0px 4px">
-                                                                        <?php print __('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?>
-                                                                    </td>
-                                                                </tr>
-                                                                <tr>
-                                                                    <td>
-                                                                        <?php print __('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?>
-                                                                    </td>
-                                                                    <td style="padding: 0px 0px 0px 4px">
-                                                                        <?php print __('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?>
-                                                                    </td>
-                                                                </tr>
-                                                            </table>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="280">
-                                                <table width="280">
-                                                    <tr>
-                                                        <td class="counter-name" width="37%">
-                                                            <?php print __('Web Domains');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_WEB_DOMAINS'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('SSL Domains');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_WEB_SSL'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Web Aliases');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_WEB_ALIASES'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('DNS domains');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_DNS_DOMAINS'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('DNS records');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_DNS_RECORDS'] ?>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="250">
-                                                <table class="data-col4" width="250">
-                                                    <tr>
-                                                        <td class="counter-name" width="50%">
-                                                            <?php print __('Mail Domains');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_MAIL_DOMAINS'] ?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Mail Accounts');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_MAIL_ACCOUNTS'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Databases');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_DATABASES'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Cron Jobs');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_CRON_JOBS'] ?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('IP Addresses');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['IP_OWNED'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block" style="padding-left:8px;">
+                            <form action="/list/stats/" method="get" id="objects">
+                            <a class="vst<?php if (empty($_GET['user'])) echo "-selected"; ?>" style="padding: 0 12px 0 0;" href='/list/stats/'><?php print __('Overall Statistics');?></a> 
+                            <select class="submenu-select-dropdown" name="user">
+                                <option value=""><?php print __('show per user');?></option>
                             <?php
+                                foreach ($users as $key => $value) {
+                                    echo "\t\t\t\t<option value=\"".$value."\"";
+                                    if ((!empty($v_user)) && ( $value == $_GET['user'])){
+                                        echo ' selected';
+                                    }
+                                    echo ">".$value."</option>\n";
                                 }
                             ?> 
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
+        <div id="vstobjects">
+            <table class='data'>
+
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                ?>
+
+                <tr class="data-row">
+                    <td class="data-dotted" width="150px">
+                        <table class="data-col1" width="150">
+                            <tr><td style="padding: 24 0 4 0;"><a class="data-date" ><?php echo strftime("%d %b %Y", strtotime($key))?></a></td></tr>
                         </table>
-
-                        <table class="data-count">
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <div style="height:20px; width:20px;"></div>
+                        <table class="data-col2" width="830px">
                             <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 month');
-                                        } else {
-                                            echo __('%s months',$i);
-                                        }
-                                    ?>
+                                <td colspan=3 class="username" style="padding: 10 0 0 4px;">
+                                    <b><?php echo strftime("%b %Y", strtotime($key))?></b>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="chart1" colspan=2 style="padding: 4px 0 0 2px;">
+                                                <?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
+                                                <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
+                                                <?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
+                                                <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan=2>
+                                                <table class="chart2">
+                                                    <tr>
+                                                        <td>
+                                                            <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?>
+                                                        </td>
+                                                        <td style="padding: 0px 0px 0px 4px">
+                                                            <?php print __('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <?php print __('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?>
+                                                        </td>
+                                                        <td style="padding: 0px 0px 0px 4px">
+                                                            <?php print __('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="280">
+                                    <table width="280">
+                                        <tr>
+                                            <td class="counter-name" width="37%">
+                                                <?php print __('Web Domains');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_WEB_DOMAINS'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('SSL Domains');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_WEB_SSL'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Web Aliases');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_WEB_ALIASES'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('DNS domains');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_DNS_DOMAINS'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('DNS records');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_DNS_RECORDS'] ?>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="250">
+                                    <table class="data-col4" width="250">
+                                        <tr>
+                                            <td class="counter-name" width="50%">
+                                                <?php print __('Mail Domains');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_MAIL_DOMAINS'] ?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Mail Accounts');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_MAIL_ACCOUNTS'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Databases');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_DATABASES'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Cron Jobs');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_CRON_JOBS'] ?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('IP Addresses');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['IP_OWNED'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+
+                <?php
+                    }
+                ?> 
+
+            </table>
+
+            <table class="data-count">
+                <tr>
+                    <td width="168px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 month');
+                            } else {
+                                echo __('%s months',$i);
+                            }
+                        ?>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
diff --git a/web/templates/admin/list_updates.html b/web/templates/admin/list_updates.html
index a39356dc..d4ff8864 100644
--- a/web/templates/admin/list_updates.html
+++ b/web/templates/admin/list_updates.html
@@ -1,150 +1,148 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-button-block">
-                                                <form action="/bulk/vesta/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected') ?></option>
-                                                    <option value="update"><?php print __('update') ?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                            <?php
-                                                if (!empty($_SESSION['error_upd'])) {
-                                            ?>
-                                            <div>
-                                                <script type="text/javascript">
-                                                    $(function() {
-                                                        $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                                                        $( "#dialog-message" ).dialog({
-                                                            modal: true,
-                                                            buttons: {
-                                                                Ok: function() {
-                                                                    $( this ).dialog( "close" );
-                                                                }
-                                                            }
-                                                        });
-                                                    });
-                                                </script>
-                                                <div id="dialog-message" title="Error">
-                                                    <p><?php echo $_SESSION['error_upd'] ?></p>
-                                                </div>
-                                            </div>
-                                            <?php
-                                                    unset($_SESSION['error_upd']);
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <div id="vstobjects">
-                        <table class='data'>
-
-                           <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['UPDATED'] == 'yes') {
-                                        $status = 'active';
-                                        $upd_status = __('updated');
-                                    } else {
-                                        $status = 'suspended';
-                                        $upd_status = __('outdated');
-                                    }
-                                ?>
-
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td style="padding: 18 0 6 18;"><input type="checkbox" class="ch-toggle" name="pkg[]" value="<?php echo $key ?>" ></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo $upd_status ?></b></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <?php
-                                        if ($data[$key]['UPDATED'] == 'no') {
-                                    ?>
-                                    <a href="/update/vesta/?pkg=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/update.png" width="6px" height="7px">
-                                            <?php print __('update') ?>
-                                        </span>
-                                    </a>
-                                    <?php
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-button-block">
+                            <form action="/bulk/vesta/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected') ?></option>
+                                <option value="update"><?php print __('update') ?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                        <?php
+                            if (!empty($_SESSION['error_upd'])) {
+                        ?> 
+                        <div>
+                            <script type="text/javascript">
+                                $(function() {
+                                    $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                                    $( "#dialog-message" ).dialog({
+                                        modal: true,
+                                        buttons: {
+                                            Ok: function() {
+                                                $( this ).dialog( "close" );
+                                            }
                                         }
-                                    ?>
-                                    <div style="height:20px; width:20px; float:right;"></div>
+                                    });
+                                });
+                            </script>
+                            <div id="dialog-message" title="Error">
+                                <p><?php echo $_SESSION['error_upd'] ?></p>
+                            </div>
+                        </div>
+                        <?php
+                                unset($_SESSION['error_upd']);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                                    <table class="data-col2" width="830px">
+        <div id="vstobjects">
+            <table class='data'>
+
+               <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['UPDATED'] == 'yes') {
+                            $status = 'active';
+                            $upd_status = __('updated');
+                        } else {
+                            $status = 'suspended';
+                            $upd_status = __('outdated');
+                        }
+                    ?>
+
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td style="padding: 18 0 6 18;"><input type="checkbox" class="ch-toggle" name="pkg[]" value="<?php echo $key ?>" ></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo $upd_status ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <?php
+                            if ($data[$key]['UPDATED'] == 'no') {
+                        ?>
+                        <a href="/update/vesta/?pkg=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/update.png" width="6px" height="7px">
+                                <?php print __('update') ?>
+                            </span>
+                        </a>
+                        <?php
+                            }
+                        ?>
+                        <div style="height:20px; width:20px; float:right;"></div>
+
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td colspan=4 class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;" width="200px">
+                                    <table>
                                         <tr>
-                                            <td colspan=4 class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b>
+                                            <td class="counter-name" style="padding: 2px 0 0 0">
+                                                <?php echo __($data[$key]['DESCR']) ?> 
                                             </td>
                                         </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="180px">
+                                    <table>
                                         <tr>
-                                            <td style="vertical-align:top;" width="200px">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name" style="padding: 2px 0 0 0">
-                                                            <?php echo __($data[$key]['DESCR']) ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                            <td class="counter-name">
+                                                <?php print __('Version') ?>:
                                             </td>
-                                            <td style="vertical-align:top;" width="180px">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Version') ?>:
-                                                        </td>
-                                                        <td>
-                                                            <a class="counter-value"> <?php echo $data[$key]['VERSION'] ?></a>
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                            <td>
+                                                <a class="counter-value"> <?php echo $data[$key]['VERSION'] ?></a>
                                             </td>
-                                            <td style="vertical-align:top;" width="170px">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Release') ?>:
-                                                        </td>
-                                                        <td>
-                                                            <a class="counter-value"><?php echo $data[$key]['RELEASE'] ?></a>
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="170px">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Release') ?>:
                                             </td>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Architecture') ?>:
-                                                        </td>
-                                                        <td>
-                                                            <a class="counter-value"><?php echo $data[$key]['ARCH'] ?> </a>
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                            <td>
+                                                <a class="counter-value"><?php echo $data[$key]['RELEASE'] ?></a>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Architecture') ?>:
+                                            </td>
+                                            <td>
+                                                <a class="counter-value"><?php echo $data[$key]['ARCH'] ?> </a>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
                             </tr>
-
-                            <?php
-                                }
-                            ?> 
                         </table>
-                        </form>
-                    </div>
+                    </td>
+                </tr>
+
+                <?php
+                    }
+                ?> 
+            </table>
+            </form>
+        </div>
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index 89748d3b..f190bd94 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -1,268 +1,265 @@
-
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <?php
-                                                    if ($user == 'admin') {
-                                                        echo "<button class=\"submenu-button\" onclick=\"location.href='/add/user/'\">" . __('Add User') . "</button>";
-                                                    } else {
-                                                        echo "<button class=\"submenu-button\" onclick=\"location.href='/add/web/'\">" . __('Add Web Domain') . "</button>";
-                                                    }
-                                                ?> 
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/user/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="rebuild"><?php print __('rebuild');?></option>
-                                                    <option value="rebuild web"><?php print __('rebuild web');?></option>
-                                                    <option value="rebuild dns"><?php print __('rebuild dns');?></option>
-                                                    <option value="rebuild mail"><?php print __('rebuild mail');?></option>
-                                                    <option value="rebuild db"><?php print __('rebuild db');?></option>
-                                                    <option value="rebuild cron"><?php print __('rebuild cron');?></option>
-                                                    <option value="update counters"><?php print __('update counters');?></option>
-                                                    <option value="suspend"><?php print __('suspend');?></option>
-                                                    <option value="unsuspend"><?php print __('unsuspend');?></option>
-                                                    <option value="delete"><?php print __('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <div id="vstobjects">
-                        <table class="data">
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
-                                        $spnd_confirmation = 'UNSUSPEND_USER_CONFIRMATION' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend' ;
-                                        $spnd_confirmation = 'SUSPEND_USER_CONFIRMATION' ;
-                                    }
-                                ?> 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="user[]" value="<?php echo $key ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a><td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                        <span class="do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print __('delete');?> 
-                                            <input type="hidden" name="delete_url" value="/delete/user/?user=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __('DELETE_USER_CONFIRMATION',$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
-                                        <span class="do_<?php echo $spnd_action ?>">
-                                            <img src="/images/suspend.png" width="7px" height="8px">
-                                            <?php echo __($spnd_action); ?> 
-                                            <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/user/?user=<?php echo $key ?>" />
-                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a href="/edit/user/?user=<?php echo $key; ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit'); ?> 
-                                        </span>
-                                    </a>
-                                    <?php
-                                        if ($key == $user) {
-                                    ?> 
-                                    <a href="/logout" class="data-controls">
-                                        <span>
-                                            <img src="/images/login-as.png" width="7px" height="8px">
-                                            <?php print __('logout'); ?> 
-                                    <?php
-                                            if (!empty($_SESSION['look_alert'])) {
-                                    ?> 
-                                                <script type="text/javascript">
-                                                    $(function() {
-                                                        $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                                                        $( "#dialog-message" ).dialog({
-                                                            modal: true,
-                                                            buttons: {
-                                                                Ok: function() {
-                                                                    $( this ).dialog( "close" );
-                                                                },
-                                                            }
-                                                        });
-                                                    });
-                                                </script>
-                                                <div id="dialog-message" title="<?php print __('Welcome') ?>">
-                                                    <p><?php print __('LOGGED_IN_AS',$key);?></p>
-                                                </div>
-                                    <?php
-                                                unset($_SESSION['look_alert']);
-                                            }
-                                        } else {
-                                    ?> 
-                                    <a href="/login/?loginas=<?php echo $key; ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/login-as.png" width="7px" height="8px">
-                                            <?php print __('login as') ." ".$key; ?> 
-                                    <?php
-                                        }
-                                     ?> 
-                                        </span>
-                                    </a>
-
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td colspan=3 class="username" style="padding: 0 0 0 4px;"><b><?php echo $key ?></b><a class="fullname"><?php echo $data[$key]['FNAME']?> <?php echo $data[$key]['LNAME']?></a></td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;"  width="260">
-                                                <table>
-                                                    <tr><td colspan=2 class="counter-name"  style="padding: 0 0 0 2px;"><?php echo $data[$key]['CONTACT']?></td></tr>
-                                                    <tr><td colspan=2 class="counter-name"  style="padding: 0 0 8px 2px;">[<?php echo $data[$key]['PACKAGE']?>] <?php print __('package');?></td></tr>
-                                                    <tr>
-                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
-                                                            <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
-                                                            <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan=2 style="padding: 2px 0 0 0;">
-                                                            <table class="chart2">
-                                                                <tr>
-                                                                    <td>
-                                                                        <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?>
-                                                                    </td>
-                                                                    <td style="padding: 0px 0px 0px 4px">
-                                                                        <?php print __('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?>
-                                                                    </td>
-                                                                </tr>
-                                                                <tr>
-                                                                    <td>
-                                                                        <?php print __('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?>
-
-                                                                    </td>
-                                                                    <td style="padding: 0px 0px 0px 4px">
-                                                                        <?php print __('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?>
-                                                                    </td>
-                                                                </tr>
-                                                            </table>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="300">
-                                                <table width="290">
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Web Domains');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?> / <?php echo $data[$key]['WEB_DOMAINS'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('SSL Domains');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['U_WEB_SSL'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Web Aliases');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> <?php print __('per domain');?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('DNS domains');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['U_DNS_DOMAINS'] ?> / <?php echo $data[$key]['DNS_DOMAINS'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('DNS records');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> <?php print __('per domain');?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Name Servers');?>:<br></td>
-                                                        <td class="counter-value"><?php echo str_replace(',', ', ',$data[$key]['NS']) ?></td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;">
-                                                <table class="data-col4">
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Mail Domains');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?> / <?php echo $data[$key]['MAIL_DOMAINS'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Mail Accounts');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> <?php print __('per domain');?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Databases');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['U_DATABASES'] ?> / <?php echo $data[$key]['DATABASES'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Cron Jobs');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['U_CRON_JOBS'] ?> / <?php echo $data[$key]['CRON_JOBS'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('SSH Access');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['SHELL'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('IP Addresses');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['IP_OWNED'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Backups');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['U_BACKUPS'] ?> / <?php echo $data[$key]['BACKUPS'] ?></td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
                             <?php
+                                if ($user == 'admin') {
+                                    echo "<button class=\"submenu-button\" onclick=\"location.href='/add/user/'\">" . __('Add User') . "</button>";
+                                } else {
+                                    echo "<button class=\"submenu-button\" onclick=\"location.href='/add/web/'\">" . __('Add Web Domain') . "</button>";
                                 }
                             ?> 
-                        </table>
-                        </form>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/user/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="rebuild"><?php print __('rebuild');?></option>
+                                <option value="rebuild web"><?php print __('rebuild web');?></option>
+                                <option value="rebuild dns"><?php print __('rebuild dns');?></option>
+                                <option value="rebuild mail"><?php print __('rebuild mail');?></option>
+                                <option value="rebuild db"><?php print __('rebuild db');?></option>
+                                <option value="rebuild cron"><?php print __('rebuild cron');?></option>
+                                <option value="update counters"><?php print __('update counters');?></option>
+                                <option value="suspend"><?php print __('suspend');?></option>
+                                <option value="unsuspend"><?php print __('unsuspend');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                        <table class="data-count">
+        <div id="vstobjects">
+            <table class="data">
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend' ;
+                            $spnd_confirmation = 'UNSUSPEND_USER_CONFIRMATION' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend' ;
+                            $spnd_confirmation = 'SUSPEND_USER_CONFIRMATION' ;
+                        }
+                    ?> 
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="user[]" value="<?php echo $key ?>" ></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a><td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                <?php print __('delete');?> 
+                                <input type="hidden" name="delete_url" value="/delete/user/?user=<?php echo $key ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('DELETE_USER_CONFIRMATION',$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
+                            <span class="do_<?php echo $spnd_action ?>">
+                                <img src="/images/suspend.png" width="7px" height="8px">
+                                <?php echo __($spnd_action); ?> 
+                                <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/user/?user=<?php echo $key ?>" />
+                                <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a href="/edit/user/?user=<?php echo $key; ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit'); ?> 
+                            </span>
+                        </a>
+                        <?php
+                            if ($key == $user) {
+                        ?> 
+                        <a href="/logout" class="data-controls">
+                            <span>
+                                <img src="/images/login-as.png" width="7px" height="8px">
+                                <?php print __('logout'); ?> 
+                        <?php
+                                if (!empty($_SESSION['look_alert'])) {
+                        ?> 
+                                    <script type="text/javascript">
+                                        $(function() {
+                                            $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                                            $( "#dialog-message" ).dialog({
+                                                modal: true,
+                                                buttons: {
+                                                    Ok: function() {
+                                                        $( this ).dialog( "close" );
+                                                    },
+                                                }
+                                            });
+                                        });
+                                    </script>
+                                    <div id="dialog-message" title="<?php print __('Welcome') ?>">
+                                        <p><?php print __('LOGGED_IN_AS',$key);?></p>
+                                    </div>
+                        <?php
+                                    unset($_SESSION['look_alert']);
+                                }
+                            } else {
+                        ?> 
+                        <a href="/login/?loginas=<?php echo $key; ?>" class="data-controls">
+                            <span>
+                                <img src="/images/login-as.png" width="7px" height="8px">
+                                <?php print __('login as') ." ".$key; ?> 
+                        <?php
+                            }
+                         ?> 
+                            </span>
+                        </a>
+
+                        <table class="data-col2" width="830px">
                             <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 account');
-                                        } else {
-                                            echo __('%s accounts',$i);
-                                        }
-                                    ?> 
+                                <td colspan=3 class="username" style="padding: 0 0 0 4px;"><b><?php echo $key ?></b><a class="fullname"><?php echo $data[$key]['FNAME']?> <?php echo $data[$key]['LNAME']?></a></td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;"  width="260">
+                                    <table>
+                                        <tr><td colspan=2 class="counter-name"  style="padding: 0 0 0 2px;"><?php echo $data[$key]['CONTACT']?></td></tr>
+                                        <tr><td colspan=2 class="counter-name"  style="padding: 0 0 8px 2px;">[<?php echo $data[$key]['PACKAGE']?>] <?php print __('package');?></td></tr>
+                                        <tr>
+                                            <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
+                                                <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
+                                                <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan=2 style="padding: 2px 0 0 0;">
+                                                <table class="chart2">
+                                                    <tr>
+                                                        <td>
+                                                            <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?>
+                                                        </td>
+                                                        <td style="padding: 0px 0px 0px 4px">
+                                                            <?php print __('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <?php print __('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?>
+
+                                                        </td>
+                                                        <td style="padding: 0px 0px 0px 4px">
+                                                            <?php print __('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="300">
+                                    <table width="290">
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Web Domains');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?> / <?php echo $data[$key]['WEB_DOMAINS'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('SSL Domains');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_WEB_SSL'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Web Aliases');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> <?php print __('per domain');?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('DNS domains');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_DNS_DOMAINS'] ?> / <?php echo $data[$key]['DNS_DOMAINS'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('DNS records');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> <?php print __('per domain');?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Name Servers');?>:<br></td>
+                                            <td class="counter-value"><?php echo str_replace(',', ', ',$data[$key]['NS']) ?></td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;">
+                                    <table class="data-col4">
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Mail Domains');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?> / <?php echo $data[$key]['MAIL_DOMAINS'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Mail Accounts');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> <?php print __('per domain');?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Databases');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_DATABASES'] ?> / <?php echo $data[$key]['DATABASES'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Cron Jobs');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_CRON_JOBS'] ?> / <?php echo $data[$key]['CRON_JOBS'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('SSH Access');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['SHELL'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('IP Addresses');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['IP_OWNED'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Backups');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_BACKUPS'] ?> / <?php echo $data[$key]['BACKUPS'] ?></td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+                <?php
+                    }
+                ?> 
+            </table>
+            </form>
+
+            <table class="data-count">
+                <tr>
+                    <td width="168px">
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 account');
+                            } else {
+                                echo __('%s accounts',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html
index f012b749..42b73254 100644
--- a/web/templates/admin/list_web.html
+++ b/web/templates/admin/list_web.html
@@ -1,229 +1,227 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/web/'"> <?php print __('Add Web Domain');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/web/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="suspend"><?php print __('suspend');?></option>
-                                                    <option value="unsuspend"><?php print __('unsuspend');?></option>
-                                                    <option value="delete"><?php print __('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/add/web/'"> <?php print __('Add Web Domain');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/web/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="suspend"><?php print __('suspend');?></option>
+                                <option value="unsuspend"><?php print __('unsuspend');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <table class='data'>
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
-                                        $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend' ;
-                                        $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
-                                    }
-                                    if (!empty($data[$key]['SSL_HOME'])) {
-                                        if ($data[$key]['SSL_HOME'] == 'same') {
-                                            $ssl_home = 'public_html';
-                                        } else {
-                                            $ssl_home = 'public_shtml';
-                                        }
-                                    } else {
-                                        $ssl_home = '';
-                                    }
-                                    $web_stats='no';
-                                    if (!empty($data[$key]['STATS'])) {
-                                        $web_stats=$data[$key]['STATS'];
-                                    }
-                                    $ftp_user='no';
-                                    if (!empty($data[$key]['FTP_USER'])) {
-                                        $ftp_user=$data[$key]['FTP_USER'];
-                                    }
-                                    $proxy_support='no';
-                                    if (!empty($data[$key]['PROXY'])) {
-                                        $proxy_support='yes';
-                                    }
-                                    if (strlen($data[$key]['PROXY_EXT']) > 16 ) {
-                                        $proxy_ext_title = str_replace(',', ', ', $data[$key]['PROXY_EXT']);
-                                        $proxy_ext = substr($data[$key]['PROXY_EXT'], 0, 16);
-                                        $proxy_ext = trim($proxy_ext, ",");
-                                        $proxy_ext = str_replace(',', ', ', $proxy_ext);
-                                        $proxy_ext = $proxy_ext.", ...";
-                                    } else {
-                                        $proxy_ext_title = '';
-                                        $proxy_ext = str_replace(',', ', ', $data[$key]['PROXY_EXT']);
-                                    }
-                                ?> 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo $key ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                        <span class="do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                             <?php print __('delete');?> 
-                                            <input type="hidden" name="delete_url" value="/delete/web/?domain=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
-                                        <span class="do_<?php echo $spnd_action ?>">
-                                            <img src="/images/suspend.png" width="7px" height="8px">
-                                            <?php echo __($spnd_action); ?> 
-                                            <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/web/?domain=<?php echo $key ?>" />
-                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a href="/edit/web/?domain=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit');?> 
-                                        </span>
-                                    </a>
-                                    <a href="/list/web-log/?domain=<?php echo $key ?>&type=access"  target="_blank" class="data-controls">
-                                        <span>
-                                            <img src="/images/new_window.png" width="8px" height="8px">
-                                            <?php print __('view logs');?> 
-                                        </span>
-                                    </a>
+        <div id="vstobjects">
+            <table class='data'>
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend' ;
+                            $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend' ;
+                            $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
+                        }
+                        if (!empty($data[$key]['SSL_HOME'])) {
+                            if ($data[$key]['SSL_HOME'] == 'same') {
+                                $ssl_home = 'public_html';
+                            } else {
+                                $ssl_home = 'public_shtml';
+                            }
+                        } else {
+                            $ssl_home = '';
+                        }
+                        $web_stats='no';
+                        if (!empty($data[$key]['STATS'])) {
+                            $web_stats=$data[$key]['STATS'];
+                        }
+                        $ftp_user='no';
+                        if (!empty($data[$key]['FTP_USER'])) {
+                            $ftp_user=$data[$key]['FTP_USER'];
+                        }
+                        $proxy_support='no';
+                        if (!empty($data[$key]['PROXY'])) {
+                            $proxy_support='yes';
+                        }
+                        if (strlen($data[$key]['PROXY_EXT']) > 16 ) {
+                            $proxy_ext_title = str_replace(',', ', ', $data[$key]['PROXY_EXT']);
+                            $proxy_ext = substr($data[$key]['PROXY_EXT'], 0, 16);
+                            $proxy_ext = trim($proxy_ext, ",");
+                            $proxy_ext = str_replace(',', ', ', $proxy_ext);
+                            $proxy_ext = $proxy_ext.", ...";
+                        } else {
+                            $proxy_ext_title = '';
+                            $proxy_ext = str_replace(',', ', ', $data[$key]['PROXY_EXT']);
+                        }
+                    ?> 
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo $key ?>" ></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                 <?php print __('delete');?> 
+                                <input type="hidden" name="delete_url" value="/delete/web/?domain=<?php echo $key ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
+                            <span class="do_<?php echo $spnd_action ?>">
+                                <img src="/images/suspend.png" width="7px" height="8px">
+                                <?php echo __($spnd_action); ?> 
+                                <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/web/?domain=<?php echo $key ?>" />
+                                <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a href="/edit/web/?domain=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit');?> 
+                            </span>
+                        </a>
+                        <a href="/list/web-log/?domain=<?php echo $key ?>&type=access"  target="_blank" class="data-controls">
+                            <span>
+                                <img src="/images/new_window.png" width="8px" height="8px">
+                                <?php print __('view logs');?> 
+                            </span>
+                        </a>
 
-                                    <?php
-                                        if (!empty($data[$key]['STATS'])) {
-                                    ?> 
-                                    <a href="http://<?php echo $key ?>/vstats/"  target="_blank" class="data-controls">
-                                        <span>
-                                            <img src="/images/new_window.png" width="8px" height="8px">
-                                            <?php print __('open webstats');?> 
-                                        </span>
-                                    </a>
-                                    <?php
-                                            }
-                                     ?> 
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b> <a class="aliases" style="padding: 0 30px 0 8px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name" style="padding: 0 0 0 2px">
-                                                            <?php echo $data[$key]['IP'] ?> 
-                                                        </td>
-                                                    <tr>
-                                                    <tr>
-                                                        <td class="chart1" style="padding: 4px 0 0 2px">
-                                                            <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
-                                                            <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="chart1" style="padding: 2px 0 0 2px"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                            <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                        </div>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="260">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Web Template');?>:</td>
-                                                        <td class="counter-value"><?php print __($data[$key]['TPL']) ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('SSL Support');?>:</td>
-                                                        <td class="counter-value"><?php print $data[$key]['SSL'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('SSL Home Directory');?>:</td>
-                                                        <td class="counter-value"><?php print $ssl_home ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Web Statistics');?>: </td>
-                                                        <td class="counter-value"> <?php print __($web_stats) ?></td>
-                                                    </tr>
-
-                                                </table>
-                                            </td>
-                                            <td rowspan=4 style="vertical-align:top;" width="300">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Proxy Support');?>:</td>
-                                                        <td class="counter-value"><?php print __($proxy_support);?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Proxy Template');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['PROXY'];?></td>
-                                                    </tr>
-
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Proxy Extentions');?>:</td>
-                                                        <td class="counter-value" <?php if (!empty($proxy_ext_title)) echo "title='".$proxy_ext_title."'" ?>><?php echo $proxy_ext ?></td>
-                                                    </tr>
-
-                                                    <tr>
-                                                        <td class="counter-name"> <?php print __('Additional FTP Account');?>:</td>
-                                                        <td class="counter-value"> <?php print __($ftp_user) ?></td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                            <?php
+                        <?php
+                            if (!empty($data[$key]['STATS'])) {
+                        ?> 
+                        <a href="http://<?php echo $key ?>/vstats/"  target="_blank" class="data-controls">
+                            <span>
+                                <img src="/images/new_window.png" width="8px" height="8px">
+                                <?php print __('open webstats');?> 
+                            </span>
+                        </a>
+                        <?php
                                 }
-                            ?> 
-                        </table>
-                        </form>
-
-                        <table class="data-count">
+                         ?> 
+                        <table class="data-col2" width="830px">
                             <tr>
-                                <td width="160px">
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 domain');
-                                        } else {
-                                            echo __('%s domains',$i);
-                                        }
-                                    ?> 
+                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b> <a class="aliases" style="padding: 0 30px 0 8px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name" style="padding: 0 0 0 2px">
+                                                <?php echo $data[$key]['IP'] ?> 
+                                            </td>
+                                        <tr>
+                                        <tr>
+                                            <td class="chart1" style="padding: 4px 0 0 2px">
+                                                <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
+                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="chart1" style="padding: 2px 0 0 2px"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                            </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="260">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Web Template');?>:</td>
+                                            <td class="counter-value"><?php print __($data[$key]['TPL']) ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('SSL Support');?>:</td>
+                                            <td class="counter-value"><?php print $data[$key]['SSL'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('SSL Home Directory');?>:</td>
+                                            <td class="counter-value"><?php print $ssl_home ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Web Statistics');?>: </td>
+                                            <td class="counter-value"> <?php print __($web_stats) ?></td>
+                                        </tr>
+
+                                    </table>
+                                </td>
+                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Proxy Support');?>:</td>
+                                            <td class="counter-value"><?php print __($proxy_support);?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Proxy Template');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['PROXY'];?></td>
+                                        </tr>
+
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Proxy Extentions');?>:</td>
+                                            <td class="counter-value" <?php if (!empty($proxy_ext_title)) echo "title='".$proxy_ext_title."'" ?>><?php echo $proxy_ext ?></td>
+                                        </tr>
+
+                                        <tr>
+                                            <td class="counter-name"> <?php print __('Additional FTP Account');?>:</td>
+                                            <td class="counter-value"> <?php print __($ftp_user) ?></td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+                <?php
+                    }
+                ?> 
+            </table>
+            </form>
+
+            <table class="data-count">
+                <tr>
+                    <td width="168px">
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 domain');
+                            } else {
+                                echo __('%s domains',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/admin/list_weblog.html b/web/templates/admin/list_weblog.html
index 3bcb5627..da0fa094 100644
--- a/web/templates/admin/list_weblog.html
+++ b/web/templates/admin/list_weblog.html
@@ -5,121 +5,121 @@
     <title>Web Log Manager</title>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
     <style type="text/css">
-            body {
-                margin: 0;
-                margin-left: auto;
-                margin-right: auto;
-                font-family: Arial, Helvetica, sans-serif;
-                padding: 0 0 0 8px;
-            }
+body {
+    margin: 0;
+    margin-left: auto;
+    margin-right: auto;
+    font-family: Arial, Helvetica, sans-serif;
+    padding: 0 0 0 8px;
+}
 
-            .main {
-                background-color: #ffffff;
-                padding: 0 0 18px 0;
-                box-shadow: 0 2px 6px rgba(100, 100, 100, 0.3);
-            }
+.main {
+    background-color: #ffffff;
+    padding: 0 0 18px 0;
+    box-shadow: 0 2px 6px rgba(100, 100, 100, 0.3);
+}
 
-            .top {
-                color: #ffd76e;
-                padding: 0;
-                font-family: Arial, Helvetica, sans-serif;
-                margin: 0;
-                font-size: 10pt;
-                text-align: left;
-                border: 0px;
-                border-collapse:collapse;
+.top {
+    color: #ffd76e;
+    padding: 0;
+    font-family: Arial, Helvetica, sans-serif;
+    margin: 0;
+    font-size: 10pt;
+    text-align: left;
+    border: 0px;
+    border-collapse:collapse;
 
-            }
+}
 
-            .top thead td {
-                background-color: #505050;
-                border-bottom: 1px solid #fff;
-                height: 25px;
-                text-align: right;
-                padding: 0 24px 0 0px;
-                weight:120px;
-            }
+.top thead td {
+    background-color: #505050;
+    border-bottom: 1px solid #fff;
+    height: 25px;
+    text-align: right;
+    padding: 0 24px 0 0px;
+    weight:120px;
+}
 
-            .top thead td:first-child{
-                border-left: 1px solid #fff;
-                border-right:none;
-                text-align:left;
-                padding: 0 0 0 0;
-                width:auto;
-            }
+.top thead td:first-child{
+    border-left: 1px solid #fff;
+    border-right:none;
+    text-align:left;
+    padding: 0 0 0 0;
+    width:auto;
+}
 
-            .top-link {
-                padding: 5px 22px 4px;
-                text-decoration: none;
-                color: #fff;
-                border-right: 1px solid #fff;
-            }
+.top-link {
+    padding: 5px 22px 4px;
+    text-decoration: none;
+    color: #fff;
+    border-right: 1px solid #fff;
+}
 
-            .top-link:hover {
-                color: #fff;
-                background-color: #999;
-            }
+.top-link:hover {
+    color: #fff;
+    background-color: #999;
+}
 
-            .top-link:active{
-                color: #fff;
-                background-color: #f79b44;
-            }
+.top-link:active{
+    color: #fff;
+    background-color: #f79b44;
+}
 
-            .top-selected-link {
-                padding: 5px 22px;
-                text-decoration: none;
-                color: #555;
-                background-color: #fff;
-                border-right: 1px solid #fff;
-            }
+.top-selected-link {
+    padding: 5px 22px;
+    text-decoration: none;
+    color: #555;
+    background-color: #fff;
+    border-right: 1px solid #fff;
+}
 
-            .top-selected-link:hover {
-                color: #174f82;
-            }
+.top-selected-link:hover {
+    color: #174f82;
+}
 
-            .top-selected-link:active {
-                color: #fff;
-                background-color: #f79b44;
-            }
+.top-selected-link:active {
+    color: #fff;
+    background-color: #f79b44;
+}
 
-            .top-user {
-                padding: 0 2px 0 0;
-                text-decoration: none;
-                color: #ffd76e;
-            }
+.top-user {
+    padding: 0 2px 0 0;
+    text-decoration: none;
+    color: #ffd76e;
+}
 
-            .top-user:hover {
-                color: #fff;
-            }
+.top-user:hover {
+    color: #fff;
+}
 
-            .top-user:active{
-                color: #fff;
-                background-color: #f79b44;
-            }
+.top-user:active{
+    color: #fff;
+    background-color: #f79b44;
+}
     </style>
 </head>
 <body>
 <table class="top">
     <thead>
         <tr>
-            <td>
-                <b><a class="top-<?php if($_GET['type'] == 'access' ) echo 'selected-' ?>link" href="/list/web-log/?domain=<?php echo $_GET['domain']."&type=access"?>">
-                    <?php print __('AccessLog') ?> 
-                </a></b>
+<td>
+    <b><a class="top-<?php if($_GET['type'] == 'access' ) echo 'selected-' ?>link" href="/list/web-log/?domain=<?php echo $_GET['domain']."&type=access"?>">
+        <?php print __('AccessLog') ?> 
+    </a></b>
 
-                <b><a class="top-<?php if($_GET['type'] == 'error' ) echo 'selected-' ?>link" href="/list/web-log/?domain=<?php echo $_GET['domain']."&type=error"?>">
-                    <?php print __('ErrorLog') ?> 
-                </a></b>
+    <b><a class="top-<?php if($_GET['type'] == 'error' ) echo 'selected-' ?>link" href="/list/web-log/?domain=<?php echo $_GET['domain']."&type=error"?>">
+        <?php print __('ErrorLog') ?> 
+    </a></b>
 
-                <b><a class="top-link" href="/download/web-log/?domain=<?php echo $_GET['domain']."&type=access"?>">
-                    <?php print __('Download AccessLog') ?>
-                </a></b>
+    <b><a class="top-link" href="/download/web-log/?domain=<?php echo $_GET['domain']."&type=access"?>">
+        <?php print __('Download AccessLog') ?>
+    </a></b>
 
-                <b><a class="top-link" href="/download/web-log/?domain=<?php echo $_GET['domain']."&type=error"?>">
-                    <?php print __('Download ErrorLog') ?>
-                </a></b>
+    <b><a class="top-link" href="/download/web-log/?domain=<?php echo $_GET['domain']."&type=error"?>">
+        <?php print __('Download ErrorLog') ?>
+    </a></b>
 
-            </td>
+</td>
         </tr>
     </thead>
 </table>
diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html
index 25bef811..317f6df0 100644
--- a/web/templates/admin/panel.html
+++ b/web/templates/admin/panel.html
@@ -1,114 +1,108 @@
-    <center>
-    <table class="main">
-        <tr>
-            <td>
-                <table class="fixed" >
-                    <tr>
-                        <td>
-                            <table class="top">
-                                <thead>
-                                    <tr>
-                                        <td>
-                                            <b><a class="top-<?php if($TAB == 'PACKAGE' ) echo 'selected-' ?>link" href="/list/package/"> <?php print __('Packages') ?> </a></b>
-                                            <b><a class="top-<?php if($TAB == 'IP' ) echo 'selected-' ?>link" href="/list/ip/"> <?php print __('IP') ?> </a></b>
-                                            <b><a class="top-<?php if($TAB == 'RRD' ) echo 'selected-' ?>link" href="/list/rrd/"> <?php print __('Graphs') ?> </a></b>
-                                            <b><a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/"> <?php print __('Statistics') ?> </a></b>
-                                            <b><a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"> <?php print __('Log') ?> </a></b>
-                                            <b><a class="top-<?php if($TAB == 'SERVICES' ) echo 'selected-' ?>link" href="/list/services/"> <?php print __('Services') ?>  </a></b>
-                                            <b><a class="top-<?php if($TAB == 'UPDATES' ) echo 'selected-' ?>link" href="/list/updates/"> <?php print __('Updates') ?> </a></b>
-                                        </td>
-                                        <td>
-                                            <b><a class="top-user" href="/edit/user/?user=<?php echo $user; ?>"><?php echo $user ?></a></b>
-                                            <a class="top-logout" href="/logout/"> <?php print __('Log out') ?> </a>
-                                        </td>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr>
-                                        <td colspan="7" style="background: #fff;">
-                                            <span class="nav-logo">
-                                                <img style="margin: 28px 0 0 6px;" src="/images/logo.png">
-                                            </span>
-                                            <a class="nav-lnk" href="/list/user/">
-                                                <span class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>block">
-                                                    <p class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>header">
-                                                        <?php print __('USER');?> 
-                                                    </p>
-                                                    <p class="nav-counters">
-                                                        <?php print __('users');?>: <? echo $panel[$user]['U_USERS'] ?><br>
-                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_USERS']?> 
-                                                    </p>
-                                                </span>
-                                            </a>
-                                            <a class="nav-lnk" href="/list/web/">
-                                                <span class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>block">
-                                                    <p class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>header">
-                                                        <?php print __('WEB');?> 
-                                                    </p>
-                                                    <p class="nav-counters">
-                                                        <?php print __('domains');?>: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
-                                                        <?php print __('aliases');?>: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
-                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_WEB']?> 
-                                                    </p>
-                                                </span>
-                                            </a>
-                                            <a class="nav-lnk" href="/list/dns/">
-                                                <span class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>block">
-                                                    <p class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>header">
-                                                        <?php print __('DNS');?> 
-                                                    </p>
-                                                    <p class="nav-counters">
-                                                        <?php print __('domains');?>: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
-                                                        <?php print __('records');?>: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
-                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_DNS']?> 
-                                                    </p>
-                                                </span>
-                                            </a>
-                                            <a class="nav-lnk" href="/list/mail/">
-                                                <span class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>block">
-                                                    <p class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>header">
-                                                        <?php print __('MAIL');?> 
-                                                    </p>
-                                                    <p class="nav-counters">
-                                                        <?php print __('domains');?>: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
-                                                        <?php print __('accounts');?>: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
-                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?> 
-                                                    </p>
-                                                </span>
-                                            </a>
-                                            <a class="nav-lnk" href="/list/db/">
-                                                <span class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>block">
-                                                    <p class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>header">
-                                                        <?php print __('DB');?> 
-                                                    </p>
-                                                    <p class="nav-counters">
-                                                        <?php print __('databases');?>: <? echo $panel[$user]['U_DATABASES']?><br>
-                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_DB']?> 
-                                                    </p>
-                                                </span>
-                                            </a>
-                                            <a class="nav-lnk" href="/list/cron/">
-                                                <span class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>block">
-                                                    <p class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>header">
-                                                        <?php print __('CRON');?> 
-                                                    </p>
-                                                    <p class="nav-counters">
-                                                        <?php print __('jobs');?>: <? echo $panel[$user]['U_CRON_JOBS']?><br>
-                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_CRON']?> 
-                                                    </p>
-                                                </span>
-                                            </a>
-                                            <a class="nav-lnk" href="/list/backup/">
-                                                <span class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>block">
-                                                    <p class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>header">
-                                                        <?php print __('BACKUP');?> 
-                                                    </p>
-                                                    <p class="nav-counters">
-                                                        <?php print __('backups');?>: <? echo $panel[$user]['U_BACKUPS']?><br>
-                                                    </p>
-                                                </span>
-                                            </a>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
+    <div style="margin:0 auto;display: block; background: #fff; width: 1000px;" >
+        <div class="top">
+            <div class="top-menu">
+                <span style="float:left;">
+                    <a class="top-<?php if($TAB == 'PACKAGE' ) echo 'selected-' ?>link" href="/list/package/"> <?php print __('Packages') ?> </a>
+                    <a class="top-<?php if($TAB == 'IP' ) echo 'selected-' ?>link" href="/list/ip/"> <?php print __('IP') ?> </a>
+                    <a class="top-<?php if($TAB == 'RRD' ) echo 'selected-' ?>link" href="/list/rrd/"> <?php print __('Graphs') ?> </a>
+                    <a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/"> <?php print __('Statistics') ?> </a>
+                    <a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"> <?php print __('Log') ?> </a>
+                    <a class="top-<?php if($TAB == 'SERVICES' ) echo 'selected-' ?>link" href="/list/services/"> <?php print __('Services') ?>  </a>
+                    <a class="top-<?php if($TAB == 'UPDATES' ) echo 'selected-' ?>link" href="/list/updates/"> <?php print __('Updates') ?> </a>
+                </span>
+                <span style="float:right;">
+                    <a class="top-user" href="/edit/user/?user=<?php echo $user; ?>"><?php echo $user ?></a>
+                    <a class="top-logout" href="/logout/"> <?php print __('Log out') ?> </a>
+                </span>
+            </div>
+            <div style="display:block; float:left;">
+                <span class="nav-logo">
+                    <img style="margin: 26px 0 0 10px;" src="/images/logo.png">
+                </span>
+
+                <a class="nav-lnk" href="/list/user/">
+                <span class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>block">
+                    <p class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>header">
+                        <?php print __('USER');?> 
+                    </p>
+                    <p class="nav-counters">
+                        <?php print __('users');?>: <? echo $panel[$user]['U_USERS'] ?><br>
+                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_USERS']?> 
+                    </p>
+                </span>
+
+                </a>
+                <a class="nav-lnk" href="/list/web/">
+                <span class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>block">
+                    <p class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>header">
+                        <?php print __('WEB');?> 
+                    </p>
+                    <p class="nav-counters">
+                        <?php print __('domains');?>: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
+                        <?php print __('aliases');?>: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
+                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_WEB']?> 
+                    </p>
+                </span>
+                </a>
+
+                <a class="nav-lnk" href="/list/dns/">
+                <span class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>block">
+                    <p class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>header">
+                        <?php print __('DNS');?> 
+                    </p>
+                    <p class="nav-counters">
+                        <?php print __('domains');?>: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
+                        <?php print __('records');?>: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
+                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_DNS']?> 
+                    </p>
+                </span>
+                </a>
+
+                <a class="nav-lnk" href="/list/mail/">
+                <span class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>block">
+                    <p class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>header">
+                        <?php print __('MAIL');?> 
+                    </p>
+                    <p class="nav-counters">
+                        <?php print __('domains');?>: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
+                        <?php print __('accounts');?>: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
+                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?> 
+                    </p>
+                </span>
+                </a>
+
+                <a class="nav-lnk" href="/list/db/">
+                <span class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>block">
+                    <p class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>header">
+                        <?php print __('DB');?> 
+                    </p>
+                    <p class="nav-counters">
+                        <?php print __('databases');?>: <? echo $panel[$user]['U_DATABASES']?><br>
+                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_DB']?> 
+                    </p>
+                </span>
+                </a>
+
+                <a class="nav-lnk" href="/list/cron/">
+                <span class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>block">
+                    <p class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>header">
+                        <?php print __('CRON');?> 
+                    </p>
+                    <p class="nav-counters">
+                        <?php print __('jobs');?>: <? echo $panel[$user]['U_CRON_JOBS']?><br>
+                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_CRON']?> 
+                    </p>
+                </span>
+                </a>
+
+                <a class="nav-lnk" href="/list/backup/">
+                <span class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>block">
+                    <p class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>header">
+                        <?php print __('BACKUP');?> 
+                    </p>
+                    <p class="nav-counters">
+                        <?php print __('backups');?>: <? echo $panel[$user]['U_BACKUPS']?><br>
+                    </p>
+                </span>
+                </a>
+            </div>
diff --git a/web/templates/footer.html b/web/templates/footer.html
index 6f792ab0..344e5a41 100644
--- a/web/templates/footer.html
+++ b/web/templates/footer.html
@@ -1,14 +1,10 @@
-                    <br>
-                </td>
-            </tr>
-        </table>
-
-        <script type="text/javascript">
-            $(document).ready(function() {
-                VE.core.register($('.main'));
-            });
-        </script>
-    </center>
     <br>
+    </div>
+    <br>
+    <script type="text/javascript">
+            $(document).ready(function() {
+                VE.core.register($('.data'));
+        });
+    </script>
     </body>
 </html>
diff --git a/web/templates/header.html b/web/templates/header.html
index 54ae88ff..1f50c960 100644
--- a/web/templates/header.html
+++ b/web/templates/header.html
@@ -4,902 +4,9 @@
         <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
         <title>Vesta - <?php echo "$TAB"; ?> </title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-        <style type="text/css">
-            body {
-                margin: 0;
-                margin-left: auto;
-                margin-right: auto;
-                font-family: Arial, Helvetica, sans-serif;
-                background-color: #e5e5e5;
-            }
-
-            form {
-                margin: 0;
-            }
-
-            .hidden {
-                display: none;
-            }
-
-            .main {
-                background-color: #ffffff;
-                padding: 0 0 18px 0;
-                box-shadow: 0 2px 4px rgba(100, 100, 100, 0.3);
-            }
-
-            .top {
-                color: #ffd76e;
-                padding: 0;
-                font-family: Arial, Helvetica, sans-serif;
-                margin: 0;
-                width: 990px;
-                font-size: 10pt;
-                text-align: left;
-                border: 0px;
-                border-collapse:collapse;
-
-            }
-
-            .top thead td {
-                background-color: #505050;
-                border-bottom: 1px solid #fff;
-                height: 25px;
-                text-align: right;
-                padding: 0 24px 0 0px;
-                weight:120px;
-            }
-
-            .top thead td:first-child{
-                border-left: 1px solid #fff;
-                border-right:none;
-                text-align:left;
-                padding: 0 0 0 0;
-                width:auto;
-            }
-
-            .top-link {
-                padding: 5px 22px 4px;
-                text-decoration: none;
-                color: #fff;
-                border-right: 1px solid #ccc;
-            }
-
-            .top-link:hover {
-                color: #fff;
-                background-color: #999;
-            }
-
-            .top-link:active{
-                color: #fff;
-                background-color: #f79b44;
-            }
-
-            .top-selected-link {
-                padding: 5px 22px;
-                text-decoration: none;
-                color: #555;
-                background-color: #fff;
-                border-right: 1px solid #fff;
-            }
-
-            .top-selected-link:hover {
-                color: #174f82;
-            }
-
-            .top-selected-link:active {
-                color: #fff;
-                background-color: #f79b44;
-            }
-
-            .top-user {
-                padding: 0 2px 0 0;
-                text-decoration: none;
-                color: #ffd76e;
-            }
-
-            .top-user:hover {
-                color: #fff;
-            }
-
-            .top-user:active{
-                color: #fff;
-                background-color: #f79b44;
-            }
-
-            .top-logout {
-                text-decoration: none;
-                color: #d3d3d3;
-                border: noner;
-            }
-
-            .top-logout:hover {
-                color: #fff;
-            }
-
-            .top-logout:active {
-                color: #fff;
-                background-color: #f79b44;
-            }
-
-            .nav-logo {
-                float:left;
-                height:110px;
-                width:161px;
-                margin: 0;
-                border-bottom: 1px solid #e3e3e3;
-            }
-
-            .nav-lnk {
-                text-decoration: none;
-                color: #222;
-                float:left;
-            }
-
-            .nav-lnk:active {
-                color: #f79b44;
-            }
-
-            .nav-block {
-                margin: 0;
-                height:110px;
-                width: 118px;
-                float:left;
-                cursor: pointer;
-                border-bottom: 1px solid #e3e3e3;
-
-            }
-
-            .nav-block:hover {
-                height:107px;
-                border-bottom: 4px solid #f79b44;
-            }
-
-            .nav-selected-block {
-                margin: 0;
-                color: #174f82;
-                height: 107px;
-                width: 118px;
-                float: left;
-                background-color: #fff;
-                border-bottom: 4px solid #777;
-                cursor: pointer;
-            }
-
-            .nav-selected-block:hover {
-                height:107px;
-                border-bottom: 4px solid #f79b44;
-            }
-
-            .nav-selected-block:active {
-                color: #f79b44;
-            }
-
-            .nav-header {
-                padding: 14px 0 0 6px;
-                margin: 0;
-                letter-spacing: -1.0px;
-                font-size: 16pt;
-                font-weight: bold;
-            }
-
-            .nav-selected-header {
-                padding: 14px 0 0 6px;
-                margin: 0;
-                letter-spacing: -1.0px;
-                font-size: 16pt;
-                font-weight: bold;
-            }
-
-            .nav-counters {
-                padding: 1px 0 0 6px;
-                margin: 0;
-                height: 58px;
-                line-height: 1.4em;
-                font-size: 9pt;
-                color: #333;
-                decoration: none;
-            }
-
-            .submenu {
-                margin-left: auto;
-                margin-right: auto;
-                width: 990px;
-                font-family:Arial, Helvetica, sans-serif;
-                height: 54px;
-                font-size: 10pt;
-                text-align: left;
-                vertical-align:top;
-                padding: 0px 10px 0px 0;
-                background-color: none repeat scroll 0% 0% white;
-            }
-
-            .submenu td {
-                vertical-align: middle;
-            }
-
-            .submenu-button-block {
-                float: left;
-            }
-
-            .submenu-button {
-                width: 130px;
-                height: 24px;
-                cursor: pointer;
-                color: #555;
-                background-color: #fafafa;
-                border: 1px solid #ccc;
-                border-radius: 3px 3px 3px 3px;
-                padding: 0;
-                font-size: 12px;
-                font-weight: bold;
-                font-family:Arial, Helvetica, sans-serif;
-            }
-
-            @-moz-document url-prefix() {
-                .submenu-button {
-                    padding-bottom: 2px;
-                }
-            }
-
-            .submenu-button:hover {
-                border: 1px solid #f79b44;
-            }
-
-            .submenu-button:active {
-                color: #fff;
-                border: 1px solid #f79b44;
-                background-color: #f79b44;
-            }
-
-            .submenu-select-block {
-                float:left;
-                padding-left: 18px;
-            }
-
-            .submenu-select-link {
-                color: #6A6A6A;
-                display: block;
-                float: left;
-                font-size: 8pt;
-                letter-spacing: 0.1em;
-                margin: 6px 6px 0 0;
-                text-decoration: none;
-                padding: 0 4px 0 12px
-            }
-
-            .submenu-select-link:hover {
-                text-decoration: underline;
-            }
-
-            .submenu-select-link:active {
-                color: #fff;
-                background-color: #f79b44;
-                text-decoration: underline;
-            }
-
-            .submenu-select-dropdown {
-                font-family:Arial, Helvetica, sans-serif;
-                color: #333333;
-                display: block;
-                float: left;
-                height: 24px;
-                margin: 0 4px 0 0;
-                min-width: 138px;
-            }
-
-            .submenu-search-block {
-                text-align: right;
-                float: right;
-            }
-
-            .submenu-search-field {
-                border: 1px solid #d3d3d3;
-                border-radius: 3px 3px 3px 3px;
-                color: #333;
-                font-size: 14px;
-                background-color: #fff;
-                float: left;
-                padding: 0px 3px 0px 3px;
-                height: 22px;
-                width: 250px;
-                margin: 0 4px 0 0;
-            }
-
-            .bottom {
-                background-color: #ebe9dc;
-                color: #555;
-                margin: 30px 0 0 0;
-                padding: 4px 20px 8px 0;
-                margin-left: auto;
-                margin-right: auto;
-                width: 990px;
-                font-size: 8pt;
-                text-align: center;
-                vertical-align:top;
-                line-height: 0.8em;
-                border-top: 4px solid #d3d3d3;
-            }
-
-            .bottom a:link {
-                font-size: 8pt;
-                text-decoration: none;
-                color: #555;
-            }
-
-            .bottom a:visited {
-                text-decoration: none;
-                color: #555;
-            }
-
-            .bottom a:hover {
-                text-decoration: underline;
-                color: #7fa1cb;
-            }
-
-            .vst {
-                padding: 0 4px 0 4px;
-                margin: 0;
-                text-decoration: none;
-                color: #999;
-                font-size: 12pt;
-                float: left;
-            }
-
-            .vst:hover {
-                text-decoration: underline;
-            }
-
-            .vst:active {
-                color: #fff;
-                background-color: #f79b44;
-            }
-
-            .vst-selected {
-                padding: 0 4px 0 4px;
-                margin: 0;
-                text-decoration: none;
-                color: #174f82;
-                font-size: 12pt;
-                float: left;
-            }
-
-            .vst-selected:hover {
-                text-decoration: underline;
-            }
-
-            .vst-selected:active {
-                color: #fff;
-                background-color: #f79b44;
-            }
-
-            .data {
-                border-collapse:collapse;
-                margin-left: auto;
-                margin-right: auto;
-                width: 990px;
-                font-family:Arial, Helvetica, sans-serif;
-                color: #e5a907;
-                font-size: 12pt;
-                text-align: left;
-                vertical-align:top;
-                margin: 0;
-                behavior:url("/css/csshover3.htc");
-            }
-
-            .data a {
-                text-decoration: none;
-            }
-
-            .data-row:hover {
-                margin: 0;
-                background-color: #f7f6ed;
-
-            }
-
-            .data-row:active {
-                background-color: #f7f7d8;
-            }
-
-            .datarowhover {
-                margin: 0;
-                background-color: #f7f6ed;
-            }
-
-            .data-null {
-                margin: 0;
-                width: 990px;
-                height: 10px;
-                border-top:1px dotted #d3d3d3;
-            }
-
-            .data-spacer {
-                margin: 0;
-                width: 990px;
-            }
-
-            .data-add {
-                margin: 0;
-                background-color: #f7f6ed;
-                border-left: 1px solid #e9e9e9;
-                border-right: 1px solid #e9e9e9;
-                border-bottom: 1px solid #e9e9e9;
-            }
-
-            .data-dotted {
-                text-align: left;
-                vertical-align:top;
-                border-top:1px dotted #d3d3d3;
-                padding: 0 0 26px 0;
-                margin: 0;
-            }
-
-            .data-dotted td {
-                margin: 0;
-            }
-
-            .data-col1 {
-                text-align: left;
-                padding:0;
-            }
-
-            .data-col1 tr td {
-                padding:0 0 0 20px;
-            }
-
-            .data-col1 tr:first-child td {
-                padding:23px 0 0 20px;
-            }
-
-            .data-col2 {
-                text-align: left;
-                padding: 0;
-                overflow: hidden;
-            }
-
-            .data-col2 a:visited {
-                color: green;
-            }
-
-            .data-col5 {
-                table-layout: fixed;
-                text-align: left;
-                padding: 0;
-                overflow: hidden;
-                white-space: nowrap;
-            }
-
-            .data-date {
-                padding: 0 0 0 18;
-                letter-spacing: 0.3em;
-                font-size: 8pt;
-                color: #6A6A6A
-            }
-
-            .data-active {
-                font-size: 8pt;
-                letter-spacing: 0.1em;
-                color: #81a64f;
-                padding: 0 0 13 18;
-            }
-
-            .data-suspended {
-                font-size: 8pt;
-                letter-spacing: 0.1em;
-                color: #de5543;
-                padding: 0 0 13 18;
-            }
-
-            .data-controls {
-                float: right;
-                height: 16px;
-                border-left: 1px solid #d3d3d3;
-                font-size: 8pt;
-                padding: 2px 12px 0 6px;
-                letter-spacing: 0.1em;
-                color: #174f82;
-                text-decoration: none;
-                cursor: pointer;
-            }
-
-            .data-controls:hover {
-                color: #fff;
-                background-color: #f79b44;
-            }
-
-            .data-controls:active {
-                background-color: #999
-            }
-
-            .data-controls img {
-                border: 0px;
-            }
-
-            .data-count {
-                font-family: Arial, Helvetica, sans-serif;
-                background-color: #f3f3f3;
-                color: #555;
-                font-size: 8pt;
-                margin: 18px 0 0 0;
-                text-align:right;
-                padding: 0 16px 0 0;
-            }
-
-            .chart1 {
-                color:#000;
-                font-size: 10pt;
-            }
-
-            .chart2 {
-                color: #484243;
-                font-size: 8pt;
-            }
-
-            .username {
-                color: #222;
-                font-size: 16pt;
-            }
-
-            .domain {
-                color: #222;
-                font-size: 16pt;
-            }
-
-            .cron {
-                color: #222;
-                font-size: 18px;
-            }
-
-            .log {
-                color: #222;
-                font-size: 12pt;
-            }
-
-            .aliases {
-                font-size: 12pt;
-                color: #99a7af;
-                padding: 0 0 0 8px;
-            }
-
-            .nginx-ext {
-                color: black;
-                vertical-align:top;
-                font-size: 10pt;
-            }
-
-            .fullname {
-                font-size: 18px;
-                color: #99a7af;
-                padding: 0 0 0 8px;
-            }
-
-            .counter-name {
-                white-space: nowrap;
-                vertical-align:top;
-                line-height: 1.3em;
-                font-size: 10pt;
-                color: #222;
-                padding: 0 4px 0 0;
-            }
-
-            .cron-counter-name {
-                vertical-align:top;
-                line-height: 0.8em;
-                font-size: 8pt;
-                padding: 4 0 0 0;
-                color: #222;
-            }
-
-            .counter-value {
-                vertical-align:top;
-                line-height: 1.2em;
-                font-size: 10pt;
-                color: #222;
-                padding: 0 0 0 4px;
-            }
-
-            .log-counter-value {
-                vertical-align:top;
-                font-size: 12pt;
-                color: #484243;
-            }
-
-            .cron-counter-value {
-                vertical-align:top;
-                line-height: 1.2em;
-                font-size: 12pt;
-                color: #484243;
-            }
-
-            .name {
-                font-size: 16pt;
-                color: #555;
-                padding: 0 0 0 10px;
-            }
-
-            .vst-ok {
-                font-size: 18px;
-                color: #62a358;
-                padding: 0 0 0 6px;
-            }
-
-            .vst-ok a{
-                color: #58934f;
-                text-decoration: none;
-            }
-
-            .vst-ok a:hover{
-                text-decoration: underline;
-            }
-
-            .vst-error {
-                font-size: 18px;
-                color: #de6c5d;
-                padding: 0 0 0 6px;
-            }
-
-            .vst-text {
-                color: #222;
-                font-size: 12pt;
-            }
-
-            .vst-textinput {
-                background-color: #fff;
-                border: 1px solid #c0c0c0;
-                border-radius: 3px 3px 3px 3px;
-                color: #555;
-                font-size: 18px;
-                padding: 5px;
-                width: 360px;
-                height: 120px;
-            }
-
-            .vst-textinput:hover {
-                border: 1px solid #f79b44;
-            }
-
-            .vst-textinput:focus {
-                border: 1px solid #f79b44;
-            }
-
-            .vst-textinput:disabled {
-                background-color: #f1f1f1;
-            }
-
-            .vst-input {
-                background-color: #fff;
-                border: 1px solid #c0c0c0;
-                border-radius: 3px 3px 3px 3px;
-                color: #555;
-                font-size: 14pt;
-                padding: 5px;
-                width: 360px;
-                height: 28px;
-            }
-
-            .vst-input:hover {
-                border: 1px solid #f79b44;
-            }
-
-            .vst-input:focus {
-                border: 1px solid #f79b44;
-            }
-
-            .vst-input:disabled {
-                background-color: #f1f1f1;
-            }
-
-            .vst-list {
-                font-family:Arial, Helvetica, sans-serif;
-                font-size: 12pt;
-                color: #555;
-                height: 30px;
-                min-width: 136px;
-            }
-
-            @-moz-document url-prefix() {
-                .vst-list {
-                    padding-top: 2px;
-                }
-            }
-
-            .vst-checkbox {
-                padding: 5px;
-                font-size: 12pt;
-            }
-
-            .vst-checkbox:hover {
-                border: 1px solid #f79b44;
-            }
-
-            .button {
-                filter:chroma(color=#000000);
-                cursor: pointer;
-                color: #505050;
-                background-color: #fafafa;
-                border: 1px solid #ccc;
-                border-radius: 3px 3px 3px 3px;
-                font-size: 14px;
-                font-weight: bold;
-                padding: 2px 16px;
-                width: 108px;
-                height: 34px;
-            }
-
-            .button:hover {
-                border: 1px solid #f79b44;
-            }
-
-            .button:active {
-                color: #fff;
-                border: 1px solid #f79b44;
-                background-color: #f79b44;
-            }
-
-            .genpass {
-                color: #34536a;
-                font-size: 8pt;
-                padding: 0 5px;
-                letter-spacing: 0.1em;
-                text-decoration: underline;
-            }
-
-            .genpass:hover {
-                color: #7fa1cb;
-            }
-
-            .genpass:active {
-                background-color: #f79b44;
-                color: #fff;
-            }
-
-            .vst-advanced {
-                color: #34536a;
-                font-size: 10pt;
-                letter-spacing: 0.1em;
-                text-decoration: none;
-                padding: 0 2px;
-                border-bottom: 1px solid #f79b44;
-            }
-
-            .vst-advanced:hover {
-                color: #7fa1cb;
-            }
-
-            .vst-advanced:active {
-                color: #fff;
-                background-color: #f79b44;
-            }
-
-            .fixed{
-                position: fixed;
-                border: none;
-                top: -3px;
-                border-bottom: 1px solid #d3d3d3;
-                background-color: #fff;
-            }
-
-            *html .fixed{
-                position:absolute;
-                position:fixed;
-                _position:absolute;
-                top:0;
-                _top:expression( eval(document.body.scrollTop) + 'px' );
-            }
-
-            #vstobjects{
-                padding-top: 192px;
-                width: 996px;
-                padding-left: 3px;
-                min-height: 370px;
-            }
-
-            .login {
-                font-family:Arial, Helvetica, sans-serif;
-                margin: 80px 0 80px 0;
-                padding: 0;
-                background-color: #fff;
-                text-align: left;
-                vertical-align:top;
-                width: 500px;
-                box-shadow: 0 2px 6px rgba(100, 100, 100, 0.3);
-            }
-
-            .login-box {
-                text-align: left;
-                vertical-align:top;
-                color: #222;
-            }
-
-            .login-bottom {
-                color: #ebe9dc;
-                text-align: right;
-                vertical-align:top;
-                width: 500px;
-                height: 50px;
-                background-color: #ebe9dc;
-                padding: 0 8px 0 0;
-                margin: 0;
-            }
-
-            .vestacp{
-                font-size: 8pt;
-                color: #222;
-                text-align: right;
-                padding: 20px 0 0 0;
-            }
-
-            .error {
-                font-size: 10pt;
-                color: #dE6c5d;
-            }
-        </style>
-        <!--[if IE]>
-            <style type="text/css">
-                html, body, div, span, applet, object, iframe {
-                    margin: 0;
-                    padding: 0;
-                    border: 0;
-                    font-size: 100%;
-                    font: inherit;
-                    vertical-align: baseline;
-                }
-
-                .fixed {
-                    margin-top: 0px;
-                }
-
-                .vst-advanced {
-                    text-decoration: underline;
-                }
-
-                #vstobjects{
-                    padding-top: 195px;
-                    min-height: 370px;
-                    height: auto !important;
-                    height: 370px;
-                    width: 996px;
-                }
-
-                .nav-logo {
-                    float:left;
-                    height:112px;
-                    width:161px;
-                    margin: 0;
-                    border-bottom: 1px solid #d3d3d3;
-                }
-
-                .nav-block {
-                    margin: 0;
-                    height:112px;
-                    width: 118px;
-                    float:left;
-                    cursor: pointer;
-                    border-bottom: 1px solid #d3d3d3;
-                }
-
-                .nav-block:hover {
-                    height:109px;
-                    border-bottom: 4px solid #f79b44;
-                }
-
-                .nav-selected-block {
-                    margin: 0;
-                    color: #174f82;
-                    height: 109px;
-                    width: 118px;
-                    float: left;
-                    background-color: #fff;
-                    border-bottom: 4px solid #777;
-                    cursor: pointer;
-                }
-
-                .nav-selected-block:hover {
-                    height:109px;
-                    border-bottom: 4px solid #f79b44;
-                }
-            </style>
-        <![endif]-->
+        <link type="text/css" href="/css/main.css" rel="stylesheet" />
         <!--[if IE 7]>
+            <link rel="stylesheet" type="text/css" href="/css/ie.css" />
             <style type="text/css">
                 .data-col1 a {
                     white-space: nowrap;
@@ -922,7 +29,6 @@
                     top: 2px;
                 }
             </style>
-            <link rel="stylesheet" type="text/css" href="/css/ie.css" />
         <![endif]-->
         <link type="text/css" href="/css/jquery-custom-dialogs.css" rel="stylesheet" />
         <script type="text/javascript" src="/js/events.js"></script>
@@ -961,6 +67,5 @@
                 });
             });
         </script>
-
     </head>
     <body>
diff --git a/web/templates/user/add_dns.html b/web/templates/user/add_dns.html
index a33bd241..2de900fc 100644
--- a/web/templates/user/add_dns.html
+++ b/web/templates/user/add_dns.html
@@ -1,146 +1,143 @@
-
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/dns/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
-
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding DNS Domain');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_add_dns" method="post">
-                        <script language="javascript">
-                            function elementHideShow(elementToHideOrShow){
-                                var el = document.getElementById(elementToHideOrShow);
-                                    if (el.style.display == "block") {
-                                        el.style.display = "none";
-                                    } else {
-                                        el.style.display = "block";
-                                    }
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/dns/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?> 
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Adding DNS Domain');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                }
                             }
-                        </script>
+                        ?> 
+                    </td>
+                </tr>
+            </div>
+        </table>
+        </div>
 
-                        <table class="data">
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td></td></tr>
-                                    </table>
+        <form id="vstobjects" name="v_add_dns" method="post">
+            <script language="javascript">
+                function elementHideShow(elementToHideOrShow){
+                    var el = document.getElementById(elementToHideOrShow);
+                        if (el.style.display == "block") {
+                            el.style.display = "none";
+                        } else {
+                            el.style.display = "block";
+                        }
+                }
+            </script>
+
+            <table class="data">
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="600px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Domain');?>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('IP address');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 0px;">
+                                    <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                                         <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="600px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Domain');?>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('Expiration Date');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
+                                                <input type="text" size="20" class="vst-input" name="v_exp" <?php if (!empty($v_exp)) echo "value=".$v_exp; ?>>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('IP address');?>
+                                                TTL
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip; ?>>
+                                                <input type="text" size="20" class="vst-input" name="v_ttl" <?php if (!empty($v_ttl)) echo "value=".$v_ttl; ?>>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
+                                                <?php print __('Name servers');?>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 0px;">
-                                                <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print __('Expiration Date');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_exp" <?php if (!empty($v_exp)) echo "value=".$v_exp; ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            TTL
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_ttl" <?php if (!empty($v_ttl)) echo "value=".$v_ttl; ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print __('Name servers');?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
                                             </td>
                                         </tr>
-                                    </table>
-                                    <table class="data-col2">
                                         <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
                                             </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/user/add_web.html b/web/templates/user/add_web.html
index 64478dd4..ae51b86f 100644
--- a/web/templates/user/add_web.html
+++ b/web/templates/user/add_web.html
@@ -1,363 +1,360 @@
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/web/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?> 
 
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/web/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Adding Domain');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                }
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
+        <form id="vstobjects" name="v_add_web" method="post">
+            <script type="text/javascript">
+                $(function() {
+                    $("#v_domain").change(function() {
+                        var prefix = 'www.';
+                        document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value;
+                    });
+                });
+                function WEBrandom() {
+                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                    var string_length = 10;
+                    var webrandom = '';
+                    for (var i=0; i<string_length; i++) {
+                        var rnum = Math.floor(Math.random() * chars.length);
+                        webrandom += chars.substring(rnum,rnum+1);
+                    }
+                    document.v_add_web.v_stats_password.value = webrandom;
+                }
 
-                                <table class="submenu">
+                function FTPrandom() {
+                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                    var string_length = 10;
+                    var ftprandomstring = '';
+                    for (var i=0; i<string_length; i++) {
+                        var rnum = Math.floor(Math.random() * chars.length);
+                        ftprandomstring += chars.substring(rnum,rnum+1);
+                    }
+                    document.v_add_web.v_ftp_password.value = ftprandomstring;
+                }
+
+                function elementHideShow(elementToHideOrShow){
+                    var el = document.getElementById(elementToHideOrShow);
+                    if (el.style.display == "block") {
+                        el.style.display = "none";
+                    } else {
+                        el.style.display = "block";
+                    }
+                }
+            </script>
+
+            <table class='data'>
+                <tr class="data-add">
+                <td class="data-dotted" width="150">
+                    <table class="data-col1">
+                        <tr>
+                            <td></td>
+                        </tr>
+                    </table>
+                </td>
+                <td class="data-dotted" width="830px">
+                    <table width="830px">
+                        <tr>
+                            <td></td>
+                        </tr>
+                    </table>
+                    <table class="data-col2" width="600px">
+                        <tr>
+                            <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <?php print __('Domain');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="text" size="20" class="vst-input" name="v_domain" id="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('IP address');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <select class="vst-list" name="v_ip">
+                                    <?php
+                                        foreach ($ips as $key => $value) {
+                                            $display_ip = $key;
+                                            if (!empty($value['NAT'])) $display_ip = $value['NAT'];
+                                            echo "\t\t\t\t<option value=\"".$display_ip."\"";
+                                            if ((!empty($v_ip)) && ( $display_ip == $_POST['v_ip'])){
+                                                echo ' selected';
+                                            }
+                                            echo ">".$display_ip."</option>\n";
+                                        }
+                                    ?>
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('DNS Support');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="checkbox" size="20" class="vst-checkbox" name="v_dns" <?php if (empty($v_dns)) echo "checked=yes"; ?>>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Mail Support');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="checkbox" size="20" class="vst-checkbox" name="v_mail" <?php if (empty($v_mail)) echo "checked=yes"; ?>>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
+                            </td>
+                        </tr>
+                    </table>
+                    <table class="data-col2" width="600px" style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Aliases');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <textarea size="20" class="vst-textinput" name="v_aliases" id="v_aliases" ><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Proxy Support');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if ($v_proxy !== 'off') echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table style="display:<?php if ($v_proxy == 'off') { echo 'none';} else {echo 'block';}?>;" id="proxytable" >
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding Web Domain');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
+                                        <td class="vst-text" style="padding: 9px 0 0 0;">
+                                            <?php print __('Proxy Extentions');?>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_ext;} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; }  ?></textarea>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('SSL Support');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table style="display:<?php if (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable">
+                                    <tr>
+                                        <td class="vst-text" style="padding: 9px 0 0 0;">
+                                            <?php print __('SSL Home Directory');?>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <select class="vst-list" name="v_ssl_home">
+                                                <option value='same' <?php if ($v_ssl_home == 'same') echo "selected";?>>
+                                                     public_html
+                                                </option>
+                                                <option value='single' <?php if ($v_ssl_home == 'single') echo "selected";?>>
+                                                    public_shtml
+                                                </option>
+                                            </select>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <?php print __('SSL Certificate');?>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <?php print __('SSL Key');?>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Web Statistics');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <select class="vst-list" name="v_stats">
+                                    <?php
+                                        foreach ($stats as $key => $value) {
+                                            $svalue = "'".$value."'";
+                                            echo "\t\t\t\t<option value=\"".$value."\"";
+                                            if (empty($v_stats)) $v_stats = 'none';
+                                            if (( $value == $v_stats ) || ($svalue == $v_stats )){
+                                                echo ' selected' ;
+                                            }
+                                            echo ">" . __($value) . "</option>\n";
+                                        }
+                                    ?> 
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Statistics Authorization');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
+                                    <tr>
+                                        <td class="vst-text" style="padding: 9px 0 0 0;">
+                                            <?php print __('Username');?>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password">
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <?php print __('Additional FTP Account');?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <?php print __('Username');?><br>
+                                            <span style="font-size: 10pt; color:#777;"><?php print __('Prefix will be automaticaly added to username',$user."_");?></span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user; ?>>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <input type="text" class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password; ?>>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                             <?php print __('Send FTP credentials to email');?>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email; ?>>
                                         </td>
                                     </tr>
                                 </table>
                             </td>
                         </tr>
                     </table>
-
-                    <form id="vstobjects" name="v_add_web" method="post">
-                        <script type="text/javascript">
-                            $(function() {
-                                $("#v_domain").change(function() {
-                                    var prefix = 'www.';
-                                    document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value;
-                                });
-                            });
-                            function WEBrandom() {
-                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                                var string_length = 10;
-                                var webrandom = '';
-                                for (var i=0; i<string_length; i++) {
-                                    var rnum = Math.floor(Math.random() * chars.length);
-                                    webrandom += chars.substring(rnum,rnum+1);
-                                }
-                                document.v_add_web.v_stats_password.value = webrandom;
-                            }
-
-                            function FTPrandom() {
-                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                                var string_length = 10;
-                                var ftprandomstring = '';
-                                for (var i=0; i<string_length; i++) {
-                                    var rnum = Math.floor(Math.random() * chars.length);
-                                    ftprandomstring += chars.substring(rnum,rnum+1);
-                                }
-                                document.v_add_web.v_ftp_password.value = ftprandomstring;
-                            }
-
-                            function elementHideShow(elementToHideOrShow){
-                                var el = document.getElementById(elementToHideOrShow);
-                                if (el.style.display == "block") {
-                                    el.style.display = "none";
-                                } else {
-                                    el.style.display = "block";
-                                }
-                            }
-                        </script>
-
-                        <table class='data'>
-                            <tr class="data-add">
-                            <td class="data-dotted" width="150">
-                                <table class="data-col1">
-                                    <tr>
-                                        <td></td>
-                                    </tr>
-                                </table>
+                    <table class="data-col2">
+                        <tr>
+                            <td style="padding: 33px 0 0 0;" width="116px">
+                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                             </td>
-                            <td class="data-dotted" width="830px">
-                                <table width="830px">
-                                    <tr>
-                                        <td></td>
-                                    </tr>
-                                </table>
-                                <table class="data-col2" width="600px">
-                                    <tr>
-                                        <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                            <?php print __('Domain');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="text" size="20" class="vst-input" name="v_domain" id="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('IP address');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <select class="vst-list" name="v_ip">
-                                                <?php
-                                                    foreach ($ips as $key => $value) {
-                                                        $display_ip = $key;
-                                                        if (!empty($value['NAT'])) $display_ip = $value['NAT'];
-                                                        echo "\t\t\t\t<option value=\"".$display_ip."\"";
-                                                        if ((!empty($v_ip)) && ( $display_ip == $_POST['v_ip'])){
-                                                            echo ' selected';
-                                                        }
-                                                        echo ">".$display_ip."</option>\n";
-                                                    }
-                                                ?>
-                                            </select>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('DNS Support');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_dns" <?php if (empty($v_dns)) echo "checked=yes"; ?>>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Mail Support');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_mail" <?php if (empty($v_mail)) echo "checked=yes"; ?>>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <table class="data-col2" width="600px" style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Aliases');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <textarea size="20" class="vst-textinput" name="v_aliases" id="v_aliases" ><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Proxy Support');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if ($v_proxy !== 'off') echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <table style="display:<?php if ($v_proxy == 'off') { echo 'none';} else {echo 'block';}?>;" id="proxytable" >
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                        <?php print __('Proxy Extentions');?>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_ext;} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; }  ?></textarea>
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('SSL Support');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');">
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <table style="display:<?php if (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable">
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                        <?php print __('SSL Home Directory');?>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <select class="vst-list" name="v_ssl_home">
-                                                            <option value='same' <?php if ($v_ssl_home == 'same') echo "selected";?>>
-                                                                 public_html
-                                                            </option>
-                                                            <option value='single' <?php if ($v_ssl_home == 'single') echo "selected";?>>
-                                                                public_shtml
-                                                            </option>
-                                                        </select>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print __('SSL Certificate');?>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print __('SSL Key');?>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Web Statistics');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <select class="vst-list" name="v_stats">
-                                                <?php
-                                                    foreach ($stats as $key => $value) {
-                                                        $svalue = "'".$value."'";
-                                                        echo "\t\t\t\t<option value=\"".$value."\"";
-                                                        if (empty($v_stats)) $v_stats = 'none';
-                                                        if (( $value == $v_stats ) || ($svalue == $v_stats )){
-                                                            echo ' selected' ;
-                                                        }
-                                                        echo ">" . __($value) . "</option>\n";
-                                                    }
-                                                ?> 
-                                            </select>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Statistics Authorization');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                        <?php print __('Username');?>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password">
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print __('Additional FTP Account');?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print __('Username');?><br>
-                                                        <span style="font-size: 10pt; color:#777;"><?php print __('Prefix will be automaticaly added to username',$user."_");?></span>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user; ?>>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <input type="text" class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password; ?>>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                         <?php print __('Send FTP credentials to email');?>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td>
-                                                        <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email; ?>>
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <table class="data-col2">
-                                    <tr>
-                                        <td style="padding: 33px 0 0 0;" width="116px">
-                                            <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
-                                        </td>
-                                        <td style="padding: 33px 0 0 0;">
-                                            <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                        </td>
-                                    </tr>
-                                </table>
+                            <td style="padding: 33px 0 0 0;">
+                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                             </td>
                         </tr>
                     </table>
-                </form>
+                </td>
+            </tr>
+        </table>
+    </form>
+    <br>
diff --git a/web/templates/user/edit_dns.html b/web/templates/user/edit_dns.html
index 1f41cdbc..b5abc906 100644
--- a/web/templates/user/edit_dns.html
+++ b/web/templates/user/edit_dns.html
@@ -1,110 +1,108 @@
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/dns/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/dns/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?> 
 
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing DNS Domain');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Editing DNS Domain');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<a class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<a class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                }
+                            }
+                        ?>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <form id="vstobjects" name="v_edit_dns" method="post">
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr>
-                                            <td style="padding: 24px 0 2px 18px;">
-                                                <a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                                <a class="data-date" ?><?php echo $v_time?></a>
-                                            </td>
-                                        </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
-                                    </table>
+        <form id="vstobjects" name="v_edit_dns" method="post">
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr>
+                                <td>
+                                    <a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                    <a class="data-date" ?><?php echo $v_time?></a>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Domain');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> disabled> <input type="hidden" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('IP Address');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip;  ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Expiration Date');?><span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_exp" <?php if (!empty($v_exp)) echo "value=".$v_exp; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                SOA
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_soa" <?php if (!empty($v_soa)) echo "value=".$v_soa; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                TTL
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ttl" <?php if (!empty($v_ttl)) echo "value=".$v_ttl; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                            </td>
-                                        </tr>
-                                    </table>
+                            </tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Domain');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> disabled> <input type="hidden" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('IP Address');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip;  ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Expiration Date');?><span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_exp" <?php if (!empty($v_exp)) echo "value=".$v_exp; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    SOA
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_soa" <?php if (!empty($v_soa)) echo "value=".$v_soa; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    TTL
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ttl" <?php if (!empty($v_ttl)) echo "value=".$v_ttl; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/user/edit_user.html b/web/templates/user/edit_user.html
index 922e69c8..838d0a92 100644
--- a/web/templates/user/edit_user.html
+++ b/web/templates/user/edit_user.html
@@ -1,155 +1,153 @@
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/user/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/user/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?> 
 
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing User');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" method="post" name="v_edit_user">
-                        <script type="text/javascript">
-                            function randomString() {
-                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                                var string_length = 10;
-                                var randomstring = '';
-                                for (var i=0; i<string_length; i++) {
-                                    var rnum = Math.floor(Math.random() * chars.length);
-                                    randomstring += chars.substring(rnum,rnum+1);
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Editing User');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<a class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<a class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                 }
-                                document.v_edit_user.v_password.value = randomstring;
                             }
-                        </script>
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr>
-                                            <td style="padding: 24px 0 2px 18px;">
-                                                <a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                                <a class="data-date" ?><?php echo $v_time?></a>
-                                            </td>
-                                        </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
-                                    </table>
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
+
+        <form id="vstobjects" method="post" name="v_edit_user">
+            <script type="text/javascript">
+                function randomString() {
+                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                    var string_length = 10;
+                    var randomstring = '';
+                    for (var i=0; i<string_length; i++) {
+                        var rnum = Math.floor(Math.random() * chars.length);
+                        randomstring += chars.substring(rnum,rnum+1);
+                    }
+                    document.v_edit_user.v_password.value = randomstring;
+                }
+            </script>
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr>
+                                <td>
+                                    <a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                    <a class="data-date" ?><?php echo $v_time?></a>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Username');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_user" <?php if (!empty($v_username)) echo "value=".$v_username;  ?> disabled> <input type="hidden" name="v_username" <?php if (!empty($v_username)) echo "value=".$v_username;  ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_password" <?php if (!empty($v_password)) echo "value=".$v_password;  ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Email');?> 
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_email" <?php if (!empty($v_email)) echo "value=".$v_email; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;" >
-                                                <?php print __('Language');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_language">
-                                                    <?php
-                                                        foreach ($languages as $key => $value) {
-                                                            echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$value."\"";
-                                                            $svalue = "'".$value."'";
-                                                            if (( $value == $v_language ) || ( $svalue == $v_language)){
-                                                                echo 'selected' ;
-                                                            }
-                                                            if (( $value == 'en' ) && (empty($v_language))){
-                                                                echo 'selected' ;
-                                                            }
-                                                            echo ">".$value."</option>\n";
-                                                        }
-                                                    ?>
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Default Name Servers');?> 
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
-                                            </td>
-                                        </tr>
-                                    </table>
+                            </tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Username');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_user" <?php if (!empty($v_username)) echo "value=".$v_username;  ?> disabled> <input type="hidden" name="v_username" <?php if (!empty($v_username)) echo "value=".$v_username;  ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_password" <?php if (!empty($v_password)) echo "value=".$v_password;  ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Email');?> 
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_email" <?php if (!empty($v_email)) echo "value=".$v_email; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;" >
+                                    <?php print __('Language');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_language">
+                                        <?php
+                                            foreach ($languages as $key => $value) {
+                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$value."\"";
+                                                $svalue = "'".$value."'";
+                                                if (( $value == $v_language ) || ( $svalue == $v_language)){
+                                                    echo 'selected' ;
+                                                }
+                                                if (( $value == 'en' ) && (empty($v_language))){
+                                                    echo 'selected' ;
+                                                }
+                                                echo ">".$value."</option>\n";
+                                            }
+                                        ?>
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Default Name Servers');?> 
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </form>
diff --git a/web/templates/user/edit_web.html b/web/templates/user/edit_web.html
index 0b0e48f3..f8fd0a72 100644
--- a/web/templates/user/edit_web.html
+++ b/web/templates/user/edit_web.html
@@ -1,341 +1,339 @@
-                                <?php
-                                    $back = $_SESSION['back'];
-                                    if (empty($back)) {
-                                        $back = "location.href='/list/web/'";
-                                    } else {
-                                        $back = "location.href='".$back."'";
-                                    }
-                                ?>
+            <?php
+                $back = $_SESSION['back'];
+                if (empty($back)) {
+                    $back = "location.href='/list/web/'";
+                } else {
+                    $back = "location.href='".$back."'";
+                }
+            ?>
 
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing Domain');?></b></a>
-                                            <?php
-                                                if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                                                } else {
-                                                    if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                                                    }
-                                                }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <form id="vstobjects" name="v_edit_web" method="post">
-                        <script language="javascript">
-                            function WEBrandom() {
-                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                                var string_length = 10;
-                                var webrandom = '';
-                                for (var i=0; i<string_length; i++) {
-                                    var rnum = Math.floor(Math.random() * chars.length);
-                                    webrandom += chars.substring(rnum,rnum+1);
-                                }
-                                document.v_edit_web.v_stats_password.value = webrandom;
-                            }
-
-                            function FTPrandom() {
-                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                                var string_length = 10;
-                                var ftprandomstring = '';
-                                for (var i=0; i<string_length; i++) {
-                                    var rnum = Math.floor(Math.random() * chars.length);
-                                    ftprandomstring += chars.substring(rnum,rnum+1);
-                                }
-                                document.v_edit_web.v_ftp_password.value = ftprandomstring;
-                            }
-
-                            function elementHideShow(elementToHideOrShow){
-                                var el = document.getElementById(elementToHideOrShow);
-                                if (el.style.display == "block") {
-                                    el.style.display = "none";
-                                } else {
-                                    el.style.display = "block";
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 16px 8px;" ><a class="name"><b><?php print __('Editing Domain');?></b></a>
+                        <?php
+                            if (!empty($_SESSION['error_msg'])) {
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                            } else {
+                                if (!empty($_SESSION['ok_msg'])) {
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                 }
                             }
-                        </script>
-                        <table class='data'>
-                            <tr class="data-add">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr>
-                                            <td style="padding: 24px 0 2px 18px;">
-                                                <a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                                <a class="data-date" ?><?php echo $v_time?></a>
-                                            </td>
-                                        </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
-                                    </table>
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
+
+        <form id="vstobjects" name="v_edit_web" method="post">
+            <script language="javascript">
+                function WEBrandom() {
+                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                    var string_length = 10;
+                    var webrandom = '';
+                    for (var i=0; i<string_length; i++) {
+                        var rnum = Math.floor(Math.random() * chars.length);
+                        webrandom += chars.substring(rnum,rnum+1);
+                    }
+                    document.v_edit_web.v_stats_password.value = webrandom;
+                }
+
+                function FTPrandom() {
+                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                    var string_length = 10;
+                    var ftprandomstring = '';
+                    for (var i=0; i<string_length; i++) {
+                        var rnum = Math.floor(Math.random() * chars.length);
+                        ftprandomstring += chars.substring(rnum,rnum+1);
+                    }
+                    document.v_edit_web.v_ftp_password.value = ftprandomstring;
+                }
+
+                function elementHideShow(elementToHideOrShow){
+                    var el = document.getElementById(elementToHideOrShow);
+                    if (el.style.display == "block") {
+                        el.style.display = "none";
+                    } else {
+                        el.style.display = "block";
+                    }
+                }
+            </script>
+            <table class='data'>
+                <tr class="data-add">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr>
+                                <td>
+                                    <a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                    <a class="data-date" ?><?php echo $v_time?></a>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <table width="830px">
+                            </tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <table width="830px">
+                            <tr>
+                                <td></td>
+                            </tr>
+                        </table>
+                        <table class="data-col2" width="830px">
+                            <tr>
+                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                    <?php print __('Domain');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> disabled> <input type="hidden" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('IP Address');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_ip">
+                                        <?php
+                                            foreach ($ips as $key => $value) {
+                                                $display_ip = $key;
+                                                if (!empty($value['NAT'])) $display_ip = $value['NAT'];
+                                                $skey = "'".$display_ip."'";
+                                                echo "\n\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".$display_ip."\"";
+                                                if ((!empty($v_ip)) && ( $display_ip == $v_ip ) || ( $skey == $v_ip )){
+                                                    echo ' selected';
+                                                }
+                                                echo ">".$display_ip."</option>\n";
+                                            }
+                                        ?>
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Aliases');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Proxy Support');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <table style="display:<?php if (empty($v_proxy)) { echo 'none';} else {echo 'block';}?> ;" id="proxytable">
                                         <tr>
-                                            <td></td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print __('Domain');?>
+                                            <td class="vst-text" style="padding: 9px 0 0 0;">
+                                                <?php print __('Proxy Extensions');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?> disabled> <input type="hidden" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain;  ?>>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('IP Address');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_ip">
-                                                    <?php
-                                                        foreach ($ips as $key => $value) {
-                                                            $display_ip = $key;
-                                                            if (!empty($value['NAT'])) $display_ip = $value['NAT'];
-                                                            $skey = "'".$display_ip."'";
-                                                            echo "\n\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".$display_ip."\"";
-                                                            if ((!empty($v_ip)) && ( $display_ip == $v_ip ) || ( $skey == $v_ip )){
-                                                                echo ' selected';
-                                                            }
-                                                            echo ">".$display_ip."</option>\n";
-                                                        }
-                                                    ?>
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Aliases');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo $v_aliases;  ?></textarea>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Proxy Support');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <table style="display:<?php if (empty($v_proxy)) { echo 'none';} else {echo 'block';}?> ;" id="proxytable">
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                            <?php print __('Proxy Extensions');?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_ext;} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; }  ?></textarea>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('SSL Support');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                            <?php print __('SSL Home Directory');?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <select class="vst-list" name="v_ssl_home">
-                                                                <option value='same' <?php if ($v_ssl_home == 'same') echo "selected";?>>
-                                                                     public_html
-                                                                </option>
-                                                                <option value='single' <?php if ($v_ssl_home == 'single') echo "selected";?>>
-                                                                    public_shtml
-                                                                </option>
-                                                            </select>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print __('SSL Certificate');?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print __('SSL Key');?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Web Statistics');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_stats">
-                                                    <?php
-                                                        foreach ($stats as $key => $value) {
-                                                            $svalue = "'".$value."'";
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            if (empty($v_stats)) $v_stats = 'none';
-                                                            if (( $value == $v_stats ) || ($svalue == $v_stats )){
-                                                                echo ' selected' ;
-                                                            }
-                                                        echo ">". __($value) ."</option>\n";
-                                                        }
-                                                ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Statistics Authorization');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 9px 0 0 2px;">
-                                                            <?php print __('Username');?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password">
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('Additional FTP Account');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
-                                                </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                            <?php print __('Username');?>
-                                                            <?php if (empty($v_ftp_user)) echo '<br><span style="font-size: 10pt; color:#777;">' . __('Prefix will be automaticaly added to username',$user."_") . '</span>' ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user;  ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                            <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text"  class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password;  ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <?php
-                                                        if (empty($v_ftp_user)) {
-                                                            echo '';
-                                                     ?> 
-                                                    <tr>
-                                                        <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                            <?php print __('Send FTP credentials to email');?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>
-                                                            <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email;  ?>>
-                                                        </td>
-                                                    </tr>
-                                                    <?php
-                                                        }
-                                                    ?> 
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col2">
-                                        <tr>
-                                            <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
-                                            </td>
-                                            <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                                <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_ext;} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; }  ?></textarea>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('SSL Support');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');">
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
+                                        <tr>
+                                            <td class="vst-text" style="padding: 9px 0 0 0;">
+                                                <?php print __('SSL Home Directory');?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <select class="vst-list" name="v_ssl_home">
+                                                    <option value='same' <?php if ($v_ssl_home == 'same') echo "selected";?>>
+                                                         public_html
+                                                    </option>
+                                                    <option value='single' <?php if ($v_ssl_home == 'single') echo "selected";?>>
+                                                        public_shtml
+                                                    </option>
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('SSL Certificate');?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('SSL Key');?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Web Statistics');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <select class="vst-list" name="v_stats">
+                                        <?php
+                                            foreach ($stats as $key => $value) {
+                                                $svalue = "'".$value."'";
+                                                echo "\t\t\t\t<option value=\"".$value."\"";
+                                                if (empty($v_stats)) $v_stats = 'none';
+                                                if (( $value == $v_stats ) || ($svalue == $v_stats )){
+                                                    echo ' selected' ;
+                                                }
+                                            echo ">". __($value) ."</option>\n";
+                                            }
+                                    ?> 
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Statistics Authorization');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
+                                        <tr>
+                                            <td class="vst-text" style="padding: 9px 0 0 2px;">
+                                                <?php print __('Username');?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user;  ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password">
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                    <?php print __('Additional FTP Account');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
+                                    </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                <?php print __('Username');?>
+                                                <?php if (empty($v_ftp_user)) echo '<br><span style="font-size: 10pt; color:#777;">' . __('Prefix will be automaticaly added to username',$user."_") . '</span>' ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user;  ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text"  class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password;  ?>>
+                                            </td>
+                                        </tr>
+                                        <?php
+                                            if (empty($v_ftp_user)) {
+                                                echo '';
+                                         ?> 
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 0;">
+                                                <?php print __('Send FTP credentials to email');?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email;  ?>>
+                                            </td>
+                                        </tr>
+                                        <?php
+                                            }
+                                        ?> 
+                                    </table>
+                                </td>
+                            </tr>
                         </table>
-                    </form>
+                        <table class="data-col2">
+                            <tr>
+                                <td style="padding: 24px 0 0 0;" width="116px">
+                                    <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
+                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </form>
 
diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html
index c991a5f9..8cc02ebe 100644
--- a/web/templates/user/list_cron.html
+++ b/web/templates/user/list_cron.html
@@ -1,172 +1,170 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/cron/'"> <?php print __('Add Cron Job');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/cron/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="delete"><?php print __('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/add/cron/'"> <?php print __('Add Cron Job');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                                <input type="text" name="q" class="submenu-search-field">
+                                <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/cron/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <table class='data'>
+        <div id="vstobjects">
+            <table class='data'>
 
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend';
-                                    }
-                            ?> 
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend';
+                        }
+                ?> 
 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="job[]" value="<?php echo $data[$key]['JOB'] ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                        <span class="do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print __('delete');?> 
-                                            <input type="hidden" name="delete_url" value="/delete/cron/?job=<?php echo $data[$key]['JOB']; ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __('DELETE_CRON_CONFIRMATION');?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a href="/edit/cron/?job=<?php echo $data[$key]['JOB'] ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit');?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="800px">
-                                        <tr>
-                                            <td colspan=5 class="cron" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $data[$key]['CMD'] ?></b>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;"  width="80px">
-                                                <table>
-                                                    <tr>
-                                                        <td class="cron-counter-name">
-                                                            <?php print __('Min');?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="cron-counter-value">
-                                                            <?php echo $data[$key]['MIN'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;"  width="80px">
-                                                <table>
-                                                    <tr>
-                                                        <td class="cron-counter-name">
-                                                            <?php print __('Hour');?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="cron-counter-value">
-                                                            <?php echo $data[$key]['HOUR'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;"  width="80px">
-                                                <table>
-                                                    <tr>
-                                                        <td class="cron-counter-name">
-                                                            <?php print __('Day');?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="cron-counter-value">
-                                                            <?php echo $data[$key]['DAY'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;"  width="80px">
-                                                <table>
-                                                    <tr>
-                                                        <td class="cron-counter-name">
-                                                            <?php print __('Month');?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="cron-counter-value">
-                                                            <?php echo $data[$key]['MONTH'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;">
-                                                <table>
-                                                    <tr>
-                                                        <td class="cron-counter-name">
-                                                            <?php print __('Day of week');?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="cron-counter-value">
-                                                            <?php echo $data[$key]['WDAY'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-
-                            <?php
-                                }
-                            ?> 
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="job[]" value="<?php echo $data[$key]['JOB'] ?>" ></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                         </table>
-                        </from>
-
-                        <table class="data-count">
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                <?php print __('delete');?> 
+                                <input type="hidden" name="delete_url" value="/delete/cron/?job=<?php echo $data[$key]['JOB']; ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('DELETE_CRON_CONFIRMATION');?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a href="/edit/cron/?job=<?php echo $data[$key]['JOB'] ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit');?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="800px">
                             <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 cron job');
-                                        } else {
-                                            echo __('%s cron jobs',$i);
-                                        }
-                                    ?> 
+                                <td colspan=5 class="cron" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $data[$key]['CMD'] ?></b>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;"  width="80px">
+                                    <table>
+                                        <tr>
+                                            <td class="cron-counter-name">
+                                                <?php print __('Min');?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="cron-counter-value">
+                                                <?php echo $data[$key]['MIN'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;"  width="80px">
+                                    <table>
+                                        <tr>
+                                            <td class="cron-counter-name">
+                                                <?php print __('Hour');?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="cron-counter-value">
+                                                <?php echo $data[$key]['HOUR'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;"  width="80px">
+                                    <table>
+                                        <tr>
+                                            <td class="cron-counter-name">
+                                                <?php print __('Day');?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="cron-counter-value">
+                                                <?php echo $data[$key]['DAY'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;"  width="80px">
+                                    <table>
+                                        <tr>
+                                            <td class="cron-counter-name">
+                                                <?php print __('Month');?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="cron-counter-value">
+                                                <?php echo $data[$key]['MONTH'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;">
+                                    <table>
+                                        <tr>
+                                            <td class="cron-counter-name">
+                                                <?php print __('Day of week');?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="cron-counter-value">
+                                                <?php echo $data[$key]['WDAY'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+
+                <?php
+                    }
+                ?> 
+            </table>
+            </from>
+
+            <table class="data-count">
+                <tr>
+                    <td width="160px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 cron job');
+                            } else {
+                                echo __('%s cron jobs',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
 
diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html
index ff5dac84..4d2b0401 100644
--- a/web/templates/user/list_db.html
+++ b/web/templates/user/list_db.html
@@ -1,161 +1,159 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/db/'"> <?php print __('Add Database');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/db/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="delete"><?php print __('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/add/db/'"> <?php print __('Add Database');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                                <input type="text" name="q" class="submenu-search-field">
+                                <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/db/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <table class='data'>
-                            <?php
-                                list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"] . ":");
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend' ;
-                                    }
-                                    if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
-                                    if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
-                                    if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/";
-                                    if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin";
-                                    if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/";
-                            ?> 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="database[]" value="<?php echo $key ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                        <span class="do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php echo __('delete') ?> 
-                                            <input type="hidden" name="delete_url" value="/delete/db/?database=<?php echo "$key" ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __('DELETE_DATABASE_CONFIRMATION',$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a href="/edit/db/?database=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit');?> 
-                                        </span>
-                                    </a>
-                                    <a href="<?php echo $db_admin_link; ?>" target="_blank" class="data-controls">
-                                        <span>
-                                            <img src="/images/new_window.png" width="8px" height="8px">
-                                            <?php print __('open %s',$db_admin);?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="chart1" style="padding: 10px 0 0px 2px"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                            <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="260">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('User');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['DBUSER'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Host');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['HOST'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td rowspan=4 style="vertical-align:top;" width="300">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Charset');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['CHARSET'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Type');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['TYPE'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                            <?php
-                                }
-                            ?>
+        <div id="vstobjects">
+            <table class='data'>
+                <?php
+                    list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"] . ":");
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend' ;
+                        }
+                        if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
+                        if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
+                        if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/";
+                        if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin";
+                        if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/";
+                ?> 
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="database[]" value="<?php echo $key ?>" ></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                         </table>
-                        </form>
-
-                        <table class="data-count">
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                <?php echo __('delete') ?> 
+                                <input type="hidden" name="delete_url" value="/delete/db/?database=<?php echo "$key" ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('DELETE_DATABASE_CONFIRMATION',$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a href="/edit/db/?database=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit');?> 
+                            </span>
+                        </a>
+                        <a href="<?php echo $db_admin_link; ?>" target="_blank" class="data-controls">
+                            <span>
+                                <img src="/images/new_window.png" width="8px" height="8px">
+                                <?php print __('open %s',$db_admin);?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
                             <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 database');
-                                        } else {
-                                            echo __('%s databases',$i);
-                                        }
-                                    ?>
+                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="chart1" style="padding: 10px 0 0px 2px"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="260">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('User');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['DBUSER'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Host');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['HOST'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Charset');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['CHARSET'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Type');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['TYPE'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+                <?php
+                    }
+                ?>
+            </table>
+            </form>
+
+            <table class="data-count">
+                <tr>
+                    <td width="160px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 database');
+                            } else {
+                                echo __('%s databases',$i);
+                            }
+                        ?>
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html
index 356a0321..b51a7003 100644
--- a/web/templates/user/list_dns.html
+++ b/web/templates/user/list_dns.html
@@ -1,148 +1,145 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/dns/'"> <?php print __('Add DNS Domain');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/dns/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="delete"><?php print __('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <div id="vstobjects">
-                        <table class="data">
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend' ;
-                                    }
-                            ?> 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status) ?></b></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                        <span class="do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print __('delete');?> 
-                                            <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a href="/edit/dns/?domain=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit');?> 
-                                        </span>
-                                    </a>
-                                    <a href="/add/dns/?domain=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/add.png" width="8px" height="8px">
-                                            <?php print __('add record');?> 
-                                        </span>
-                                    </a>
-                                    <a href="/list/dns/?domain=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/more.png" width="8px" height="8px">
-                                            <?php print __('list records',$data[$key]['RECORDS']); ?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name" style="padding: 0 0 0 2px;">
-                                                            <?php echo $data[$key]['IP'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name" style="padding: 0 0 0 2px;">
-                                                            <?php print $data[$key]['SRC'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="270">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Template');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['TPL'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('SOA') ?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td rowspan=4 style="vertical-align:top;" width="300">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('TTL') ?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Expire');?>:</td>
-                                                        <td class="counter-value"><?php echo strftime("%d %b %Y", strtotime($data[$key]['EXP'])) ?></td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                            <?php
-                                }
-                            ?> 
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/add/dns/'"> <?php print __('Add DNS Domain');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                                <input type="text" name="q" class="submenu-search-field">
+                                <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/dns/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
+        <div id="vstobjects">
+            <table class="data">
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend' ;
+                        }
+                ?> 
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status) ?></b></td></tr>
                         </table>
-                        </form>
-
-                        <table class="data-count">
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                <?php print __('delete');?> 
+                                <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $key ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a href="/edit/dns/?domain=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit');?> 
+                            </span>
+                        </a>
+                        <a href="/add/dns/?domain=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/add.png" width="8px" height="8px">
+                                <?php print __('add record');?> 
+                            </span>
+                        </a>
+                        <a href="/list/dns/?domain=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/more.png" width="8px" height="8px">
+                                <?php print __('list records',$data[$key]['RECORDS']); ?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
                             <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 domain');
-                                        } else {
-                                            echo __('%s domains',$i);
-                                        }
-                                    ?> 
+                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name" style="padding: 0 0 0 2px;">
+                                                <?php echo $data[$key]['IP'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name" style="padding: 0 0 0 2px;">
+                                                <?php print $data[$key]['SRC'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="270">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Template');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['TPL'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('SOA') ?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('TTL') ?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Expire');?>:</td>
+                                            <td class="counter-value"><?php echo strftime("%d %b %Y", strtotime($data[$key]['EXP'])) ?></td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+                <?php
+                    }
+                ?> 
+            </table>
+            </form>
+
+            <table class="data-count">
+                <tr>
+                    <td width="160px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 domain');
+                            } else {
+                                echo __('%s domains',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html
index 54b0a4e7..6546677b 100644
--- a/web/templates/user/list_dns_rec.html
+++ b/web/templates/user/list_dns_rec.html
@@ -1,104 +1,103 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add DNS Record') ?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/dns/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="delete"><?php print __('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-                    <div id="vstobjects">
-                        <div style="height:10px; font-size:0;"></div>
-                            <table class="data" style="background: #ebe9dc;">
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add DNS Record') ?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                                <input type="text" name="q" class="submenu-search-field">
+                                <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/dns/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
+
+        <div id="vstobjects">
+            <div style="height:10px; font-size:0;"></div>
+                <table class="data" style="background: #ebe9dc;">
+                    <tr>
+                        <td style="padding: 8px 2px 8px 0;">
+                            <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
+                        </td>
+                    </tr>
+                </table>
+                <div style="height:10px; font-size:0;"></div>
+                <table class="data">
+                    <?php
+                        foreach ($data as $key => $value) {
+                            ++$i;
+                            if ($data[$key]['SUSPENDED'] == 'yes') {
+                                $status = 'suspended';
+                                $spnd_action = 'unsuspend' ;
+                            } else {
+                                $status = 'active';
+                                $spnd_action = 'suspend' ;
+                            }
+                    ?> 
+                    <tr class="data-row">
+                        <td class="data-dotted" width="150">
+                            <table class="data-col1">
+                                <tr><td><input type="checkbox" class="ch-toggle" name="record[]" value="<?php echo $data[$key]['ID']?>" > <input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
+                                <tr><td></td></tr>
+                            </table>
+                        </td>
+                        <td class="data-dotted" width="830px">
+                            <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                                <span class="do_delete">
+                                    <img src="/images/delete.png" width="7px" height="7px">
+                                    <?php print __('delete');?>
+                                    <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
+                                    <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                        <p class="counter-value"><?php print __('DELETE_RECORD_CONFIRMATION',$data[$key]['RECORD']);?></p>
+                                    </div>
+                                </span>
+                            </a>
+                            <a href="/edit/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" class="data-controls">
+                                <span>
+                                    <img src="/images/edit.png" width="8px" height="8px">
+                                    <?php print __('edit');?> 
+                                </span>
+                            </a>
+                            <table class="data-col5" width="780px">
                                 <tr>
-                                    <td style="padding: 8px 2px 8px 0;">
-                                        <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
-                                    </td>
+                                    <td class="log" style="padding: 0 0 0 4px;" width="200"><b><?php echo $data[$key]['RECORD'] ?></b></td>
+                                    <td class="log-counter-value" width="80"><?php echo $data[$key]['TYPE'] ?></td>
+                                    <td class="log-counter-value" width="80"><?php echo $data[$key]['PRIORITY'] ?></td>
+                                    <td class="log-counter-value" ><?php echo $data[$key]['VALUE'] ?></td>
                                 </tr>
                             </table>
-                            <div style="height:10px; font-size:0;"></div>
-                            <table class="data">
-                                <?php
-                                    foreach ($data as $key => $value) {
-                                        ++$i;
-                                        if ($data[$key]['SUSPENDED'] == 'yes') {
-                                            $status = 'suspended';
-                                            $spnd_action = 'unsuspend' ;
-                                        } else {
-                                            $status = 'active';
-                                            $spnd_action = 'suspend' ;
-                                        }
-                                ?> 
-                                <tr class="data-row">
-                                    <td class="data-dotted" width="150">
-                                        <table class="data-col1">
-                                            <tr><td><input type="checkbox" class="ch-toggle" name="record[]" value="<?php echo $data[$key]['ID']?>" > <input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
-                                            <tr><td></td></tr>
-                                        </table>
-                                    </td>
-                                    <td class="data-dotted" width="830px">
-                                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                            <span class="do_delete">
-                                                <img src="/images/delete.png" width="7px" height="7px">
-                                                <?php print __('delete');?>
-                                                <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
-                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                    <p class="counter-value"><?php print __('DELETE_RECORD_CONFIRMATION',$data[$key]['RECORD']);?></p>
-                                                </div>
-                                            </span>
-                                        </a>
-                                        <a href="/edit/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" class="data-controls">
-                                            <span>
-                                                <img src="/images/edit.png" width="8px" height="8px">
-                                                <?php print __('edit');?> 
-                                            </span>
-                                        </a>
-                                        <table class="data-col5" width="780px">
-                                            <tr>
-                                                <td class="log" style="padding: 0 0 0 4px;" width="200"><b><?php echo $data[$key]['RECORD'] ?></b></td>
-                                                <td class="log-counter-value" width="80"><?php echo $data[$key]['TYPE'] ?></td>
-                                                <td class="log-counter-value" width="80"><?php echo $data[$key]['PRIORITY'] ?></td>
-                                                <td class="log-counter-value" ><?php echo $data[$key]['VALUE'] ?></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                </tr>
-                                <?php
-                                    }
-                                ?>
-                            </table>
-                        </form>
-                        <table class="data-count">
-                            <tr>
-                                <td width="160px">
-                                </td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 record');
-                                        } else {
-                                            echo __('%s records',$i);
-                                        }
-                                    ?> 
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
+                        </td>
+                    </tr>
+                    <?php
+                        }
+                    ?>
+                </table>
+            </form>
+            <table class="data-count">
+                <tr>
+                    <td width="160px">
+                    </td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 record');
+                            } else {
+                                echo __('%s records',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html
index fb9ca5c6..f8294ff0 100644
--- a/web/templates/user/list_mail.html
+++ b/web/templates/user/list_mail.html
@@ -1,171 +1,169 @@
-                               <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/mail/'"> <?php print __('Add Mail Domain');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/mail/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                    <select class="submenu-select-dropdown" name="action">
-                                                        <option value=""><?php print __('apply to selected');?></option>
-                                                        <option value="delete"><?php print __('delete');?></option>
-                                                    </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+                <table class="submenu">
+                    <tr>
+                        <td style="padding: 12px 8px">
+                            <div class="submenu-button-block">
+                                <button class="submenu-button" onclick="location.href='/add/mail/'"> <?php print __('Add Mail Domain');?> </button>
+                            </div>
+                            <div class="submenu-search-block">
+                                <form action="/search/" method="get">
+                                <input type="text" name="q" class="submenu-search-field">
+                                <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                                </form>
+                            </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/mail/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <table class="data">
-                            <?php
-                                list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"] . ":");
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend' ;
-                                    }
-                                    if (empty($data[$key]['CATCHALL'])) {
-                                        $data[$key]['CATCHALL'] = '/dev/null';
-                                    }
-                            ?> 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                        <span class="do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print __('delete');?> 
-                                            <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a href="/edit/mail/?domain=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit');?> 
-                                        </span>
-                                    </a>
-                                    <a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank" class="data-controls">
-                                        <span>
-                                            <img src="/images/new_window.png" width="8px" height="8px">
-                                            <?php print __('open webmail');?> 
-                                        </span>
-                                    </a>
-                                    <a href="/add/mail/?domain=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/add.png" width="8px" height="8px">
-                                            <?php print __('add account');?> 
-                                        </span>
-                                    </a>
-                                    <a href="?domain=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/more.png" width="8px" height="8px">
-                                            <?php print __('list accounts',$data[$key]['ACCOUNTS']); ?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="chart1" style="padding: 10px 0 2px 0">
-                                                            <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                            <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="260">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('AntiVirus Support');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo __($data[$key]['ANTIVIRUS']) ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('AntiSpam Support');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo __($data[$key]['ANTISPAM']) ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td rowspan=4 style="vertical-align:top;" width="300">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('DKIM Support');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo __($data[$key]['DKIM']) ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Catchall email');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['CATCHALL'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                            <?php
-                                }
-                            ?> 
+        <div id="vstobjects">
+            <table class="data">
+                <?php
+                    list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"] . ":");
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend' ;
+                        }
+                        if (empty($data[$key]['CATCHALL'])) {
+                            $data[$key]['CATCHALL'] = '/dev/null';
+                        }
+                ?> 
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                         </table>
-                        </form>
-                        <table class="data-count">
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                <?php print __('delete');?> 
+                                <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $key ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a href="/edit/mail/?domain=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit');?> 
+                            </span>
+                        </a>
+                        <a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank" class="data-controls">
+                            <span>
+                                <img src="/images/new_window.png" width="8px" height="8px">
+                                <?php print __('open webmail');?> 
+                            </span>
+                        </a>
+                        <a href="/add/mail/?domain=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/add.png" width="8px" height="8px">
+                                <?php print __('add account');?> 
+                            </span>
+                        </a>
+                        <a href="?domain=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/more.png" width="8px" height="8px">
+                                <?php print __('list accounts',$data[$key]['ACCOUNTS']); ?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
                             <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 domain');
-                                        } else {
-                                            echo __('%s domains',$i);
-                                        }
-                                    ?> 
+                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="chart1" style="padding: 10px 0 2px 0">
+                                                <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="260">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('AntiVirus Support');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo __($data[$key]['ANTIVIRUS']) ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('AntiSpam Support');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo __($data[$key]['ANTISPAM']) ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('DKIM Support');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo __($data[$key]['DKIM']) ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Catchall email');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['CATCHALL'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+                <?php
+                    }
+                ?> 
+            </table>
+            </form>
+            <table class="data-count">
+                <tr>
+                    <td width="160px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 domain');
+                            } else {
+                                echo __('%s domains',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html
index cc8b37d1..1bfeb0ba 100644
--- a/web/templates/user/list_mail_acc.html
+++ b/web/templates/user/list_mail_acc.html
@@ -1,153 +1,150 @@
-                               <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/mail/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add Mail Account');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/mail/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value="apply to selected"><?php print __('apply to selected');?></option>
-                                                    <option value="delete"><?php print __('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+           <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/add/mail/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add Mail Account');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                                <input type="text" name="q" class="submenu-search-field">
+                                <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/mail/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value="apply to selected"><?php print __('apply to selected');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
+        <div id="vstobjects">
+            <div style="height:10px; font-size:0;"></div>
+            <table class="data" style="background: #ebe9dc;">
+                <tr>
+                    <td style="padding: 8px 2px 8px 0;">
+                        <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
+                    </td>
+                </tr>
+            </table>
+            <div style="height:10px; font-size:0;"></div>
+            <table class="data">
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend';
+                        }
+                ?>
 
-                    <div id="vstobjects">
-                        <div style="height:10px; font-size:0;"></div>
-                        <table class="data" style="background: #ebe9dc;">
-                            <tr>
-                                <td style="padding: 8px 2px 8px 0;">
-                                    <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
-                                </td>
-                            </tr>
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="account[]" value="<?php echo $key?>" ><input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                         </table>
-                        <div style="height:10px; font-size:0;"></div>
-                        <table class="data">
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend';
-                                    }
-                            ?>
-
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="account[]" value="<?php echo $key?>" ><input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                <?php print __('delete');?> 
+                                <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('DELETE_MAIL_ACCOUNT_CONFIRMATION',$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a href="/edit/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit');?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
+                            <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name" style="padding: 4px 0 0 0;">
+                                                <?php echo $data[$key]['IP'] ?> 
+                                            </td>
+                                        <tr>
+                                            <td class="chart1" style="padding: 2px 0 2px 0">
+                                                <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
                                     </table>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                        <span class="do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print __('delete');?> 
-                                            <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __('DELETE_MAIL_ACCOUNT_CONFIRMATION',$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a href="/edit/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit');?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
+                                <td style="vertical-align:top;" width="200">
+                                    <table>
                                         <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name" style="padding: 4px 0 0 0;">
-                                                            <?php echo $data[$key]['IP'] ?> 
-                                                        </td>
-                                                    <tr>
-                                                        <td class="chart1" style="padding: 2px 0 2px 0">
-                                                            <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                            <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                            <td class="counter-name">
+                                                <?php print __('Quota');?>:
                                             </td>
-                                            <td style="vertical-align:top;" width="200">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Quota');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['QUOTA'] ?> 
-                                                        </td>
-                                                        </tr>
-                                                        <tr>
-                                                            <td class="counter-name">
-                                                                <?php print __('Autoreply');?>:
-                                                            </td>
-                                                            <td class="counter-value">
-                                                                <?php echo __($data[$key]['AUTOREPLY']) ?> 
-                                                            </td>
-                                                        </tr>
-                                                </table>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['QUOTA'] ?> 
                                             </td>
-                                            <td rowspan=4 style="vertical-align:top;" width="350">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Forward to');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo str_replace(',', ', ', $data[$key]['FWD']) ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                            </tr>
+                                            <tr>
+                                                <td class="counter-name">
+                                                    <?php print __('Autoreply');?>:
+                                                </td>
+                                                <td class="counter-value">
+                                                    <?php echo __($data[$key]['AUTOREPLY']) ?> 
+                                                </td>
+                                            </tr>
+                                    </table>
+                                </td>
+                                <td rowspan=4 style="vertical-align:top;" width="350">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Forward to');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo str_replace(',', ', ', $data[$key]['FWD']) ?> 
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
                             </tr>
-                            <?php
-                                }
-                            ?> 
                         </table>
-                        </form>
+                    </td>
+                </tr>
+                <?php
+                    }
+                ?> 
+            </table>
+            </form>
 
-                        <table class="data-count">
-                            <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 mail account');
-                                        } else {
-                                            echo __('%s mail accounts',$i);
-                                        }
-                                    ?> 
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
+            <table class="data-count">
+                <tr>
+                    <td width="160px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 mail account');
+                            } else {
+                                echo __('%s mail accounts',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/user/list_search.html b/web/templates/user/list_search.html
index 831225d4..5038e03f 100644
--- a/web/templates/user/list_search.html
+++ b/web/templates/user/list_search.html
@@ -1,167 +1,165 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div style="submenu-button-block">
-                                                <a style="float:left; font-size: 16pt; color: #555;"><b><?php print __('Search Results');?></b></a>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div style="submenu-button-block">
+                            <a style="float:left; font-size: 16pt; color: #555;"><b><?php print __('Search Results');?></b></a>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                                <input type="text" name="q" class="submenu-search-field">
+                                <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <table class="data">
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend';
-                                    }
-                                    if ($data[$key]['TYPE'] == 'db') {
-                                        $object = 'database';
-                                    } else {
-                                        $object = strtolower($data[$key]['TYPE']." ".$data[$key]['KEY']);
-                                    }
-                            ?>
+        <div id="vstobjects">
+            <table class="data">
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend';
+                        }
+                        if ($data[$key]['TYPE'] == 'db') {
+                            $object = 'database';
+                        } else {
+                            $object = strtolower($data[$key]['TYPE']." ".$data[$key]['KEY']);
+                        }
+                ?>
 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150px">
-                                    <table class="data-col1" width="150">
-                                        <tr><td style="padding: 24 0 4 0;"><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
+                <tr class="data-row">
+                    <td class="data-dotted" width="150px">
+                        <table class="data-col1" width="150">
+                            <tr><td style="padding: 24 0 4 0;"><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <?php
+                            if ($data[$key]['KEY'] == 'RECORD') {
+                                $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'DELETE_RECORD_CONFIRMATION';
+                            }
+                            if ($data[$key]['KEY'] == 'ACCOUNT') {
+                                $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'DELETE_USER_CONFIRMATION';
+                            }
+                            if ($data[$key]['KEY'] == 'JOB') {
+                                $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'DELETE_CRON_CONFIRMATION';
+                            }
+                            if ($data[$key]['KEY'] == 'DATABASE') {
+                                $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'DELETE_DATABASE_CONFIRMATION';
+                            }
+                            if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
+                                $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'DELETE_DOMAIN_CONFIRMATION';
+                            }
+                        ?> 
+                        <a id="delete_link_<?php echo $i ?>" class="do_delete">
+                            <span class="data-controls do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                <?php print __('delete');?> 
+                                <input type="hidden" name="delete_url" value="<?php echo $delete_lnk; ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
+                                    <p class="counter-value"><?php print __($cnfrm,$data[$key]['RESULT']);?></p>
+                                </div>
+                            </span>
+                        </a>
+
+                        <?php
+                            if ($data[$key]['KEY'] == 'RECORD') {
+                                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                            }
+                            if ($data[$key]['KEY'] == 'ACCOUNT') {
+                                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                            }
+                            if ($data[$key]['KEY'] == 'JOB') {
+                                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                            }
+                            if ($data[$key]['KEY'] == 'DATABASE') {
+                                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                            }
+                            if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
+                                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                            }
+                        ?> 
+                        <a href="<?php echo $edit_lnk; ?>">
+                            <span class="data-controls">
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit'); ?> 
+                            </span>
+                        </a>
+
+                        <table class="data-col2" width="830px">
+                            <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $data[$key]['RESULT'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Object');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $object ?> 
+                                            </td>
+                                        </tr>
                                     </table>
                                 </td>
-                                <td class="data-dotted" width="830px">
-                                    <?php
-                                        if ($data[$key]['KEY'] == 'RECORD') {
-                                            $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'DELETE_RECORD_CONFIRMATION';
-                                        }
-                                        if ($data[$key]['KEY'] == 'ACCOUNT') {
-                                            $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'DELETE_USER_CONFIRMATION';
-                                        }
-                                        if ($data[$key]['KEY'] == 'JOB') {
-                                            $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'DELETE_CRON_CONFIRMATION';
-                                        }
-                                        if ($data[$key]['KEY'] == 'DATABASE') {
-                                            $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'DELETE_DATABASE_CONFIRMATION';
-                                        }
-                                        if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
-                                            $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'DELETE_DOMAIN_CONFIRMATION';
-                                        }
-                                    ?> 
-                                    <a id="delete_link_<?php echo $i ?>" class="do_delete">
-                                        <span class="data-controls do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print __('delete');?> 
-                                            <input type="hidden" name="delete_url" value="<?php echo $delete_lnk; ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
-                                                <p class="counter-value"><?php print __($cnfrm,$data[$key]['RESULT']);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-
-                                    <?php
-                                        if ($data[$key]['KEY'] == 'RECORD') {
-                                            $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                        }
-                                        if ($data[$key]['KEY'] == 'ACCOUNT') {
-                                            $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                        }
-                                        if ($data[$key]['KEY'] == 'JOB') {
-                                            $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                        }
-                                        if ($data[$key]['KEY'] == 'DATABASE') {
-                                            $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
-                                        }
-                                        if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
-                                            $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
-                                        }
-                                    ?> 
-                                    <a href="<?php echo $edit_lnk; ?>">
-                                        <span class="data-controls">
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit'); ?> 
-                                        </span>
-                                    </a>
-
-                                    <table class="data-col2" width="830px">
-                                        <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $data[$key]['RESULT'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
+                                <td style="vertical-align:top;" width="200">
+                                    <table>
                                         <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Object');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $object ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                            <td class="counter-name">
+                                                <?php print __('Owner');?>:
                                             </td>
-                                            <td style="vertical-align:top;" width="200">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Owner');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['USER'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['USER'] ?> 
                                             </td>
-                                            <td style="vertical-align:top;" width="350">
-                                                <table >
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Status');?>:
-                                                        </td>
-                                                        <td class="counter-value" style="padding: 0 0 0 8px;">
-                                                            <?php echo __($status); ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="350">
+                                    <table >
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Status');?>:
+                                            </td>
+                                            <td class="counter-value" style="padding: 0 0 0 8px;">
+                                                <?php echo __($status); ?> 
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
                             </tr>
-                            <?php
-                                }
-                            ?> 
                         </table>
-                        </form>
+                    </td>
+                </tr>
+                <?php
+                    }
+                ?> 
+            </table>
+            </form>
 
-                        <table class="data-count">
-                            <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1){
-                                            echo __('1 object');
-                                        } else {
-                                            echo __('%s objects',$i);
-                                        }
-                                    ?> 
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
+            <table class="data-count">
+                <tr>
+                    <td width="160px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1){
+                                echo __('1 object');
+                            } else {
+                                echo __('%s objects',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/user/list_stats.html b/web/templates/user/list_stats.html
index 339d590a..664482d8 100644
--- a/web/templates/user/list_stats.html
+++ b/web/templates/user/list_stats.html
@@ -1,196 +1,194 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <table class='data'>
+        <div id="vstobjects">
+            <table class='data'>
 
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                            ?>
-
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150px">
-                                    <table class="data-col1" width="150">
-                                        <tr><td style="padding: 24 0 4 0;"><a class="data-date" ><?php echo strftime("%d %b %Y", strtotime($key))?></a></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <div style="height:20px; width:20px;"></div>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td colspan=3 class="username" style="padding: 10 0 0 4px;">
-                                                <b><?php echo strftime("%b %Y", strtotime($key))?></b>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="chart1" colspan=2 style="padding: 4px 0 0 2px;">
-                                                            <?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
-                                                            <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
-                                                            <?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
-                                                            <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan=2>
-                                                            <table class="chart2">
-                                                                <tr>
-                                                                    <td>
-                                                                        <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?>
-                                                                    </td>
-                                                                    <td style="padding: 0px 0px 0px 4px">
-                                                                        <?php print __('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?>
-                                                                    </td>
-                                                                </tr>
-                                                                <tr>
-                                                                    <td>
-                                                                        <?php print __('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?>
-                                                                    </td>
-                                                                    <td style="padding: 0px 0px 0px 4px">
-                                                                        <?php print __('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?>
-                                                                    </td>
-                                                                </tr>
-                                                            </table>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="280">
-                                                <table width="280">
-                                                    <tr>
-                                                        <td class="counter-name" width="37%">
-                                                            <?php print __('Web Domains');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_WEB_DOMAINS'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('SSL Domains');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_WEB_SSL'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Web Aliases');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_WEB_ALIASES'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('DNS domains');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_DNS_DOMAINS'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('DNS records');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_DNS_RECORDS'] ?>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="250">
-                                                <table class="data-col4" width="250">
-                                                    <tr>
-                                                        <td class="counter-name" width="50%">
-                                                            <?php print __('Mail Domains');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_MAIL_DOMAINS'] ?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Mail Accounts');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_MAIL_ACCOUNTS'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Databases');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_DATABASES'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('Cron Jobs');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['U_CRON_JOBS'] ?>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name">
-                                                            <?php print __('IP Addresses');?>:
-                                                        </td>
-                                                        <td class="counter-value">
-                                                            <?php echo $data[$key]['IP_OWNED'] ?> 
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-
-                            <?php
-                                }
-                            ?> 
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                ?>
 
+                <tr class="data-row">
+                    <td class="data-dotted" width="150px">
+                        <table class="data-col1" width="150">
+                            <tr><td style="padding: 24 0 4 0;"><a class="data-date" ><?php echo strftime("%d %b %Y", strtotime($key))?></a></td></tr>
                         </table>
-
-                        <table class="data-count">
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <div style="height:20px; width:20px;"></div>
+                        <table class="data-col2" width="830px">
                             <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 month');
-                                        } else {
-                                            echo __('%s months',$i);
-                                        }
-                                    ?>
+                                <td colspan=3 class="username" style="padding: 10 0 0 4px;">
+                                    <b><?php echo strftime("%b %Y", strtotime($key))?></b>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="chart1" colspan=2 style="padding: 4px 0 0 2px;">
+                                                <?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
+                                                <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
+                                                <?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
+                                                <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan=2>
+                                                <table class="chart2">
+                                                    <tr>
+                                                        <td>
+                                                            <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?>
+                                                        </td>
+                                                        <td style="padding: 0px 0px 0px 4px">
+                                                            <?php print __('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <?php print __('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?>
+                                                        </td>
+                                                        <td style="padding: 0px 0px 0px 4px">
+                                                            <?php print __('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="280">
+                                    <table width="280">
+                                        <tr>
+                                            <td class="counter-name" width="37%">
+                                                <?php print __('Web Domains');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_WEB_DOMAINS'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('SSL Domains');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_WEB_SSL'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Web Aliases');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_WEB_ALIASES'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('DNS domains');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_DNS_DOMAINS'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('DNS records');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_DNS_RECORDS'] ?>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="250">
+                                    <table class="data-col4" width="250">
+                                        <tr>
+                                            <td class="counter-name" width="50%">
+                                                <?php print __('Mail Domains');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_MAIL_DOMAINS'] ?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Mail Accounts');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_MAIL_ACCOUNTS'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Databases');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_DATABASES'] ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('Cron Jobs');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['U_CRON_JOBS'] ?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name">
+                                                <?php print __('IP Addresses');?>:
+                                            </td>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['IP_OWNED'] ?> 
+                                            </td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+
+                <?php
+                    }
+                ?> 
+
+            </table>
+
+            <table class="data-count">
+                <tr>
+                    <td width="160px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 month');
+                            } else {
+                                echo __('%s months',$i);
+                            }
+                        ?>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html
index e7f5a06c..928c7150 100644
--- a/web/templates/user/list_user.html
+++ b/web/templates/user/list_user.html
@@ -1,190 +1,187 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/web/'"> <?php print __('Add Web Domain') ?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/user/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="update counters"><?php print __('update counters');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/add/web/'"> <?php print __('Add Web Domain') ?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/user/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="update counters"><?php print __('update counters');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
+        <div id="vstobjects">
+            <table class="data">
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend' ;
+                        }
+                    ?>
 
-                    <div id="vstobjects">
-                        <table class="data">
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend' ;
-                                    }
-                                ?>
-
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="user[]" value="<?php echo $key ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a><td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a href="/edit/user/?user=<?php echo "$key" ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit');?> 
-                                        </span>
-                                    </a>
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td colspan=3 class="username" style="padding: 0 0 0 4px;"><b><?php echo $key ?></b><a class="fullname"><?php echo $data[$key]['FNAME']?> <?php echo $data[$key]['LNAME']?></a></td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;"  width="260">
-                                                <table>
-                                                    <tr><td colspan=2 class="counter-name"  style="padding: 0 0 0 2px;"><?php echo $data[$key]['CONTACT']?></td></tr>
-                                                    <tr><td colspan=2 class="counter-name"  style="padding: 0 0 8px 2px;">[<?php echo $data[$key]['PACKAGE']?>] <?php print __('package');?></td></tr>
-                                                    <tr>
-                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
-                                                            <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
-                                                            <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td colspan=2 style="padding: 2px 0 0 0;">
-                                                            <table class="chart2">
-                                                                <tr>
-                                                                    <td>
-                                                                        <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?>
-                                                                    </td>
-                                                                    <td style="padding: 0px 0px 0px 4px">
-                                                                        <?php print __('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?>
-                                                                    </td>
-                                                                </tr>
-                                                                <tr>
-                                                                    <td>
-                                                                        <?php print __('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?>
-
-                                                                    </td>
-                                                                    <td style="padding: 0px 0px 0px 4px">
-                                                                        <?php print __('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?>
-                                                                    </td>
-                                                                </tr>
-                                                            </table>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="300">
-                                                <table width="290">
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Web Domains');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?> / <?php echo $data[$key]['WEB_DOMAINS'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('SSL Domains');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['U_WEB_SSL'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Web Aliases');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> <?php print __('per domain');?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('DNS domains');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['U_DNS_DOMAINS'] ?> / <?php echo $data[$key]['DNS_DOMAINS'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('DNS records');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> <?php print __('per domain');?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Name Servers');?>:<br></td>
-                                                        <td class="counter-value"><?php echo str_replace(',', ', ',$data[$key]['NS']) ?></td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;">
-                                                <table class="data-col4">
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Mail Domains');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?> / <?php echo $data[$key]['MAIL_DOMAINS'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Mail Accounts');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> <?php print __('per domain');?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Databases');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['U_DATABASES'] ?> / <?php echo $data[$key]['DATABASES'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Cron Jobs');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['U_CRON_JOBS'] ?> / <?php echo $data[$key]['CRON_JOBS'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('SSH Access');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['SHELL'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('IP Addresses');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['IP_OWNED'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Backups');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['U_BACKUPS'] ?> / <?php echo $data[$key]['BACKUPS'] ?></td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                            <?php
-                                }
-                            ?> 
+                <tr class="data-row">
+                    <td class="data-dotted">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="user[]" value="<?php echo $key ?>" ></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a><td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                         </table>
-                        </form>
-
-                        <table class="data-count">
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a href="/edit/user/?user=<?php echo "$key" ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit');?> 
+                            </span>
+                        </a>
+                        <table class="data-col2" width="830px">
                             <tr>
-                                <td width="160px"></td>
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 account');
-                                        } else {
-                                            echo __('%s accounts',$i);
-                                        }
-                                    ?> 
+                                <td colspan=3 class="username" style="padding: 0 0 0 4px;"><b><?php echo $key ?></b><a class="fullname"><?php echo $data[$key]['FNAME']?> <?php echo $data[$key]['LNAME']?></a></td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;"  width="260">
+                                    <table>
+                                        <tr><td colspan=2 class="counter-name"  style="padding: 0 0 0 2px;"><?php echo $data[$key]['CONTACT']?></td></tr>
+                                        <tr><td colspan=2 class="counter-name"  style="padding: 0 0 8px 2px;">[<?php echo $data[$key]['PACKAGE']?>] <?php print __('package');?></td></tr>
+                                        <tr>
+                                            <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
+                                                <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
+                                                <div style="width:160px; height:7px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan=2 style="padding: 2px 0 0 0;">
+                                                <table class="chart2">
+                                                    <tr>
+                                                        <td>
+                                                            <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?>
+                                                        </td>
+                                                        <td style="padding: 0px 0px 0px 4px">
+                                                            <?php print __('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <?php print __('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?>
+
+                                                        </td>
+                                                        <td style="padding: 0px 0px 0px 4px">
+                                                            <?php print __('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="300">
+                                    <table width="290">
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Web Domains');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?> / <?php echo $data[$key]['WEB_DOMAINS'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('SSL Domains');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_WEB_SSL'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Web Aliases');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> <?php print __('per domain');?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('DNS domains');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_DNS_DOMAINS'] ?> / <?php echo $data[$key]['DNS_DOMAINS'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('DNS records');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> <?php print __('per domain');?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Name Servers');?>:<br></td>
+                                            <td class="counter-value"><?php echo str_replace(',', ', ',$data[$key]['NS']) ?></td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;">
+                                    <table class="data-col4">
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Mail Domains');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?> / <?php echo $data[$key]['MAIL_DOMAINS'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Mail Accounts');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> <?php print __('per domain');?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Databases');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_DATABASES'] ?> / <?php echo $data[$key]['DATABASES'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Cron Jobs');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_CRON_JOBS'] ?> / <?php echo $data[$key]['CRON_JOBS'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('SSH Access');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['SHELL'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('IP Addresses');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['IP_OWNED'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Backups');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_BACKUPS'] ?> / <?php echo $data[$key]['BACKUPS'] ?></td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+                <?php
+                    }
+                ?> 
+            </table>
+            </form>
+
+            <table class="data-count">
+                <tr>
+                    <td width="160px"></td>
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 account');
+                            } else {
+                                echo __('%s accounts',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html
index 59042b3a..e736e244 100644
--- a/web/templates/user/list_web.html
+++ b/web/templates/user/list_web.html
@@ -1,216 +1,214 @@
-                                <table class="submenu">
-                                    <tr>
-                                        <td style="padding: 2px 0 0 6px">
-                                            <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/web/'"> <?php print __('Add Web Domain');?> </button>
-                                            </div>
-                                            <div class="submenu-search-block">
-                                                <form action="/search/" method="get">
-                                                    <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                                </form>
-                                            </div>
-                                            <div class="submenu-select-block">
-                                                <form action="/bulk/web/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                                                <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print __('apply to selected');?></option>
-                                                    <option value="delete"><?php print __('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+            <table class="submenu">
+                <tr>
+                    <td style="padding: 12px 8px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button" onclick="location.href='/add/web/'"> <?php print __('Add Web Domain');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
+                        <div class="submenu-select-block">
+                            <form action="/bulk/web/" method="post" id="objects">
+                            <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
+                            <select class="submenu-select-dropdown" name="action">
+                                <option value=""><?php print __('apply to selected');?></option>
+                                <option value="delete"><?php print __('delete');?></option>
+                            </select>
+                            <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div>
 
-                    <div id="vstobjects">
-                        <table class='data'>
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
-                                        $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend' ;
-                                        $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
-                                    }
-                                    if (!empty($data[$key]['SSL_HOME'])) {
-                                        if ($data[$key]['SSL_HOME'] == 'same') {
-                                            $ssl_home = 'public_html';
-                                        } else {
-                                            $ssl_home = 'public_shtml';
-                                        }
-                                    } else {
-                                        $ssl_home = '';
-                                    }
-                                    $web_stats='no';
-                                    if (!empty($data[$key]['STATS'])) {
-                                        $web_stats=$data[$key]['STATS'];
-                                    }
-                                    $ftp_user='no';
-                                    if (!empty($data[$key]['FTP_USER'])) {
-                                        $ftp_user=$data[$key]['FTP_USER'];
-                                    }
-                                    $proxy_support='no';
-                                    if (!empty($data[$key]['PROXY'])) {
-                                        $proxy_support='yes';
-                                    }
-                                    if (strlen($data[$key]['PROXY_EXT']) > 16 ) {
-                                        $proxy_ext_title = str_replace(',', ', ', $data[$key]['PROXY_EXT']);
-                                        $proxy_ext = substr($data[$key]['PROXY_EXT'], 0, 16);
-                                        $proxy_ext = trim($proxy_ext, ",");
-                                        $proxy_ext = str_replace(',', ', ', $proxy_ext);
-                                        $proxy_ext = $proxy_ext.", ...";
-                                    } else {
-                                        $proxy_ext_title = '';
-                                        $proxy_ext = str_replace(',', ', ', $data[$key]['PROXY_EXT']);
-                                    }
-                                ?> 
-                            <tr class="data-row">
-                                <td class="data-dotted" width="150">
-                                    <table class="data-col1">
-                                        <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo $key ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
-                                    </table>
-                                </td>
-                                <td class="data-dotted" width="830px">
-                                    <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                        <span class="do_delete">
-                                            <img src="/images/delete.png" width="7px" height="7px">
-                                             <?php print __('delete');?> 
-                                            <input type="hidden" name="delete_url" value="/delete/web/?domain=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                                <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
-                                            </div>
-                                        </span>
-                                    </a>
-                                    <a href="/edit/web/?domain=<?php echo $key ?>" class="data-controls">
-                                        <span>
-                                            <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print __('edit');?> 
-                                        </span>
-                                    </a>
-                                    <a href="/list/web-log/?domain=<?php echo $key ?>&type=access"  target="_blank" class="data-controls">
-                                        <span>
-                                            <img src="/images/new_window.png" width="8px" height="8px">
-                                            <?php print __('view logs');?> 
-                                        </span>
-                                    </a>
-                                    <?php
-                                        if (!empty($data[$key]['STATS'])) {
-                                    ?> 
-                                    <a href="http://<?php echo $key ?>/vstats/"  target="_blank" class="data-controls">
-                                        <span>
-                                            <img src="/images/new_window.png" width="8px" height="8px">
-                                            <?php print __('open webstats');?> 
-                                        </span>
-                                    </a>
-                                    <?php
-                                            }
-                                     ?> 
-                                    <table class="data-col2" width="830px">
-                                        <tr>
-                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo $key ?></b> <a class="aliases" style="padding: 0 30px 0 8px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td style="vertical-align:top;" >
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name" style="padding: 0 0 0 2px;">
-                                                            <?php echo $data[$key]['IP'] ?> 
-                                                        </td>
-                                                    <tr>
-                                                    <tr>
-                                                        <td class="chart1" style="padding: 4px 0 0 2px">
-                                                            <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
-                                                            <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="chart1" style="padding: 2px 0 0 2px"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                            <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                        </div>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                            <td style="vertical-align:top;" width="260">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Web Template');?>:</td>
-                                                        <td class="counter-value"><?php print __($data[$key]['TPL']) ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('SSL Support');?>:</td>
-                                                        <td class="counter-value"><?php print $data[$key]['SSL'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('SSL Home Directory');?>:</td>
-                                                        <td class="counter-value"><?php print $ssl_home ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Web Statistics');?>: </td>
-                                                        <td class="counter-value"> <?php print __($web_stats) ?></td>
-                                                    </tr>
-
-                                                </table>
-                                            </td>
-                                            <td rowspan=4 style="vertical-align:top;" width="300">
-                                                <table>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Proxy Support');?>:</td>
-                                                        <td class="counter-value"><?php print __($proxy_support);?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Proxy Template');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['PROXY'];?></td>
-                                                    </tr>
-
-                                                    <tr>
-                                                        <td class="counter-name"><?php print __('Proxy Extentions');?>:</td>
-                                                        <td class="counter-value" <?php if (!empty($proxy_ext_title)) echo "title='".$proxy_ext_title."'" ?>><?php echo $proxy_ext ?></td>
-                                                    </tr>
-
-                                                    <tr>
-                                                        <td class="counter-name"> <?php print __('Additional FTP Account');?>:</td>
-                                                        <td class="counter-value"> <?php print __($ftp_user) ?></td>
-                                                    </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                            <?php
+        <div id="vstobjects">
+            <table class='data'>
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend' ;
+                            $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend' ;
+                            $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
+                        }
+                        if (!empty($data[$key]['SSL_HOME'])) {
+                            if ($data[$key]['SSL_HOME'] == 'same') {
+                                $ssl_home = 'public_html';
+                            } else {
+                                $ssl_home = 'public_shtml';
+                            }
+                        } else {
+                            $ssl_home = '';
+                        }
+                        $web_stats='no';
+                        if (!empty($data[$key]['STATS'])) {
+                            $web_stats=$data[$key]['STATS'];
+                        }
+                        $ftp_user='no';
+                        if (!empty($data[$key]['FTP_USER'])) {
+                            $ftp_user=$data[$key]['FTP_USER'];
+                        }
+                        $proxy_support='no';
+                        if (!empty($data[$key]['PROXY'])) {
+                            $proxy_support='yes';
+                        }
+                        if (strlen($data[$key]['PROXY_EXT']) > 16 ) {
+                            $proxy_ext_title = str_replace(',', ', ', $data[$key]['PROXY_EXT']);
+                            $proxy_ext = substr($data[$key]['PROXY_EXT'], 0, 16);
+                            $proxy_ext = trim($proxy_ext, ",");
+                            $proxy_ext = str_replace(',', ', ', $proxy_ext);
+                            $proxy_ext = $proxy_ext.", ...";
+                        } else {
+                            $proxy_ext_title = '';
+                            $proxy_ext = str_replace(',', ', ', $data[$key]['PROXY_EXT']);
+                        }
+                    ?> 
+                <tr class="data-row">
+                    <td class="data-dotted" width="150">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo $key ?>" ></td></tr>
+                            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted" width="830px">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                 <?php print __('delete');?> 
+                                <input type="hidden" name="delete_url" value="/delete/web/?domain=<?php echo $key ?>" />
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a href="/edit/web/?domain=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit');?> 
+                            </span>
+                        </a>
+                        <a href="/list/web-log/?domain=<?php echo $key ?>&type=access"  target="_blank" class="data-controls">
+                            <span>
+                                <img src="/images/new_window.png" width="8px" height="8px">
+                                <?php print __('view logs');?> 
+                            </span>
+                        </a>
+                        <?php
+                            if (!empty($data[$key]['STATS'])) {
+                        ?> 
+                        <a href="http://<?php echo $key ?>/vstats/"  target="_blank" class="data-controls">
+                            <span>
+                                <img src="/images/new_window.png" width="8px" height="8px">
+                                <?php print __('open webstats');?> 
+                            </span>
+                        </a>
+                        <?php
                                 }
-                            ?> 
-                        </table>
-                        </form>
-
-                        <table class="data-count">
+                         ?> 
+                        <table class="data-col2" width="830px">
                             <tr>
-                                <td width="160px">
-                                <td>
-                                    <?php
-                                        if ( $i == 1) {
-                                            echo __('1 domain');
-                                        } else {
-                                            echo __('%s domains',$i);
-                                        }
-                                    ?> 
+                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                    <b><?php echo $key ?></b> <a class="aliases" style="padding: 0 30px 0 8px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:top;" >
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name" style="padding: 0 0 0 2px;">
+                                                <?php echo $data[$key]['IP'] ?> 
+                                            </td>
+                                        <tr>
+                                        <tr>
+                                            <td class="chart1" style="padding: 4px 0 0 2px">
+                                                <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
+                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="chart1" style="padding: 2px 0 0 2px"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                            </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="260">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Web Template');?>:</td>
+                                            <td class="counter-value"><?php print __($data[$key]['TPL']) ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('SSL Support');?>:</td>
+                                            <td class="counter-value"><?php print $data[$key]['SSL'] ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('SSL Home Directory');?>:</td>
+                                            <td class="counter-value"><?php print $ssl_home ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Web Statistics');?>: </td>
+                                            <td class="counter-value"> <?php print __($web_stats) ?></td>
+                                        </tr>
+
+                                    </table>
+                                </td>
+                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                    <table>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Proxy Support');?>:</td>
+                                            <td class="counter-value"><?php print __($proxy_support);?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Proxy Template');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['PROXY'];?></td>
+                                        </tr>
+
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Proxy Extentions');?>:</td>
+                                            <td class="counter-value" <?php if (!empty($proxy_ext_title)) echo "title='".$proxy_ext_title."'" ?>><?php echo $proxy_ext ?></td>
+                                        </tr>
+
+                                        <tr>
+                                            <td class="counter-name"> <?php print __('Additional FTP Account');?>:</td>
+                                            <td class="counter-value"> <?php print __($ftp_user) ?></td>
+                                        </tr>
+                                    </table>
                                 </td>
                             </tr>
                         </table>
-                    </div>
+                    </td>
+                </tr>
+                <?php
+                    }
+                ?> 
+            </table>
+            </form>
+
+            <table class="data-count">
+                <tr>
+                    <td width="160px">
+                    <td>
+                        <?php
+                            if ( $i == 1) {
+                                echo __('1 domain');
+                            } else {
+                                echo __('%s domains',$i);
+                            }
+                        ?> 
+                    </td>
+                </tr>
+            </table>
+        </div>
diff --git a/web/templates/user/panel.html b/web/templates/user/panel.html
index e01fc5ca..37981217 100644
--- a/web/templates/user/panel.html
+++ b/web/templates/user/panel.html
@@ -1,109 +1,103 @@
-    <center>
-    <table class="main">
-        <tr>
-            <td>
-                <table class="fixed" >
-                    <tr>
-                        <td>
-                            <table class="top">
-                                <thead>
-                                    <tr>
-                                        <td>
-                                            <b><a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/"> <?php print __('Statistics') ?> </a></b>
-                                            <b><a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"> <?php print __('Log') ?> </a></b>
-                                        </td>
-                                        <td>
-                                            <b><a class="top-user" href="/edit/user/?user=<?php echo $user; ?>"><?php if(($_SESSION['user'] == 'admin') && ($user != 'admin')) echo 'admin / ' ?><?php echo $user ?></a></b>
-                                            <a class="top-logout" href="/logout/"> <?php print __('Log out') ?> </a>
-                                        </td>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr>
-                                        <td colspan="7" style="background: #fff;">
-                                            <span class="nav-logo">
-                                                <img style="margin: 28px 0 0 6px;" src="/images/logo.png">
-                                            </span>
-                                            <a class="nav-lnk" href="/list/user/">
-                                                <span class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>block">
-                                                    <p class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>header">
-                                                        <?php print __('USER');?> 
-                                                    </p>
-                                                    <p class="nav-counters">
-                                                        <?php print __('disk');?>: <? echo humanize_usage($panel[$user]['U_DISK']) ?> <br>
-                                                        <?php print __('traffic');?>: <? echo humanize_usage($panel[$user]['U_BANDWIDTH']) ?> 
-                                                    </p>
-                                                </span>
-                                            </a>
-                                            <a class="nav-lnk" href="/list/web/">
-                                                <span class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>block">
-                                                    <p class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>header">
-                                                        <?php print __('WEB');?> 
-                                                    </p>
-                                                    <p class="nav-counters">
-                                                        <?php print __('domains');?>: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
-                                                        <?php print __('aliases');?>: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
-                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_WEB']?> 
-                                                    </p>
-                                                </span>
-                                            </a>
-                                            <a class="nav-lnk" href="/list/dns/">
-                                                <span class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>block">
-                                                    <p class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>header">
-                                                        <?php print __('DNS');?> 
-                                                    </p>
-                                                    <p class="nav-counters">
-                                                        <?php print __('domains');?>: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
-                                                        <?php print __('records');?>: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
-                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_DNS']?> 
-                                                    </p>
-                                                </span>
-                                            </a>
-                                            <a class="nav-lnk" href="/list/mail/">
-                                                <span class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>block">
-                                                    <p class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>header">
-                                                        <?php print __('MAIL');?> 
-                                                    </p>
-                                                    <p class="nav-counters">
-                                                        <?php print __('domains');?>: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
-                                                        <?php print __('accounts');?>: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
-                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?> 
-                                                    </p>
-                                                </span>
-                                            </a>
-                                            <a class="nav-lnk" href="/list/db/">
-                                                <span class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>block">
-                                                    <p class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>header">
-                                                        <?php print __('DB');?> 
-                                                    </p>
-                                                    <p class="nav-counters">
-                                                        <?php print __('databases');?>: <? echo $panel[$user]['U_DATABASES']?><br>
-                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_DB']?> 
-                                                    </p>
-                                                </span>
-                                            </a>
-                                            <a class="nav-lnk" href="/list/cron/">
-                                                <span class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>block">
-                                                    <p class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>header">
-                                                        <?php print __('CRON');?> 
-                                                    </p>
-                                                    <p class="nav-counters">
-                                                        <?php print __('jobs');?>: <? echo $panel[$user]['U_CRON_JOBS']?><br>
-                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_CRON']?> 
-                                                    </p>
-                                                </span>
-                                            </a>
-                                            <a class="nav-lnk" href="/list/backup/">
-                                                <span class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>block">
-                                                    <p class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>header">
-                                                        <?php print __('BACKUP');?> 
-                                                    </p>
-                                                    <p class="nav-counters">
-                                                        <?php print __('backups');?>: <? echo $panel[$user]['U_BACKUPS']?><br>
-                                                    </p>
-                                                </span>
-                                            </a>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
+    <div style="margin:0 auto;display: block; background: #fff; width: 1000px;" >
+        <div class="top">
+            <div class="top-menu">
+                <span style="float:left;">
+                    <a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/"> <?php print __('Statistics') ?> </a>
+                    <a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"> <?php print __('Log') ?> </a>
+                </span>
+                <span style="float:right;">
+                    <a class="top-user" href="/edit/user/?user=<?php echo $user; ?>"><?php if(($_SESSION['user'] == 'admin') && ($user != 'admin')) echo 'admin / ' ?><?php echo $user ?></a>
+                    <a class="top-logout" href="/logout/"> <?php print __('Log out') ?></a>
+                </span>
+            </div>
+            <div style="display:block; float:left;">
+                <span class="nav-logo">
+                    <img style="margin: 26px 0 0 10px;" src="/images/logo.png">
+                </span>
+
+                <a class="nav-lnk" href="/list/user/">
+                <span class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>block">
+                    <p class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>header">
+                        <?php print __('USER');?> 
+                    </p>
+                    <p class="nav-counters">
+                        <?php print __('disk');?>: <? echo humanize_usage($panel[$user]['U_DISK']) ?> <br>
+                        <?php print __('traffic');?>: <? echo humanize_usage($panel[$user]['U_BANDWIDTH']) ?> 
+                    </p>
+                </span>
+                </a>
+
+                <a class="nav-lnk" href="/list/web/">
+                <span class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>block">
+                    <p class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>header">
+                        <?php print __('WEB');?> 
+                    </p>
+                    <p class="nav-counters">
+                        <?php print __('domains');?>: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
+                        <?php print __('aliases');?>: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
+                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_WEB']?> 
+                    </p>
+                </span>
+                </a>
+
+                <a class="nav-lnk" href="/list/dns/">
+                <span class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>block">
+                    <p class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>header">
+                        <?php print __('DNS');?> 
+                    </p>
+                    <p class="nav-counters">
+                        <?php print __('domains');?>: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
+                        <?php print __('records');?>: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
+                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_DNS']?> 
+                    </p>
+                </span>
+                </a>
+
+                <a class="nav-lnk" href="/list/mail/">
+                <span class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>block">
+                    <p class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>header">
+                        <?php print __('MAIL');?> 
+                    </p>
+                    <p class="nav-counters">
+                        <?php print __('domains');?>: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
+                        <?php print __('accounts');?>: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
+                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?> 
+                    </p>
+                </span>
+                </a>
+
+                <a class="nav-lnk" href="/list/db/">
+                <span class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>block">
+                    <p class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>header">
+                        <?php print __('DB');?> 
+                    </p>
+                    <p class="nav-counters">
+                        <?php print __('databases');?>: <? echo $panel[$user]['U_DATABASES']?><br>
+                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_DB']?> 
+                    </p>
+                </span>
+                </a>
+
+                <a class="nav-lnk" href="/list/cron/">
+                <span class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>block">
+                    <p class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>header">
+                        <?php print __('CRON');?> 
+                    </p>
+                    <p class="nav-counters">
+                        <?php print __('jobs');?>: <? echo $panel[$user]['U_CRON_JOBS']?><br>
+                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_CRON']?> 
+                    </p>
+                </span>
+                </a>
+
+                <a class="nav-lnk" href="/list/backup/">
+                <span class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>block">
+                    <p class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>header">
+                        <?php print __('BACKUP');?> 
+                    </p>
+                    <p class="nav-counters">
+                        <?php print __('backups');?>: <? echo $panel[$user]['U_BACKUPS']?><br>
+                    </p>
+                </span>
+                </a>
+            </div>