diff --git a/web/delete/dns/index.php b/web/delete/dns/index.php
index 92e0ff5e4..e267f8711 100644
--- a/web/delete/dns/index.php
+++ b/web/delete/dns/index.php
@@ -1,44 +1,19 @@
 <?php
 // Init
-//error_reporting(NULL);
+error_reporting(NULL);
 ob_start();
 session_start();
-$TAB = 'DNS';
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Are you admin?
 if ($_SESSION['user'] == 'admin') {
-
-    // Cancel
-    if (!empty($_POST['back'])) {
-        header("Location: /list/dns/");
-    }
-
     // DNS domain
     if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
         $v_username = escapeshellarg($user);
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v_delete_dns_domain ".$v_username." ".$v_domain, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = 'Error: vesta did not return any output.';
-            $_SESSION['error_msg'] = $error;
-        } else {
-            $_SESSION['ok_msg'] = "OK: dns domain <b>".$_GET['domain']."</b> has been deleted.";
-                unset($v_lname);
-        }
         unset($output);
-
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_delete_dns.html');
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/delete_dns.html');
-        unset($_SESSION['error_msg']);
-        unset($_SESSION['ok_msg']);
+        header("Location: /list/dns/");
+        exit;
     }
 
     // DNS record
@@ -47,23 +22,10 @@ if ($_SESSION['user'] == 'admin') {
         $v_domain = escapeshellarg($_GET['domain']);
         $v_record_id = escapeshellarg($_GET['record_id']);
         exec (VESTA_CMD."v_delete_dns_domain_record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = 'Error: vesta did not return any output.';
-            $_SESSION['error_msg'] = $error;
-        } else {
-            $_SESSION['ok_msg'] = "OK: dns record has been deleted.";
-                unset($v_lname);
-        }
         unset($output);
-
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_delete_dns_rec.html');
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/delete_dns_rec.html');
-        unset($_SESSION['error_msg']);
-        unset($_SESSION['ok_msg']);
+        header("Location: /list/dns/?domain=".$_GET['domain']);
+        exit;
     }
-
 }
 
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
+header("Location: /list/dns/");
diff --git a/web/delete/mail/index.php b/web/delete/mail/index.php
new file mode 100644
index 000000000..07eee68b9
--- /dev/null
+++ b/web/delete/mail/index.php
@@ -0,0 +1,31 @@
+<?php
+// Init
+error_reporting(NULL);
+ob_start();
+session_start();
+include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
+
+if ($_SESSION['user'] == 'admin') {
+    // Mail domain
+    if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
+        $v_username = escapeshellarg($user);
+        $v_domain = escapeshellarg($_GET['domain']);
+        exec (VESTA_CMD."v_delete_mail_domain ".$v_username." ".$v_domain, $output, $return_var);
+        unset($output);
+        header("Location: /list/mail/");
+        exit;
+    }
+
+    // Mail account
+    if ((!empty($_GET['domain'])) && (!empty($_GET['account'])))  {
+        $v_username = escapeshellarg($user);
+        $v_domain = escapeshellarg($_GET['domain']);
+        $v_account = escapeshellarg($_GET['account']);
+        exec (VESTA_CMD."v_delete_mail_account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
+        unset($output);
+        header("Location: /list/mail/?domain=".$_GET['domain']);
+        exit;
+    }
+}
+
+header("Location: /list/mail/");
diff --git a/web/delete/user/index.php b/web/delete/user/index.php
index d6b648245..9cf60b783 100644
--- a/web/delete/user/index.php
+++ b/web/delete/user/index.php
@@ -1,48 +1,16 @@
 <?php
 // Init
-//error_reporting(NULL);
+error_reporting(NULL);
 ob_start();
 session_start();
-$TAB = 'USER';
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Are you admin?
 if ($_SESSION['user'] == 'admin') {
-
-    // Cancel
-    if (!empty($_POST['back'])) {
-        header("Location: /list/user/");
-    }
-
-    // Ok
     if (!empty($_GET['user'])) {
         $v_username = escapeshellarg($_GET['user']);
         exec (VESTA_CMD."v_delete_user ".$v_username, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = 'Error: vesta did not return any output.';
-            $_SESSION['error_msg'] = $error;
-        } else {
-            $_SESSION['ok_msg'] = "OK: user <b>".$_GET[user]."</b> has been deleted.";
-                unset($v_lname);
-        }
         unset($output);
-
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_delete_user.html');
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/delete_user.html');
-    unset($_SESSION['error_msg']);
-    unset($_SESSION['ok_msg']);
-
-    } else {
-        header("Location: /list/user/");
     }
 }
 
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
+header("Location: /list/user/");
diff --git a/web/delete/web/index.php b/web/delete/web/index.php
index f55f76561..3130aa646 100644
--- a/web/delete/web/index.php
+++ b/web/delete/web/index.php
@@ -1,78 +1,34 @@
 <?php
 // Init
-//error_reporting(NULL);
+error_reporting(NULL);
 ob_start();
 session_start();
-$TAB = 'WEB';
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Are you admin?
 if ($_SESSION['user'] == 'admin') {
-
-    // Cancel
-    if (!empty($_POST['back'])) {
-        header("Location: /list/web/");
-    }
-
-    // Ok
     if (!empty($_GET['domain'])) {
         $v_username = escapeshellarg($user);
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v_delete_web_domain ".$v_username." ".$v_domain, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = 'Error: vesta did not return any output.';
-            $_SESSION['error_msg'] = $error;
-        }
+        unset($output);
 
         // DNS
-        unset($output);
-        exec (VESTA_CMD."v_list_dns_domain ".$v_username." ".$v_domain." json", $output, $return_var);
-        if ((empty($_SESSION['error_msg'])) && ($return_var == 0 )) {
-            exec (VESTA_CMD."v_delete_dns_domain ".$v_username." ".$v_domain, $output, $return_var);
-            if ($return_var != 0) {
-                $error = implode('<br>', $output);
-                if (empty($error)) $error = 'Error: vesta did not return any output.';
-                $_SESSION['error_msg'] = $error;
+        if ($return_var == 0) {
+            exec (VESTA_CMD."v_list_dns_domain ".$v_username." ".$v_domain." json", $output, $lreturn_var);
+            if ($lreturn_var == 0 ) {
+                exec (VESTA_CMD."v_delete_dns_domain ".$v_username." ".$v_domain, $output, $return_var);
+                unset($output);
             }
         }
 
         // Mail
-        unset($output);
-        exec (VESTA_CMD."v_list_mail_domain ".$v_username." ".$v_domain." json", $output, $return_var);
-        if ((empty($_SESSION['error_msg'])) && ($return_var == 0 )) {
-            exec (VESTA_CMD."v_delete_mail_domain ".$v_username." ".$v_domain, $output, $return_var);
-            if ($return_var != 0) {
-                $error = implode('<br>', $output);
-                if (empty($error)) $error = 'Error: vesta did not return any output.';
-                $_SESSION['error_msg'] = $error;
+        if ($return_var == 0) {
+            exec (VESTA_CMD."v_list_mail_domain ".$v_username." ".$v_domain." json", $output, $lreturn_var);
+            if ($lreturn_var == 0 ) {
+                exec (VESTA_CMD."v_delete_mail_domain ".$v_username." ".$v_domain, $output, $return_var);
             }
         }
-
-
-        if (empty($_SESSION['error_msg'])) {
-            $_SESSION['ok_msg'] = "OK: domain <b>".$_GET['domain']."</b> has been deleted.";
-            unset($v_lname);
-        }
-
-
-
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_delete_web.html');
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/delete_web.html');
-    unset($_SESSION['error_msg']);
-    unset($_SESSION['ok_msg']);
-
-    } else {
-        header("Location: /list/web/");
     }
-
 }
 
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
+header("Location: /list/web/");
diff --git a/web/suspend/dns/index.php b/web/suspend/dns/index.php
index aa4bb4819..f77b1df47 100644
--- a/web/suspend/dns/index.php
+++ b/web/suspend/dns/index.php
@@ -3,42 +3,17 @@
 //error_reporting(NULL);
 ob_start();
 session_start();
-$TAB = 'DNS';
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Are you admin?
 if ($_SESSION['user'] == 'admin') {
-
-    // Cancel
-    if (!empty($_POST['back'])) {
-        header("Location: /list/dns/");
-    }
-
     // DNS domain
     if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
         $v_username = escapeshellarg($user);
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v_suspend_dns_domain ".$v_username." ".$v_domain, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = 'Error: vesta did not return any output.';
-            $_SESSION['error_msg'] = $error;
-        } else {
-            $_SESSION['ok_msg'] = "OK: dns domain <b>".$_GET['domain']."</b> has been suspended.";
-                unset($v_lname);
-        }
         unset($output);
-
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_suspend_dns.html');
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/suspend_dns.html');
-        unset($_SESSION['error_msg']);
-        unset($_SESSION['ok_msg']);
+        header("Location: /list/dns/");
+        exit;
     }
 
     // DNS record
@@ -47,23 +22,10 @@ if ($_SESSION['user'] == 'admin') {
         $v_domain = escapeshellarg($_GET['domain']);
         $v_record_id = escapeshellarg($_GET['record_id']);
         exec (VESTA_CMD."v_suspend_dns_domain_record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = 'Error: vesta did not return any output.';
-            $_SESSION['error_msg'] = $error;
-        } else {
-            $_SESSION['ok_msg'] = "OK: dns record has been suspended.";
-                unset($v_lname);
-        }
         unset($output);
-
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_suspend_dns_rec.html');
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/suspend_dns_rec.html');
-        unset($_SESSION['error_msg']);
-        unset($_SESSION['ok_msg']);
+        header("Location: /list/dns/?domain=".$_GET['domain']);
+        exit;
     }
 
 }
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
+header("Location: /list/dns/");
diff --git a/web/suspend/mail/index.php b/web/suspend/mail/index.php
new file mode 100644
index 000000000..082dc9bf3
--- /dev/null
+++ b/web/suspend/mail/index.php
@@ -0,0 +1,31 @@
+<?php
+// Init
+//error_reporting(NULL);
+ob_start();
+session_start();
+include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
+
+if ($_SESSION['user'] == 'admin') {
+    // Mail domain
+    if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
+        $v_username = escapeshellarg($user);
+        $v_domain = escapeshellarg($_GET['domain']);
+        exec (VESTA_CMD."v_suspend_mail_domain ".$v_username." ".$v_domain, $output, $return_var);
+        unset($output);
+        header("Location: /list/mail/");
+        exit;
+    }
+
+    // Mail account
+    if ((!empty($_GET['domain'])) && (!empty($_GET['account'])))  {
+        $v_username = escapeshellarg($user);
+        $v_domain = escapeshellarg($_GET['domain']);
+        $v_account = escapeshellarg($_GET['account']);
+        exec (VESTA_CMD."v_suspend_mail_account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
+        unset($output);
+        header("Location: /list/mail/?domain=".$_GET['domain']);
+        exit;
+    }
+}
+
+header("Location: /list/mail/");
diff --git a/web/suspend/user/index.php b/web/suspend/user/index.php
index 0e56cb125..75dc06592 100644
--- a/web/suspend/user/index.php
+++ b/web/suspend/user/index.php
@@ -1,49 +1,17 @@
 <?php
-// Init
-//error_reporting(NULL);
+error_reporting(NULL);
 ob_start();
 session_start();
 $TAB = 'USER';
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // Are you admin?
 if ($_SESSION['user'] == 'admin') {
-
-    // Cancel
-    if (!empty($_POST['back'])) {
-        header("Location: /list/user/");
-    }
-
-    // Ok
     if (!empty($_GET['user'])) {
         $v_username = escapeshellarg($_GET['user']);
         exec (VESTA_CMD."v_suspend_user ".$v_username, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = 'Error: vesta did not return any output.';
-            $_SESSION['error_msg'] = $error;
-        } else {
-            $_SESSION['ok_msg'] = "OK: user <b>".$_GET[user]."</b> has been suspended.";
-                unset($v_lname);
-        }
         unset($output);
-
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_suspend_user.html');
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/suspend_user.html');
-    unset($_SESSION['error_msg']);
-    unset($_SESSION['ok_msg']);
-
-    } else {
-        header("Location: /list/user/");
     }
-
 }
 
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
+header("Location: /list/user/");
diff --git a/web/suspend/web/index.php b/web/suspend/web/index.php
index 20b4845ce..2cc737ecf 100644
--- a/web/suspend/web/index.php
+++ b/web/suspend/web/index.php
@@ -1,50 +1,17 @@
 <?php
 // Init
-//error_reporting(NULL);
+error_reporting(NULL);
 ob_start();
 session_start();
-$TAB = 'WEB';
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Are you admin?
 if ($_SESSION['user'] == 'admin') {
-
-    // Cancel
-    if (!empty($_POST['back'])) {
-        header("Location: /list/web/");
-    }
-
-    // Ok
     if (!empty($_GET['domain'])) {
         $v_username = escapeshellarg($user);
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v_suspend_web_domain ".$v_username." ".$v_domain, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = 'Error: vesta did not return any output.';
-            $_SESSION['error_msg'] = $error;
-        } else {
-            $_SESSION['ok_msg'] = "OK: web domain <b>".$_GET['domain']."</b> has been suspended.";
-                unset($v_lname);
-        }
         unset($output);
-
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_suspend_web.html');
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/suspend_web.html');
-    unset($_SESSION['error_msg']);
-    unset($_SESSION['ok_msg']);
-
-    } else {
-        header("Location: /list/web/");
     }
-
 }
 
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
+header("Location: /list/web/");
diff --git a/web/templates/admin/delete_dns.html b/web/templates/admin/delete_dns.html
deleted file mode 100644
index c87840fbd..000000000
--- a/web/templates/admin/delete_dns.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-
-        <table class="data-col2" width="830px">
-            <tr>
-                <td style="padding: 24px 0 0 0;" width="100px">
-                    <form method="get">
-                        <input type="button" class="add-button" value="List Domains" onClick="location.href='/list/dns/'">
-                    </form>
-                </td>
-                <td style="padding: 24px 0 0 0;">
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/delete_dns_rec.html b/web/templates/admin/delete_dns_rec.html
deleted file mode 100644
index 77e35aee4..000000000
--- a/web/templates/admin/delete_dns_rec.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-
-        <table class="data-col2" width="830px">
-            <tr>
-                <td style="padding: 24px 0 0 0;" width="100px">
-                    <form method="get">
-                        <input type="button" class="add-button" value="List Records" onClick="location.href='/list/dns/?domain=<?php echo $_GET['domain']?>'">
-                    </form>
-                </td>
-                <td style="padding: 24px 0 0 0;">
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/delete_user.html b/web/templates/admin/delete_user.html
deleted file mode 100644
index 243a65ca2..000000000
--- a/web/templates/admin/delete_user.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-
-        <table class="data-col2" width="830px">
-            <tr>
-                <td style="padding: 24px 0 0 0;">
-                    <form method="post">
-                        <input type="button" class="add-button" value="List Users" onClick="location.href='/list/user/'">
-                    </form>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/delete_web.html b/web/templates/admin/delete_web.html
deleted file mode 100644
index 60cfed357..000000000
--- a/web/templates/admin/delete_web.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-
-        <table class="data-col2" width="830px">
-            <tr>
-                <td style="padding: 24px 0 0 0;">
-                    <form method="post">
-                        <input type="button" class="add-button" value="List Domains" onClick="location.href='/list/web/'">
-                    </form>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html
index edb6fce44..8c2be4e65 100644
--- a/web/templates/admin/list_dns.html
+++ b/web/templates/admin/list_dns.html
@@ -70,14 +70,14 @@ foreach ($data as $key => $value) {
                 <img src="/images/suspend.png" width="7px" height="8px">
                 <a href="#" id="<?php echo $spnd_action ?>_link_<?php echo "$i" ?>"> <?php echo $spnd_action ?></a>
                 <div id="<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to <?php echo $spnd_action ?> <span style="color: #34536A;"><b><?php echo "$key" ?></b></span> domain?</p>
+                    <p class="counter-value">Are you sure you want to <?php echo $spnd_action ?> <b><?php echo "$key" ?></b>domain?</p>
                 </div>
             </td>
             <td class="data-controls" width="70px">
                 <img src="/images/delete.png" width="7px" height="7px">
                 <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
                 <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to delete <span style="color: #34536A;"><b><?php echo "$key" ?></b></span> domain?</p>
+                    <p class="counter-value">Are you sure you want to delete <b><?php echo "$key" ?></b> domain?</p>
                 </div>
             </td>
         </tr></table>
diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html
index fde585e5d..01f6f9f13 100644
--- a/web/templates/admin/list_dns_rec.html
+++ b/web/templates/admin/list_dns_rec.html
@@ -70,8 +70,14 @@ foreach ($data as $key => $value) {
                     <p class="counter-value">Are you sure you want to <?php echo $spnd_action ?> <span style="color: #34536A;"><b><?php echo $data[$key]['RECORD'] ?></b></span> record?</p>
                 </div>
             </td>
+            <td class="data-controls" width="87px">
+                <img src="/images/delete.png" width="7px" height="7px">
+                <a href="#" id="delete_link_<?php echo "$i" ?>"> delete</a>
+                <div id="delete_dialog_<?php echo "$i" ?>" title="Confirmation">
+                    <p class="counter-value">Are you sure you want to delete <span style="color: #34536A;"><b><?php echo $data[$key]['RECORD'] ?></b></span> record?</p>
+                </div>
+            </td>
 
-            <td class="data-controls" width="70px"><img src="/images/delete.png" width="7px" height="7px"><a href="/delete/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>"> delete</a></td>
         </tr></table>
 
         <table class="data-col5" width="780px">
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html
index 11d510125..8f6784597 100644
--- a/web/templates/admin/list_mail.html
+++ b/web/templates/admin/list_mail.html
@@ -5,7 +5,7 @@ foreach ($data as $key => $value) {
     ++$i;
     if ($data[$key]['SUSPENDED'] == 'yes') {
         $status = 'suspended';
-        $spnd_action = 'ususpend' ;
+        $spnd_action = 'unsuspend' ;
     } else {
         $status = 'active';
         $spnd_action = 'suspend' ;
@@ -15,6 +15,45 @@ foreach ($data as $key => $value) {
         $data[$key]['CATCHALL'] = '/dev/null';
     }
     ?>
+<script type="text/javascript">
+    $(function(){
+        $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog({
+            modal: true,
+            autoOpen: false,
+            width: 360,
+            buttons: {
+                "Ok": function(event, ui) {
+                     location.href = '/<?php echo $spnd_action ?>/mail/?domain=<?php echo "$key" ?>';
+                },
+                "Cancel": function() {
+                    $(this).dialog("close");
+                }
+            }
+        });
+        $('#<?php echo $spnd_action ?>_link_<?php echo "$i" ?>').click(function(){
+            $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog('open');
+            return false;
+        });
+
+        $('#delete_dialog_<?php echo "$i" ?>').dialog({
+            modal: true,
+            autoOpen: false,
+            width: 360,
+            buttons: {
+                "Ok": function(event, ui) {
+                     location.href = '/delete/mail/?domain=<?php echo "$key" ?>';
+                },
+                "Cancel": function() {
+                    $(this).dialog("close");
+                }
+            }
+        });
+        $('#delete_link_<?php echo "$i" ?>').click(function(){
+            $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
+            return false;
+        });
+    });
+</script>
 
 <tr class="data-row">
     <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
@@ -31,8 +70,20 @@ foreach ($data as $key => $value) {
             <td class="data-controls" width="100px"><img src="/images/more.png" width="8px" height="8px"><a href="?domain=<?php echo $key ?>"> list accounts</a></td>
             <td class="data-controls" width="98px"><img src="/images/add.png" width="8px" height="8px"><a href="/add/mail/?domain=<?php echo $key ?>"> add account</a></td>
             <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/mail/?domain=<?php echo $key ?>"> edit</a></td>
-            <td class="data-controls" width="80px"><img src="/images/suspend.png" width="7px" height="8px"><a href="#"> <?php echo $spnd_action ?></a></td>
-            <td class="data-controls" width="70px"><img src="/images/delete.png" width="7px" height="7px"><a href="#"> delete</a></td>
+            <td class="data-controls" width="80px">
+                <img src="/images/suspend.png" width="7px" height="8px">
+                <a href="#" id="<?php echo $spnd_action ?>_link_<?php echo "$i" ?>"> <?php echo $spnd_action ?></a>
+                <div id="<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>" title="Confirmation">
+                    <p class="counter-value">Are you sure you want to <?php echo $spnd_action ?> <b><?php echo "$key" ?></b> domain?</p>
+                </div>
+            </td>
+            <td class="data-controls" width="70px">
+                <img src="/images/delete.png" width="7px" height="7px">
+                <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
+                <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
+                    <p class="counter-value">Are you sure you want to delete <b><?php echo "$key" ?></b> domain?</p>
+                </div>
+            </td>
         </tr></table>
 
         <table class="data-col2" width="830px">
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html
index 95a1d5de0..5b2750491 100644
--- a/web/templates/admin/list_mail_acc.html
+++ b/web/templates/admin/list_mail_acc.html
@@ -5,12 +5,51 @@ foreach ($data as $key => $value) {
     ++$i;
     if ($data[$key]['SUSPENDED'] == 'yes') {
         $status = 'suspended';
-        $spnd_action = 'ususpend' ;
+        $spnd_action = 'unsuspend' ;
     } else {
         $status = 'active';
-        $spnd_action = 'suspend' ;
+        $spnd_action = 'suspend';
     }
     ?>
+<script type="text/javascript">
+    $(function(){
+        $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog({
+            modal: true,
+            autoOpen: false,
+            width: 360,
+            buttons: {
+                "Ok": function(event, ui) {
+                     location.href = '/<?php echo $spnd_action ?>/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>';
+                },
+                "Cancel": function() {
+                    $(this).dialog("close");
+                }
+            }
+        });
+        $('#<?php echo $spnd_action ?>_link_<?php echo "$i" ?>').click(function(){
+            $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog('open');
+            return false;
+        });
+
+        $('#delete_dialog_<?php echo "$i" ?>').dialog({
+            modal: true,
+            autoOpen: false,
+            width: 360,
+            buttons: {
+                "Ok": function(event, ui) {
+                     location.href = '/delete/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>';
+                },
+                "Cancel": function() {
+                    $(this).dialog("close");
+                }
+            }
+        });
+        $('#delete_link_<?php echo "$i" ?>').click(function(){
+            $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
+            return false;
+        });
+    });
+</script>
 
 <tr class="data-row">
     <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
@@ -25,8 +64,20 @@ foreach ($data as $key => $value) {
         <table width="830px"><tr>
             <td></td>
             <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>"> edit</a></td>
-            <td class="data-controls" width="80px"><img src="/images/suspend.png" width="7px" height="8px"><a href="#"> <?php echo $spnd_action ?></a></td>
-            <td class="data-controls" width="70px"><img src="/images/delete.png" width="7px" height="7px"><a href="#"> delete</a></td>
+            <td class="data-controls" width="80px">
+                <img src="/images/suspend.png" width="7px" height="8px">
+                <a href="#" id="<?php echo $spnd_action ?>_link_<?php echo "$i" ?>"> <?php echo $spnd_action ?></a>
+                <div id="<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>" title="Confirmation">
+                    <p class="counter-value">Are you sure you want to <?php echo $spnd_action ?><b><?php echo $key ?></b> account?</p>
+                </div>
+            </td>
+            <td class="data-controls" width="70px">
+                <img src="/images/delete.png" width="7px" height="7px">
+                <a href="#" id="delete_link_<?php echo "$i" ?>"> delete</a>
+                <div id="delete_dialog_<?php echo "$i" ?>" title="Confirmation">
+                    <p class="counter-value">Are you sure you want to delete <b><?php echo $key ?></b> account?</p>
+                </div>
+            </td>
         </tr></table>
 
         <table class="data-col2" width="830px">
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index bb9e06ca2..d17227425 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -96,14 +96,14 @@ foreach ($data as $key => $value) {
                 <img src="/images/suspend.png" width="7px" height="8px">
                 <a href="#" id="<?php echo $spnd_action ?>_link_<?php echo $i ?>"> <?php echo $spnd_action ?></a>
                 <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to <?php echo $spnd_action ?> <span style="color: #34536A;"><b><?php echo "$key" ?></b></span> user account?</p>
+                    <p class="counter-value">Are you sure you want to <?php echo $spnd_action ?> <b><?php echo "$key" ?></b> user account?</p>
                 </div>
             </td>
             <td class="data-controls" width="70px">
                 <img src="/images/delete.png" width="7px" height="7px">
                 <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
                 <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to delete <span style="color: #34536A;"><b><?php echo "$key" ?></b></span> user account?</p>
+                    <p class="counter-value">Are you sure you want to delete <b><?php echo "$key" ?></b> user account?</p>
                 </div>
             </td>
         </tr></table>
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html
index 8897c6f4e..9da04aa42 100644
--- a/web/templates/admin/list_web.html
+++ b/web/templates/admin/list_web.html
@@ -88,14 +88,14 @@ foreach ($data as $key => $value) {
                 <img src="/images/suspend.png" width="7px" height="8px">
                 <a href="#" id="<?php echo $spnd_action ?>_link_<?php echo "$i" ?>"> <?php echo $spnd_action ?></a>
                 <div id="<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to <?php echo $spnd_action ?> <span style="color: #34536A;"><b><?php echo "$key" ?></b></span> domain?</p>
+                    <p class="counter-value">Are you sure you want to <?php echo $spnd_action ?> <b><?php echo "$key" ?></b> domain?</p>
                 </div>
             </td>
             <td class="data-controls" width="70px">
                 <img src="/images/delete.png" width="7px" height="7px">
                 <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
                 <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to delete <span style="color: #34536A;"><b><?php echo "$key" ?></b></span> domain?</p>
+                    <p class="counter-value">Are you sure you want to delete <b><?php echo "$key" ?></b> domain?</p>
                 </div>
             </td>
         </tr></table>
diff --git a/web/templates/admin/menu_delete_dns.html b/web/templates/admin/menu_delete_dns.html
deleted file mode 100644
index 199a7e01f..000000000
--- a/web/templates/admin/menu_delete_dns.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 50px 2px 38px 153px;" >
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\">".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/menu_delete_dns_rec.html b/web/templates/admin/menu_delete_dns_rec.html
deleted file mode 100644
index 199a7e01f..000000000
--- a/web/templates/admin/menu_delete_dns_rec.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 50px 2px 38px 153px;" >
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\">".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/menu_delete_user.html b/web/templates/admin/menu_delete_user.html
deleted file mode 100644
index 199a7e01f..000000000
--- a/web/templates/admin/menu_delete_user.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 50px 2px 38px 153px;" >
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\">".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/menu_delete_web.html b/web/templates/admin/menu_delete_web.html
deleted file mode 100644
index 199a7e01f..000000000
--- a/web/templates/admin/menu_delete_web.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 50px 2px 38px 153px;" >
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\">".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/menu_suspend_dns.html b/web/templates/admin/menu_suspend_dns.html
deleted file mode 100644
index 199a7e01f..000000000
--- a/web/templates/admin/menu_suspend_dns.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 50px 2px 38px 153px;" >
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\">".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/menu_suspend_dns_rec.html b/web/templates/admin/menu_suspend_dns_rec.html
deleted file mode 100644
index 199a7e01f..000000000
--- a/web/templates/admin/menu_suspend_dns_rec.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 50px 2px 38px 153px;" >
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\">".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/menu_suspend_user.html b/web/templates/admin/menu_suspend_user.html
deleted file mode 100644
index 199a7e01f..000000000
--- a/web/templates/admin/menu_suspend_user.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 50px 2px 38px 153px;" >
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\">".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/menu_suspend_web.html b/web/templates/admin/menu_suspend_web.html
deleted file mode 100644
index 199a7e01f..000000000
--- a/web/templates/admin/menu_suspend_web.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 50px 2px 38px 153px;" >
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\">".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/menu_unsuspend_dns.html b/web/templates/admin/menu_unsuspend_dns.html
deleted file mode 100644
index 199a7e01f..000000000
--- a/web/templates/admin/menu_unsuspend_dns.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 50px 2px 38px 153px;" >
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\">".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/menu_unsuspend_dns_rec.html b/web/templates/admin/menu_unsuspend_dns_rec.html
deleted file mode 100644
index 199a7e01f..000000000
--- a/web/templates/admin/menu_unsuspend_dns_rec.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 50px 2px 38px 153px;" >
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\">".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/menu_unsuspend_user.html b/web/templates/admin/menu_unsuspend_user.html
deleted file mode 100644
index 1c60a06ba..000000000
--- a/web/templates/admin/menu_unsuspend_user.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 50px 2px 38px 153px;" >
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\"> ".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/menu_unsuspend_web.html b/web/templates/admin/menu_unsuspend_web.html
deleted file mode 100644
index 199a7e01f..000000000
--- a/web/templates/admin/menu_unsuspend_web.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 50px 2px 38px 153px;" >
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\">".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/menu_user.html b/web/templates/admin/menu_user.html
deleted file mode 100644
index 2de7ab491..000000000
--- a/web/templates/admin/menu_user.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td width="142px" style="padding: 16px 0 16px 6px">
-    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/user/'">Add User</button>
-    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 0px">
-        <option>apply to selected</option>
-        <option>rebuild</option>
-        <option>update counters</option>
-        <option>suspend</option>
-        <option>unsuspend</option>
-        <option>delete</option>
-    </select> <button> > </button></td>
-</td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-</tr>
-</table>
-<form id="vstobjects">
diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html
deleted file mode 100644
index d682338ee..000000000
--- a/web/templates/admin/panel.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<table class="main"><tr><td>
-<table class="top">
-<tr>
-    <td width="196px"><p class="hostname"><?php echo exec('hostname') ?></p></td>
-    <td width="100px"><b><a class="top-<?php if($TAB == 'IP' ) echo 's' ?>link" href="/list/ip/">IP Adresses </a></b></td>
-    <td width="110px"><b><a class="top-<?php if($TAB == 'RRD' ) echo 's' ?>link" href="/list/rrd/">RRD Graphics</a></b></td>
-    <td width="76px"><b><a class="top-<?php if($TAB == 'STATS' ) echo 's' ?>link" href="/list/stats/">Statistics</a></b></td>
-    <td width="90px"><b><a class="top-<?php if($TAB == 'LOG' ) echo 's' ?>link" href="/list/log/">History Log</a></b></td>
-    <td></td>
-    <td width="260px"><b><?php if($user != $_SESSION['user']) echo 'admin / ' ?><?php echo $user ?></b><a class="top-link" style="padding: 0 0 0 6" href="/logout/">Log out</a></td>
-</tr>
-</table>
-<table class="nav">
-<tr>
-    <td style="padding: 34px 30px 0px 26px;">
-        <img src="/images/logo.png" width="124px" height="46px">
-    </td>
-    <td><div id="nav-block"><ul>
-        <li><b><a class="nav-<?php if($TAB == 'USER' ) echo 's' ?>link" href="/list/user/">USER</b></a><p class="counters">
-            users: <? echo $panel[$user]['U_USERS'] ?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_USERS']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'WEB' ) echo 's' ?>link" href="/list/web/">WEB</a></b><p class="counters">
-            domains: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
-            aliases: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
-            webssl: <? echo $panel[$user]['U_WEB_SSL']?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_WEB']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'DNS' ) echo 's' ?>link" href="/list/dns/">DNS</a></b><p class="counters">
-            domains: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
-            records: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_DNS']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'MAIL' ) echo 's' ?>link" href="/list/mail/">MAIL</a></b><p class="counters">
-            domains: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
-            dkim: <? echo $panel[$user]['U_MAIL_DKIM']?><br>
-            accounts: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_MAIL']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'DB' ) echo 's' ?>link" href="/list/db/">DB</a></b><p class="counters">
-            databases: <? echo $panel[$user]['U_DATABASES']?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_DB']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'CRON' ) echo 's' ?>link" href="/list/cron/">CRON</a></b><p class="counters">
-            jobs: <? echo $panel[$user]['U_CRON_JOBS']?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_CRON']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'BACKUP' ) echo 's' ?>link" href="/list/backup/">BACKUP</a></a></b><p class="counters">
-            backups: <? echo $panel[$user]['U_BACKUPS']?><br>
-    <ul></div></td>
-</tr>
-</table>
diff --git a/web/templates/admin/suspend_dns.html b/web/templates/admin/suspend_dns.html
deleted file mode 100644
index 4880b9350..000000000
--- a/web/templates/admin/suspend_dns.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-
-        <table class="data-col2" width="830px">
-            <tr>
-                <td style="padding: 24px 0 0 0;" width="100px">
-                    <form method="get">
-                        <input type="button" class="add-button" value="List Domains" onClick="location.href='/list/dns/'">
-                    </form>
-                </td>
-                <td style="padding: 24px 0 0 0;">
-                    <form action="/unsuspend/dns/" method="get">
-                        <input type="hidden" name="domain" value="<?php echo $_GET['domain']?>">
-                        <input type="submit" class="add-button" name="unsuspend" value="Unsuspend <?php echo $_GET['domain']?>">
-                    </form>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/suspend_dns_rec.html b/web/templates/admin/suspend_dns_rec.html
deleted file mode 100644
index 56ae798f8..000000000
--- a/web/templates/admin/suspend_dns_rec.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-
-        <table class="data-col2" width="830px">
-            <tr>
-                <td style="padding: 24px 0 0 0;" width="100px">
-                    <form method="get">
-                        <input type="button" class="add-button" value="List records" onClick="location.href='/list/dns/?domain=<?php echo $_GET['domain']?>'">
-                    </form>
-                </td>
-                <td style="padding: 24px 0 0 0;">
-                    <form action="/unsuspend/dns/" method="get">
-                        <input type="hidden" name="domain" value="<?php echo $_GET['domain']?>">
-                        <input type="hidden" name="record_id" value="<?php echo $_GET['record_id']?>">
-                        <input type="submit" class="add-button" name="unsuspend" value="Unsuspend record">
-                    </form>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/suspend_user.html b/web/templates/admin/suspend_user.html
deleted file mode 100644
index bc69d6bc4..000000000
--- a/web/templates/admin/suspend_user.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-
-        <table class="data-col2" width="830px">
-            <tr>
-                <td style="padding: 24px 0 0 0;" width="100px">
-                    <form method="get">
-                        <input type="button" class="add-button" value="List Users" onClick="location.href='/list/user/'">
-                    </form>
-                </td>
-                <td style="padding: 24px 0 0 0;">
-                    <form action="/unsuspend/user/" method="get">
-                        <input type="hidden" name="user" value="<?php echo $_GET['user']?>">
-                        <input type="submit" class="add-button" name="unsuspend" value="Unsuspend <?php echo $_GET['user']?>">
-                    </form>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/suspend_web.html b/web/templates/admin/suspend_web.html
deleted file mode 100644
index 7da0b6f68..000000000
--- a/web/templates/admin/suspend_web.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-
-        <table class="data-col2" width="830px">
-            <tr>
-                <td style="padding: 24px 0 0 0;" width="100px">
-                    <form method="get">
-                        <input type="button" class="add-button" value="List Domains" onClick="location.href='/list/web/'">
-                    </form>
-                </td>
-                <td style="padding: 24px 0 0 0;">
-                    <form action="/unsuspend/web/" method="get">
-                        <input type="hidden" name="domain" value="<?php echo $_GET['domain']?>">
-                        <input type="submit" class="add-button" name="unsuspend" value="Unsuspend <?php echo $_GET['domain']?>">
-                    </form>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/unsuspend_dns.html b/web/templates/admin/unsuspend_dns.html
deleted file mode 100644
index 407a695fa..000000000
--- a/web/templates/admin/unsuspend_dns.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-
-        <table class="data-col2" width="830px">
-            <tr>
-                <td style="padding: 24px 0 0 0;" width="100px">
-                    <form method="get">
-                        <input type="button" class="add-button" value="List Domains" onClick="location.href='/list/dns/'">
-                    </form>
-                </td>
-                <td style="padding: 24px 0 0 0;">
-                    <form action="/suspend/dns/" method="get">
-                        <input type="hidden" name="domain" value="<?php echo $_GET['domain']?>">
-                        <input type="submit" class="add-button" name="suspend" value="Suspend <?php echo $_GET['domain']?>">
-                    </form>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/unsuspend_dns_rec.html b/web/templates/admin/unsuspend_dns_rec.html
deleted file mode 100644
index f24c16550..000000000
--- a/web/templates/admin/unsuspend_dns_rec.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-
-        <table class="data-col2" width="830px">
-            <tr>
-                <td style="padding: 24px 0 0 0;" width="100px">
-                    <form method="get">
-                        <input type="button" class="add-button" value="List records" onClick="location.href='/list/dns/?domain=<?php echo $_GET['domain']?>'">
-                    </form>
-                </td>
-                <td style="padding: 24px 0 0 0;">
-                    <form action="/suspend/dns/" method="get">
-                        <input type="hidden" name="domain" value="<?php echo $_GET['domain']?>">
-                        <input type="hidden" name="record_id" value="<?php echo $_GET['record_id']?>">
-                        <input type="submit" class="add-button" name="suspend" value="Suspend record">
-                    </form>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/unsuspend_user.html b/web/templates/admin/unsuspend_user.html
deleted file mode 100644
index a642fe4d0..000000000
--- a/web/templates/admin/unsuspend_user.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-
-        <table class="data-col2" width="830px">
-            <tr>
-                <td style="padding: 24px 0 0 0;" width="100px">
-                    <form method="post">
-                        <input type="button" class="add-button" value="List Users" onClick="location.href='/list/user/'">
-                    </form>
-                </td>
-                <td style="padding: 24px 0 0 0;">
-                    <form action="/suspend/user/" method="get">
-                        <input type="hidden" name="user" value="<?php echo $_GET['user']?>">
-                        <input type="submit" class="add-button" name="suspend" value="Suspend <?php echo $_GET['user']?>">
-                    </form>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/unsuspend_web.html b/web/templates/admin/unsuspend_web.html
deleted file mode 100644
index 50dae2caf..000000000
--- a/web/templates/admin/unsuspend_web.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-
-        <table class="data-col2" width="830px">
-            <tr>
-                <td style="padding: 24px 0 0 0;" width="100px">
-                    <form method="get">
-                        <input type="button" class="add-button" value="List Domains" onClick="location.href='/list/web/'">
-                    </form>
-                </td>
-                <td style="padding: 24px 0 0 0;">
-                    <form action="/suspend/web/" method="get">
-                        <input type="hidden" name="domain" value="<?php echo $_GET['domain']?>">
-                        <input type="submit" class="add-button" name="unsuspend" value="Suspend <?php echo $_GET['domain']?>">
-                    </form>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
-</table>
diff --git a/web/unsuspend/dns/index.php b/web/unsuspend/dns/index.php
index 8b6f4b2bb..4ad0ed479 100644
--- a/web/unsuspend/dns/index.php
+++ b/web/unsuspend/dns/index.php
@@ -3,41 +3,18 @@
 //error_reporting(NULL);
 ob_start();
 session_start();
-$TAB = 'DNS';
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Are you admin?
 if ($_SESSION['user'] == 'admin') {
-
-    // Cancel
-    if (!empty($_POST['back'])) {
-        header("Location: /list/dns/");
-    }
-
     // DNS domain
     if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
         $v_username = escapeshellarg($user);
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v_unsuspend_dns_domain ".$v_username." ".$v_domain, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = 'Error: vesta did not return any output.';
-            $_SESSION['error_msg'] = $error;
-        } else {
-            $_SESSION['ok_msg'] = "OK: dns domain <b>".$_GET['domain']."</b> has been unsuspended.";
-        }
         unset($output);
+        header("Location: /list/dns/");
+        exit;
 
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_unsuspend_dns.html');
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/unsuspend_dns.html');
-        unset($_SESSION['error_msg']);
-        unset($_SESSION['ok_msg']);
     }
 
     // DNS record
@@ -46,22 +23,11 @@ if ($_SESSION['user'] == 'admin') {
         $v_domain = escapeshellarg($_GET['domain']);
         $v_record_id = escapeshellarg($_GET['record_id']);
         exec (VESTA_CMD."v_unsuspend_dns_domain_record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = 'Error: vesta did not return any output.';
-            $_SESSION['error_msg'] = $error;
-        } else {
-            $_SESSION['ok_msg'] = "OK: dns record has been unsuspended.";
-        }
         unset($output);
-
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_unsuspend_dns_rec.html');
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/unsuspend_dns_rec.html');
-        unset($_SESSION['error_msg']);
-        unset($_SESSION['ok_msg']);
+        header("Location: /list/dns/?domain=".$_GET['domain']);
+        exit;
     }
 
 }
 
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
+header("Location: /list/dns/");
diff --git a/web/unsuspend/mail/index.php b/web/unsuspend/mail/index.php
new file mode 100644
index 000000000..95ec3c696
--- /dev/null
+++ b/web/unsuspend/mail/index.php
@@ -0,0 +1,31 @@
+<?php
+// Init
+//error_reporting(NULL);
+ob_start();
+session_start();
+include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
+
+if ($_SESSION['user'] == 'admin') {
+    // Mail domain
+    if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
+        $v_username = escapeshellarg($user);
+        $v_domain = escapeshellarg($_GET['domain']);
+        exec (VESTA_CMD."v_unsuspend_mail_domain ".$v_username." ".$v_domain, $output, $return_var);
+        unset($output);
+        header("Location: /list/mail/");
+        exit;
+    }
+
+    // Mail account
+    if ((!empty($_GET['domain'])) && (!empty($_GET['account'])))  {
+        $v_username = escapeshellarg($user);
+        $v_domain = escapeshellarg($_GET['domain']);
+        $v_account = escapeshellarg($_GET['account']);
+        exec (VESTA_CMD."v_unsuspend_mail_account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
+        unset($output);
+        header("Location: /list/mail/?domain=".$_GET['domain']);
+        exit;
+    }
+}
+
+header("Location: /list/mail/");
diff --git a/web/unsuspend/user/index.php b/web/unsuspend/user/index.php
index 98fe199b8..25188e3d5 100644
--- a/web/unsuspend/user/index.php
+++ b/web/unsuspend/user/index.php
@@ -1,49 +1,17 @@
 <?php
 // Init
-//error_reporting(NULL);
+error_reporting(NULL);
 ob_start();
 session_start();
 $TAB = 'USER';
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Are you admin?
 if ($_SESSION['user'] == 'admin') {
-
-    // Cancel
-    if (!empty($_POST['back'])) {
-        header("Location: /list/user/");
-    }
-
-    // Ok
     if (!empty($_GET['user'])) {
         $v_username = escapeshellarg($_GET['user']);
         exec (VESTA_CMD."v_unsuspend_user ".$v_username, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = 'Error: vesta did not return any output.';
-            $_SESSION['error_msg'] = $error;
-        } else {
-            $_SESSION['ok_msg'] = "OK: user <b>".$_GET[user]."</b> has been unsuspended.";
-                unset($v_lname);
-        }
         unset($output);
-
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_unsuspend_user.html');
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/unsuspend_user.html');
-    unset($_SESSION['error_msg']);
-    unset($_SESSION['ok_msg']);
-
-    } else {
-        header("Location: /list/user/");
     }
-
 }
 
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
+header("Location: /list/user/");
diff --git a/web/unsuspend/web/index.php b/web/unsuspend/web/index.php
index 1f042a941..144f31c08 100644
--- a/web/unsuspend/web/index.php
+++ b/web/unsuspend/web/index.php
@@ -1,50 +1,17 @@
 <?php
 // Init
-//error_reporting(NULL);
+error_reporting(NULL);
 ob_start();
 session_start();
-$TAB = 'WEB';
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Are you admin?
 if ($_SESSION['user'] == 'admin') {
-
-    // Cancel
-    if (!empty($_POST['back'])) {
-        header("Location: /list/web/");
-    }
-
-    // Ok
     if (!empty($_GET['domain'])) {
         $v_username = escapeshellarg($user);
         $v_domain = escapeshellarg($_GET['domain']);
         exec (VESTA_CMD."v_unsuspend_web_domain ".$v_username." ".$v_domain, $output, $return_var);
-        if ($return_var != 0) {
-            $error = implode('<br>', $output);
-            if (empty($error)) $error = 'Error: vesta did not return any output.';
-            $_SESSION['error_msg'] = $error;
-        } else {
-            $_SESSION['ok_msg'] = "OK: web domain <b>".$_GET['domain']."</b> has been unsuspended.";
-                unset($v_lname);
-        }
         unset($output);
-
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_unsuspend_web.html');
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/unsuspend_web.html');
-    unset($_SESSION['error_msg']);
-    unset($_SESSION['ok_msg']);
-
-    } else {
-        header("Location: /list/web/");
     }
-
 }
 
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
+header("Location: /list/web/");