diff --git a/web/edit/cron/index.php b/web/edit/cron/index.php
index e3128fb6..017b86f0 100644
--- a/web/edit/cron/index.php
+++ b/web/edit/cron/index.php
@@ -13,73 +13,75 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
-    // Edit as someone else?
-    if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
-        $user=escapeshellarg($_GET['user']);
-    }
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
 
-    // Check user argument?
-    if (empty($_GET['job'])) {
-        header("Location: /list/cron/");
-        exit;
-    }
+// Edit as someone else?
+if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
+    $user=escapeshellarg($_GET['user']);
+}
 
-    $v_job = escapeshellarg($_GET['job']);
-    exec (VESTA_CMD."v-list-cron-job ".$user." ".$v_job." 'json'", $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;
+// Check user argument?
+if (empty($_GET['job'])) {
+    header("Location: /list/cron/");
+    exit;
+}
+
+$v_job = escapeshellarg($_GET['job']);
+exec (VESTA_CMD."v-list-cron-job ".$user." ".$v_job." 'json'", $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 {
+    $data = json_decode(implode('', $output), true);
+    unset($output);
+    $v_username = $user;
+    $v_job = $_GET['job'];
+    $v_min = $data[$v_job]['MIN'];
+    $v_hour = $data[$v_job]['HOUR'];
+    $v_day = $data[$v_job]['DAY'];
+    $v_month = $data[$v_job]['MONTH'];
+    $v_wday = $data[$v_job]['WDAY'];
+    $v_cmd = $data[$v_job]['CMD'];
+    $v_date = $data[$v_job]['DATE'];
+    $v_time = $data[$v_job]['TIME'];
+    $v_suspended = $data[$v_job]['SUSPENDED'];
+    if ( $v_suspended == 'yes' ) {
+        $v_status =  'suspended';
     } else {
-        $data = json_decode(implode('', $output), true);
-        unset($output);
-        $v_username = $user;
-        $v_job = $_GET['job'];
-        $v_min = $data[$v_job]['MIN'];
-        $v_hour = $data[$v_job]['HOUR'];
-        $v_day = $data[$v_job]['DAY'];
-        $v_month = $data[$v_job]['MONTH'];
-        $v_wday = $data[$v_job]['WDAY'];
-        $v_cmd = $data[$v_job]['CMD'];
-        $v_date = $data[$v_job]['DATE'];
-        $v_time = $data[$v_job]['TIME'];
-        $v_suspended = $data[$v_job]['SUSPENDED'];
-        if ( $v_suspended == 'yes' ) {
-            $v_status =  'suspended';
-        } else {
-            $v_status =  'active';
-        }
-
-        // Action
-        if (!empty($_POST['save'])) {
-            $v_username = $user;
-            // Change job
-            if (($v_min != $_POST['v_min']) || ($v_hour != $_POST['v_hour']) || ($v_day != $_POST['v_day']) || ($v_month != $_POST['v_month']) || ($v_wday != $_POST['v_wday']) || ($v_cmd != $_POST['v_cmd']) &&(empty($_SESSION['error_msg']))) {
-                $v_min = escapeshellarg($_POST['v_min']);
-                $v_hour = escapeshellarg($_POST['v_hour']);
-                $v_day = escapeshellarg($_POST['v_day']);
-                $v_month = escapeshellarg($_POST['v_month']);
-                $v_wday = escapeshellarg($_POST['v_wday']);
-                $v_cmd = escapeshellarg($_POST['v_cmd']);
-                exec (VESTA_CMD."v-change-cron-job ".$v_username." ".$v_job." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $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);
-                $v_cmd = $_POST['v_cmd'];
-            }
-            if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = _("OK: changes has been saved.");
-            }
-        }
+        $v_status =  'active';
     }
 
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_cron.html');
-    unset($_SESSION['error_msg']);
-    unset($_SESSION['ok_msg']);
-//}
+    // Action
+    if (!empty($_POST['save'])) {
+        $v_username = $user;
+        // Change job
+        if (($v_min != $_POST['v_min']) || ($v_hour != $_POST['v_hour']) || ($v_day != $_POST['v_day']) || ($v_month != $_POST['v_month']) || ($v_wday != $_POST['v_wday']) || ($v_cmd != $_POST['v_cmd']) &&(empty($_SESSION['error_msg']))) {
+            $v_min = escapeshellarg($_POST['v_min']);
+            $v_hour = escapeshellarg($_POST['v_hour']);
+            $v_day = escapeshellarg($_POST['v_day']);
+            $v_month = escapeshellarg($_POST['v_month']);
+            $v_wday = escapeshellarg($_POST['v_wday']);
+            $v_cmd = escapeshellarg($_POST['v_cmd']);
+            exec (VESTA_CMD."v-change-cron-job ".$v_username." ".$v_job." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $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);
+            $v_cmd = $_POST['v_cmd'];
+        }
+        if (empty($_SESSION['error_msg'])) {
+            $_SESSION['ok_msg'] = _("OK: changes has been saved.");
+        }
+    }
+}
+
+include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_cron.html');
+unset($_SESSION['error_msg']);
+unset($_SESSION['ok_msg']);
 
 // Footer
 include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/edit/ip/index.php b/web/edit/ip/index.php
index 87f2a9a5..cbc29bee 100644
--- a/web/edit/ip/index.php
+++ b/web/edit/ip/index.php
@@ -13,6 +13,9 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
+
 // Are you admin?
 if ($_SESSION['user'] == 'admin') {
 
diff --git a/web/edit/package/index.php b/web/edit/package/index.php
index f52382b9..46b0662f 100644
--- a/web/edit/package/index.php
+++ b/web/edit/package/index.php
@@ -13,6 +13,9 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
+
 // Are you admin?
 if ($_SESSION['user'] == 'admin') {
 
diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php
index 7b3e8955..68bb0428 100644
--- a/web/inc/i18n/ru.php
+++ b/web/inc/i18n/ru.php
@@ -18,7 +18,7 @@ $LANG = array(
     'gb' => 'гб',
     'mb' => 'мб',
     'Error' => 'Ошибка',
-    'minute' => 'минута',
+    'minute' => 'мин.',
     'hour' => 'час',
     'day' => 'день',
     'days' => 'дня(ей)',
@@ -27,8 +27,8 @@ $LANG = array(
     'month' => 'месяц',
     'day of week' => 'день недели',
     'cmd' => 'командная строка',
-    'Error: field "%s" can not be blank.' => 'Ошибка: Поле "%s" не может быть пустым.',
-    _('Error: vesta did not return any output.')=>'Ошибка: Vesta не отвечает',
+    'Error: field "%s" can not be blank.' => 'Поле "%s" не может быть пустым.',
+    _('Error: vesta did not return any output.')=>'Vesta не отвечает',
     'OK: cron job has been created successfully.' => 'Задание Cron успешно создано',
     'database' => 'база данных',
     'username' => 'аккаунт',
@@ -64,6 +64,7 @@ $LANG = array(
     'per domain' => 'на домен',
     'DNS domains' => 'DNS домены',
     'DNS records count' => 'DNS записи',
+    'DNS records'  => 'DNS записи',
     'DNS Support' => 'Поддержка DNS',
     'Mail Support' => 'Поддержка почты',
     'web aliases' => 'алиасы хостов',
@@ -118,11 +119,11 @@ $LANG = array(
     '505' => '505 &mdash; внутренняя ошибка',
     'An internal error occurred' => 'Произошла внутренняя ошибка',
     'GO_BACK_LINK' => 'Попробуйте вернуться на <a href="/">главную страницу</a> или вернитесь на <a href="javascript:history.go(-1)">предыдущую страницу</a>',
-    'ERROR: Invalid username or password' => 'Ошибка: Неверный логин или пароль',
-    'ERROR: Invalid username or code' => 'Ошибка: Неверный логин или код сброса пароля',
+    'ERROR: Invalid username or password' => 'Неверный логин или пароль',
+    'ERROR: Invalid username or code' => 'Неверный логин или код сброса пароля',
     'MAIL_RESET_SUBJECT' => 'Сброс пароля %s',
     'PASSWORD_RESET_REQUEST'=>"Вы недавно запросили смену пароля.\nЧтобы произвести смену пароля, пройдите по этой ссылке:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nВы также можете пойти по ссылке https://%s/reset/?action=code&user=%s и ввести следующий код для сброса пароля:\n%s\n\nЕсли вы не создавали запрос на сброс пароля, пожалуйста проигнорируйте это письмо и примите наши извиниения.\n\n--\nПанель управления Vesta\n",
-    'ERROR: Passwords not match' => 'Ошибка: Пароли не совпадают',
+    'ERROR: Passwords not match' => 'Пароли не совпадают',
     'Adding Cron Job' => 'Добавление cron задания',
     'Minute' => 'Минута',
     'Day' => 'День',
@@ -149,8 +150,8 @@ $LANG = array(
     'Expiration Date' => 'Зарегистрирован до',
     'Expire' => 'Регистрация до',
     'YYYY-MM-DD' => 'ГГГГ-ММ-ДД',
-    'Name servers' => 'Серверы имен',
-    'Name Servers' => 'Серверы имен',
+    'Name servers' => 'Сервер имен',
+    'Name Servers' => 'Сервер имен',
     'Powered by Vesta Control Panel' => 'Работает на Панели Управления Vesta',
     'Vesta Control Panel' => 'Панель Управления Vesta',
     'Translation by ZonD80' => 'Перевод ZonD80',
@@ -200,9 +201,9 @@ $LANG = array(
     'IP or Value' => 'IP-адрес или значение',
     'Priority' => 'Приоритет',
     'optional' => 'опционально',
-    'Adding IP Address' => 'Добавление IP-адреса',
+    'Adding IP address' => 'Добавление IP-адреса',
     'Shared' => 'Общий',
-    'Assigned user' => 'Пользователь',
+    'Assigned user' => 'Назначить пользователю',
     'Assigned domain' => 'Домен',
     'Adding Mail Domain' => 'Добавление почтового домена',
     'AntiSpam Support' => 'Поддержка анти-спама',
@@ -215,7 +216,7 @@ $LANG = array(
     'use local-part' => 'используйте только имена аккаунтов',
     'Forward to' => 'Пересылка',
     'one or more email addresses' => 'один или несколько email-адресов',
-    'Adding Package' => 'Создание пакета',
+    'Adding Package' => 'Добавление пакета',
     'Package Name' => 'Название пакета',
     'Package' => 'Пакет',
     'Default Template' => 'Шаблон по умолчанию',
@@ -246,8 +247,8 @@ $LANG = array(
     'Editing Package' => 'Редактирование пакета',
     'Editing User' => 'Редактирование аккаунта',
     'Default Name Servers' => 'Серверы имен',
-    'Editing Domain' => 'Редактирование хостинга',
-    'Create Backup' => 'Создать Бэкап',
+    'Editing Domain' => 'Редактирование домена',
+    'Create Backup' => 'Создать архив',
     'apply to selected' => 'применить к выбранным',
     'toggle all' => 'выделить все',
     'delete' => 'удалить',
@@ -259,12 +260,12 @@ $LANG = array(
     'CPU' => 'Процессор',
     'Memory' => 'Память',
     'stop' => 'остановить',
-    'Run Time' => 'Время запуска',
-    'BACKUP_DELETE_CONFIRMATION' => 'Вы уверены, что хотите удалить %s бэкап?',
-    'Backup Size' => 'Размер Бэкапа',
-    'SYS' => 'Системное',
-    '1 archive' => 'резервных копий на странице: 1',
-    '%s archives' => 'резервных копий на странице: %s',
+    'Run Time' => 'Время выполнения',
+    'BACKUP_DELETE_CONFIRMATION' => 'Вы уверены, что хотите удалить %s архив?',
+    'Backup Size' => 'Размер',
+    'SYS' => 'Системный',
+    '1 archive' => 'архивов на странице: 1',
+    '%s archives' => 'архивов на странице: %s',
     'Add Cron Job' => 'Добавить задание',
     'add account' => 'добавить аккаунт',
     'open webmail' => 'открыть веб-почту',
@@ -278,7 +279,7 @@ $LANG = array(
     'open %s' => 'открыть %s',
     'DATABASE_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s базу данных %s?',
     '1 database' => 'баз данных на странице: 1',
-    '%s databases' => ',баз данных на странице: %s',
+    '%s databases' => 'баз данных на странице: %s',
     'Add DNS Domain' => 'Добавить домен',
     'Search' => 'Поиск',
     'LIST_DOMAIN_RECORDS' => 'показать dns записи',
@@ -292,7 +293,7 @@ $LANG = array(
     'list' => 'посмотреть',
     'RECORD_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s запись %s?',
     '1 DNS record' => 'записей на странице: 1',
-    '%s DNS records' => 'записей на странице %s',
+    '%s DNS records' => 'записей на странице: %s',
     'Add IP' => 'Добавить IP адрес',
     'IP_DELETE_CONFIRMATION' => 'Вы уверены, что хотите удалить IP адрес %s?',
     'Status' => 'Статус',
@@ -314,19 +315,19 @@ $LANG = array(
     'Weekly' => 'Еженедельный',
     'Monthly' => 'Ежемесячный',
     'Yearly' => 'Ежегодный',
-    'Search Results' => 'Результаты Поиска',
+    'Search Results' => 'Результаты поиска',
     'login as' => 'войти как',
     'Object' => 'Объект',
     '1 object' => 'объектов на странице: 1',
-    '%s objects' => 'объектов на странице :%s',
-    'Overall Statistics' => 'Вся Статистика',
-    'show per user' => 'показать для пользователя',
+    '%s objects' => 'объектов на странице: %s',
+    'Overall Statistics' => 'Сводная статистика',
+    'show per user' => 'выбрать пользователя',
     'Web' => 'Веб',
     'Mail' => 'Почта',
     'User Directories' => 'Папки пользователя',
     'Web SSL Domains' => 'SSL домены',
-    'one month' => 'один месяц',
-    '%s months' => '%s месяца(ев)',
+    '1 month' => 'месяцев на странице: 1',
+    '%s months' => 'месяцев на странице: %s',
     'Add User' => 'Добавить аккаунт',
     'Add Domain' => 'Добавить домен',
     'rebuild' => 'пересоздать',
@@ -346,10 +347,21 @@ $LANG = array(
     'CGI Support' => 'Поддержка CGI',
     'Statistics Auth' => 'Авторизация Статистики',
     'running' => 'работает',
-    'SERVICE_ACTION_FAILED' => 'Ошибка: Операция "%s" для сервиса "%s" не удалась',
-    'Load Average' => 'Нагрузка',
-    'Memory Usage' => 'Использование Памяти',
-    'Bandwidth Usage' => 'Использование Сети',
+    'SERVICE_ACTION_FAILED' => 'Операция "%s" для сервиса "%s" не удалась',
+    'Load Average' => 'Общая нагрузка',
+    'Memory Usage' => 'Использование памяти',
+    'HTTPD Usage' => 'Веб сервер',
+    'NGINX Usage' => 'Nginx',
+    'MySQL Usage on localhost' => 'Сервер базы данных MySQL',
+    'PostgreSQL Usage on localhost' => 'Сервер базы данных PostgreSQL',
+    'Bandwidth Usage eth0' => 'Использование cети: eth0',
+    'FTP Usage' => 'FTP сервер',
+    'SSH Usage' => 'SSH сервер',
+    'local' => 'локальный',
+    'shared' => 'общий',
+    'dedicated' => 'выделенный',
+    'Domains' => 'Домены',
+    'IP address' => 'IP адрес'
 );
 
 /*error_reporting(E_ALL);
diff --git a/web/list/backup/index.php b/web/list/backup/index.php
index 31ee4b81..fc96a22f 100644
--- a/web/list/backup/index.php
+++ b/web/list/backup/index.php
@@ -12,6 +12,9 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
+
 // Data
 exec (VESTA_CMD."v-list-user-backups $user json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
diff --git a/web/list/cron/index.php b/web/list/cron/index.php
index 852e3fdd..9bc15c87 100644
--- a/web/list/cron/index.php
+++ b/web/list/cron/index.php
@@ -12,18 +12,18 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
+
 // Data
+exec (VESTA_CMD."v-list-cron-jobs $user json", $output, $return_var);
+$data = json_decode(implode('', $output), true);
+$data = array_reverse($data);
+unset($output);
+
 if ($_SESSION['user'] == 'admin') {
-    exec (VESTA_CMD."v-list-cron-jobs $user json", $output, $return_var);
-    $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data);
-    unset($output);
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_cron.html');
 } else {
-    exec (VESTA_CMD."v-list-cron-jobs $user json", $output, $return_var);
-    $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data);
-    unset($output);
     include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_cron.html');
 }
 
diff --git a/web/list/db/index.php b/web/list/db/index.php
index 74541b02..2d1e1848 100644
--- a/web/list/db/index.php
+++ b/web/list/db/index.php
@@ -16,17 +16,14 @@ $lang = 'ru_RU.utf8';
 setlocale(LC_ALL, $lang);
 
 // Data
+exec (VESTA_CMD."v-list-databases $user json", $output, $return_var);
+$data = json_decode(implode('', $output), true);
+$data = array_reverse($data);
+unset($output);
+
 if ($_SESSION['user'] == 'admin') {
-    exec (VESTA_CMD."v-list-databases $user json", $output, $return_var);
-    $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data);
-    unset($output);
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_db.html');
 } else {
-    exec (VESTA_CMD."v-list-databases $user json", $output, $return_var);
-    $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data);
-    unset($output);
     include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_db.html');
 }
 
diff --git a/web/list/dns/index.php b/web/list/dns/index.php
index 80db7d44..ca65c3e1 100644
--- a/web/list/dns/index.php
+++ b/web/list/dns/index.php
@@ -15,37 +15,27 @@ top_panel($user,$TAB);
 $lang = 'ru_RU.utf8';
 setlocale(LC_ALL, $lang);
 
-
 // Data
-if ($_SESSION['user'] == 'admin') {
-    if (empty($_GET['domain'])){
-        exec (VESTA_CMD."v-list-dns-domains $user json", $output, $return_var);
-        $data = json_decode(implode('', $output), true);
-        $data = array_reverse($data);
-        unset($output);
+if (empty($_GET['domain'])){
+    exec (VESTA_CMD."v-list-dns-domains $user json", $output, $return_var);
+    $data = json_decode(implode('', $output), true);
+    $data = array_reverse($data);
+    unset($output);
+    if ($_SESSION['user'] == 'admin') {
         include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_dns.html');
     } else {
-        exec (VESTA_CMD."v-list-dns-domain-records '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var);
-        $data = json_decode(implode('', $output), true);
-        $data = array_reverse($data);
-        unset($output);
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_dns_rec.html');
+        include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_dns.html');
     }
 } else {
-    if (empty($_GET['domain'])){
-        exec (VESTA_CMD."v-list-dns-domains $user json", $output, $return_var);
-        $data = json_decode(implode('', $output), true);
-        $data = array_reverse($data);
-        unset($output);
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_dns.html');
+    exec (VESTA_CMD."v-list-dns-domain-records '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var);
+    $data = json_decode(implode('', $output), true);
+    $data = array_reverse($data);
+    unset($output);
+    if ($_SESSION['user'] == 'admin') {
+        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_dns_rec.html');
     } else {
-        exec (VESTA_CMD."v-list-dns-domain-records '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var);
-        $data = json_decode(implode('', $output), true);
-        $data = array_reverse($data);
-        unset($output);
         include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_dns_rec.html');
     }
-
 }
 
 // Footer
diff --git a/web/list/ip/index.php b/web/list/ip/index.php
index d15790fd..06097648 100644
--- a/web/list/ip/index.php
+++ b/web/list/ip/index.php
@@ -12,6 +12,9 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
+
 // Data
 if ($_SESSION['user'] == 'admin') {
     exec (VESTA_CMD."v-list-sys-ips json", $output, $return_var);
diff --git a/web/list/mail/index.php b/web/list/mail/index.php
index 62cb30f3..52f06170 100644
--- a/web/list/mail/index.php
+++ b/web/list/mail/index.php
@@ -16,34 +16,24 @@ $lang = 'ru_RU.utf8';
 setlocale(LC_ALL, $lang);
 
 // Data
-if ($_SESSION['user'] == 'admin') {
-
-    if (empty($_GET['domain'])){
-        exec (VESTA_CMD."v-list-mail-domains $user json", $output, $return_var);
-        $data = json_decode(implode('', $output), true);
-        $data = array_reverse($data);
-        unset($output);
+if (empty($_GET['domain'])){
+    exec (VESTA_CMD."v-list-mail-domains $user json", $output, $return_var);
+    $data = json_decode(implode('', $output), true);
+    $data = array_reverse($data);
+    unset($output);
+    if ($_SESSION['user'] == 'admin') {
         include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_mail.html');
     } else {
-        exec (VESTA_CMD."v-list-mail-accounts '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var);
-        $data = json_decode(implode('', $output), true);
-        $data = array_reverse($data);
-        unset($output);
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_mail_acc.html');
+        include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_mail.html');
     }
 } else {
-    if (empty($_GET['domain'])){
-        exec (VESTA_CMD."v-list-mail-domains $user json", $output, $return_var);
-        $data = json_decode(implode('', $output), true);
-        $data = array_reverse($data);
-        unset($output);
-
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_mail.html');
+    exec (VESTA_CMD."v-list-mail-domains $user json", $output, $return_var);
+    $data = json_decode(implode('', $output), true);
+    $data = array_reverse($data);
+    unset($output);
+    if ($_SESSION['user'] == 'admin') {
+        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_mail_acc.html');
     } else {
-        exec (VESTA_CMD."v-list-mail-accounts '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var);
-        $data = json_decode(implode('', $output), true);
-        $data = array_reverse($data);
-        unset($output);
         include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_mail_acc.html');
     }
 }
diff --git a/web/list/package/index.php b/web/list/package/index.php
index 1008a202..9634be85 100644
--- a/web/list/package/index.php
+++ b/web/list/package/index.php
@@ -12,6 +12,9 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
+
 // Data
 if ($_SESSION['user'] == 'admin') {
     exec (VESTA_CMD."v-list-user-packages json", $output, $return_var);
diff --git a/web/list/rrd/index.php b/web/list/rrd/index.php
index 5c04caa5..6e629a8a 100644
--- a/web/list/rrd/index.php
+++ b/web/list/rrd/index.php
@@ -12,6 +12,9 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
+
 // Data
 if ($_SESSION['user'] == 'admin') {
     exec (VESTA_CMD."v-list-sys-rrd json", $output, $return_var);
diff --git a/web/list/stats/index.php b/web/list/stats/index.php
index 3a4695b5..18d4be67 100644
--- a/web/list/stats/index.php
+++ b/web/list/stats/index.php
@@ -12,9 +12,11 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
+
 // Data
 if ($user == 'admin') {
-
     if (empty($_GET['user'])) {
         exec (VESTA_CMD."v-list-users-stats json", $output, $return_var);
         $data = json_decode(implode('', $output), true);
diff --git a/web/list/web/index.php b/web/list/web/index.php
index 828a8ece..052dcf37 100644
--- a/web/list/web/index.php
+++ b/web/list/web/index.php
@@ -16,15 +16,12 @@ setlocale(LC_ALL, $lang);
 top_panel($user,$TAB);
 
 // Data
+exec (VESTA_CMD."v-list-web-domains $user json", $output, $return_var);
+$data = json_decode(implode('', $output), true);
+$data = array_reverse($data);
 if ($_SESSION['user'] == 'admin') {
-    exec (VESTA_CMD."v-list-web-domains $user json", $output, $return_var);
-    $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data);
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_web.html');
 } else {
-    exec (VESTA_CMD."v-list-web-domains $user json", $output, $return_var);
-    $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data);
     include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_web.html');
 }
 
diff --git a/web/search/index.php b/web/search/index.php
index 11474706..bdb9a716 100644
--- a/web/search/index.php
+++ b/web/search/index.php
@@ -24,6 +24,9 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
+
 // Data
 if ($_SESSION['user'] == 'admin') {
     $q = escapeshellarg($q);
diff --git a/web/templates/admin/add_cron.html b/web/templates/admin/add_cron.html
index 69e04a72..eff8134b 100644
--- a/web/templates/admin/add_cron.html
+++ b/web/templates/admin/add_cron.html
@@ -102,9 +102,13 @@
                                                 <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;">
+                                            <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>
diff --git a/web/templates/admin/add_ip.html b/web/templates/admin/add_ip.html
index 2aaa6fa7..fb59949a 100644
--- a/web/templates/admin/add_ip.html
+++ b/web/templates/admin/add_ip.html
@@ -10,7 +10,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 10px 2px 10px 0;" ><a class="name"><b><?php print _('Adding IP Adress');?></b></a>
+                                        <td style="padding: 10px 2px 10px 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>";
@@ -55,7 +55,7 @@
                                     <table class="data-col2" width="600px">
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                IP
+                                                <?php print _('IP address') ?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -135,9 +135,13 @@
                                                 <input type="text" size="20" class="vst-input" name="v_name" <?php if (!empty($v_name)) echo "value=".$v_name; ?>>
                                             </td>
                                         </tr>
+                                    </table>
+                                    <table class="data-col2">
                                         <tr>
-                                            <td style="padding: 24px 0 0 0;">
+                                            <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>
diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html
index ca627c93..b7e5ab39 100644
--- a/web/templates/admin/add_package.html
+++ b/web/templates/admin/add_package.html
@@ -233,9 +233,13 @@
                                                 <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;">
+                                            <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>
diff --git a/web/templates/admin/edit_cron.html b/web/templates/admin/edit_cron.html
index d01ee86f..d26e43c5 100644
--- a/web/templates/admin/edit_cron.html
+++ b/web/templates/admin/edit_cron.html
@@ -32,9 +32,9 @@
                             <tr class="data-add">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
-                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
+                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a></td></tr>
                                         <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
-                                        <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                                        <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo _($v_status) ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
@@ -87,7 +87,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Day Of Week');?>
+                                                <?php print _('Day of week');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -105,9 +105,13 @@
                                                 <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="submit" name="save" value="<?php print _('Save');?>" class="button">
                                                 <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
diff --git a/web/templates/admin/edit_ip.html b/web/templates/admin/edit_ip.html
index 905817b3..f161a002 100644
--- a/web/templates/admin/edit_ip.html
+++ b/web/templates/admin/edit_ip.html
@@ -43,9 +43,9 @@
                             <tr class="data-add">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
-                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
+                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a></td></tr>
                                         <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
-                                        <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                                        <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo _($v_status) ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
@@ -57,7 +57,7 @@
                                     <table class="data-col2" width="600px">
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                IP
+                                                <?php print _('IP address'); ?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -67,7 +67,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Netmask');?>
+                                                <?php print _('Netmask');?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -77,7 +77,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print _('Interface');?>
+                                                <?php print _('Interface'); ?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -87,7 +87,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Shared');?>
+                                                <?php print _('Shared'); ?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -97,7 +97,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Assigned user');?>
+                                                <?php print _('Assigned user'); ?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -123,9 +123,13 @@
                                                 <input type="text" size="20" class="vst-input" name="v_name" <?php if (!empty($v_name)) echo "value=".$v_name; ?>>
                                             </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="submit" name="save" value="<?php print _('Save');?>" class="button">
                                                 <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html
index a28a6ae5..0f8b00d9 100644
--- a/web/templates/admin/edit_package.html
+++ b/web/templates/admin/edit_package.html
@@ -31,7 +31,7 @@
                             <tr class="data-add">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
-                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
+                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a></td></tr>
                                         <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
                                         <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
                                     </table>
@@ -121,7 +121,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('DNS Domains');?>
+                                                <?php print _('DNS domains');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -234,9 +234,13 @@
                                                 <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="submit" name="save" value="<?php print _('Save');?>" class="button">
                                                 <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html
index 5c01c794..24e9b6be 100644
--- a/web/templates/admin/list_backup.html
+++ b/web/templates/admin/list_backup.html
@@ -33,41 +33,48 @@
                             <?php
                                 foreach ($data as $key => $value) {
                                     ++$i;
-                                    $web = 'no';
-                                    $dns = 'no';
-                                    $mail = 'no';
-                                    $db = 'no';
+                                    $web = _('no');
+                                    $dns = _('no');
+                                    $mail = _('no');
+                                    $db = _('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]['WEB'])) $web = _('yes').' ¨';
+                                    if (!empty($data[$key]['DNS'])) $dns = _('yes').' ¨';
+                                    if (!empty($data[$key]['MAIL'])) $mail = _('yes').' ¨';
+                                    if (!empty($data[$key]['DB'])) $db = _('yes').' ¨';
+                            ?> 
 
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" 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 date("d M Y", strtotime($data[$key]['DATE'])) ?></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" style="vertical-align:top;">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                            <td class="data-controls" width="80px"><a href="/download/backup/?backup=<?php echo $key ?>" target="_blank"><img src="/images/download.png" width="8px" height="8px"> <?php print _('download');?></a></td>
-                                            <td class="data-controls" width="80px"><a href="#" id="restore_link_<?php echo "$i"?>"><img src="/images/restore.png" width="6px" height="8px"> <?php print _('restore');?></a></td>
-                                            <td class="data-controls do_delete" width="70px">
-                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                                                <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 _('BACKUP_DELETE_CONFIRMATION',$key);?></p>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    </table>
+                                    <a id="delete_link_<?php echo $i ?>" class="do_delete">
+                                        <span class="data-controls do_delete" width="70px">
+                                            <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 _('BACKUP_DELETE_CONFIRMATION',$key);?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <a href="#" id="restore_link_<?php echo "$i"?>">
+                                        <span class="data-controls">
+                                            <img src="/images/restore.png" width="6px" height="8px">
+                                            <?php print _('restore');?> 
+                                        </span>
+                                    </a>
+                                    <a href="/download/backup/?backup=<?php echo $key ?>" target="_blank">
+                                        <span class="data-controls">
+                                            <img src="/images/download.png" width="8px" height="8px">
+                                            <?php print _('download');?> 
+                                        </span>
+                                    </a>
 
                                     <table class="data-col2" width="830px">
                                         <tr>
@@ -80,14 +87,14 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name" style="padding: 2px 0 0 0">
-        	                                            <?php echo $data[$key]['TYPE'] ?> 
+                                                            <?php echo _($data[$key]['TYPE']) ?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="chart1">
                                                             <?php print _('Run Time');?>: <?php echo humanize_time($data[$key]['RUNTIME']) ?>
                                                         </td>
-	                                            </tr>
+                                                    </tr>
                                                     <tr>
                                                         <td class="chart1">
                                                             <?php print _('Backup Size');?>: <?php echo humanize_usage($data[$key]['SIZE']) ?>
@@ -103,7 +110,7 @@
                                                         </td>
                                                         <td>
                                                             <a class="counter-value" title="<?php echo $data[$key]['VESTA'] ?>">
-                                                                <?php echo $data[$key]['VESTA'] ?> 
+                                                                <?php echo _($data[$key]['VESTA']) ?> 
                                                             </a>
                                                         </td>
                                                     </tr>
@@ -157,7 +164,7 @@
                                                         </td>
                                                         <td>
                                                             <a class="counter-value" title="<?php echo $data[$key]['CRON'] ?>">
-                                                                <?php echo $data[$key]['CRON'] ?> 
+                                                                <?php echo _($data[$key]['CRON']) ?> 
                                                             </a>
                                                         </td>
                                                     </tr>
@@ -171,7 +178,7 @@
                             <?php
                                 }
                             ?> 
-    
+
                         </table>
                         </form>
 
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html
index 99e36d2f..22a07db6 100644
--- a/web/templates/admin/list_cron.html
+++ b/web/templates/admin/list_cron.html
@@ -41,40 +41,43 @@
                                         $status = 'active';
                                         $spnd_action = 'suspend';
                                     }
-                            ?>
+                            ?> 
 
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" 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 date("d M Y", strtotime($data[$key]['DATE'])) ?></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-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                            <td class="data-controls" width="50px"><a href="/edit/cron/?job=<?php echo $data[$key]['JOB'] ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
-                                            <td class="data-controls do_<?php echo $spnd_action ?>" width="80px">
-                                                <img src="/images/suspend.png" width="7px" height="8px" class="do_<?php echo $spnd_action ?>">
-                                                <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>"> <?php echo _($spnd_action); ?></a>
-                                                <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 _('CRON_ACTION_CONFIRMATION',_($spnd_action));?></p>
-                                                </div>
-                                            </td>
-                                            <td class="data-controls do_delete" width="70px">
-                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                                                <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 _('CRON_ACTION_CONFIRMATION',_('delete'));?></p>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    </table>
-
+                                    <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="/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 _('CRON_ACTION_CONFIRMATION',_('delete'));?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <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 ?>" 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 _('CRON_ACTION_CONFIRMATION',_($spnd_action));?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <a href="/edit/cron/?job=<?php echo $data[$key]['JOB'] ?>">
+                                        <span class="data-controls">
+                                            <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;">
@@ -86,7 +89,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Min');?>
+                                                            <?php print _('Min');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -100,7 +103,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Hour');?>
+                                                            <?php print _('Hour');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -114,7 +117,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Day');?>
+                                                            <?php print _('Day');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -128,12 +131,12 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Month');?>
+                                                            <?php print _('Month');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="cron-counter-value">
-                                                            <?php echo $data[$key]['MONTH'] ?>
+                                                            <?php echo $data[$key]['MONTH'] ?> 
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -142,12 +145,12 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Day of week');?>
+                                                            <?php print _('Day of week');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="cron-counter-value">
-                                                            <?php echo $data[$key]['WDAY'] ?>
+                                                            <?php echo $data[$key]['WDAY'] ?> 
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -159,7 +162,7 @@
 
                             <?php
                                 }
-                            ?>
+                            ?> 
                         </table>
                         </from>
 
@@ -169,11 +172,11 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('one cron job');
+                                            echo _('1 cron job');
                                         } else {
                                             echo _('%s cron jobs',$i);
                                         }
-                                    ?>
+                                    ?> 
                                 </td>
                             </tr>
                         </table>
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html
index 21af2267..9b5f6b3c 100644
--- a/web/templates/admin/list_db.html
+++ b/web/templates/admin/list_db.html
@@ -103,7 +103,7 @@
                                                         </td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="chart1" style="padding: 0px 0 0px 2px"><?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
+                                                        <td class="chart1" style="padding: 0px 0 0px 2px"><?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html
index e3887c86..e54af488 100644
--- a/web/templates/admin/list_ip.html
+++ b/web/templates/admin/list_ip.html
@@ -39,25 +39,27 @@
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" 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 date("d M Y", strtotime($data[$key]['DATE'])) ?></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" style="vertical-align:top;">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                            <td class="data-controls" width="50px"><a href="/edit/ip/?ip=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
-                                            <td class="data-controls do_delete" width="70px">
-                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                                                <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 _('IP_DELETE_CONFIRMATION',$key);?></p>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    </table>
+                                    <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="/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 _('IP_DELETE_CONFIRMATION',$key);?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <a href="/edit/ip/?ip=<?php echo $key ?>">
+                                        <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>
@@ -84,7 +86,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Web Domains');?>:
+                                                            <?php print _('Domains');?>:
                                                         </td>
                                                         <td>
                                                             <a class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?></a>
@@ -95,7 +97,7 @@
                                                             <?php print _('Status');?>:
                                                         </td>
                                                         <td>
-                                                            <a class="counter-value"> <?php echo $data[$key]['STATUS'] ?></a>
+                                                            <a class="counter-value"> <?php echo _($data[$key]['STATUS']) ?></a>
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -104,7 +106,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name" colspan="2" >
-                                                            <?php print _('Users');?>: <a style="padding: 0 0 0 26" class="nginx-ext"><?php echo str_replace(',', ', ', $data[$key]['U_SYS_USERS']) ?>
+                                                            <?php print _('Users');?>: <a style="padding: 0 0 0 26" class="nginx-ext"><?php echo str_replace(',', ', ', $data[$key]['U_SYS_USERS']) ?> 
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -126,11 +128,11 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('one IP address');
+                                            echo _('1 IP address');
                                         } else {
                                             echo _('%s IP addresses',$i);
                                         }
-                                    ?>
+                                    ?> 
                                 </td>
                             </tr>
                         </table>
diff --git a/web/templates/admin/list_log.html b/web/templates/admin/list_log.html
index 9c940eac..0398da0e 100644
--- a/web/templates/admin/list_log.html
+++ b/web/templates/admin/list_log.html
@@ -28,7 +28,7 @@
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" 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 date("d M Y", strtotime($data[$key]['DATE']))?></a></td></tr>
+                                        <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>
diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html
index d0bb6fbe..9ead55bf 100644
--- a/web/templates/admin/list_packages.html
+++ b/web/templates/admin/list_packages.html
@@ -33,185 +33,188 @@
                             <?php
                                 foreach ($data as $key => $value) {
                                     ++$i;
-                            ?>
+                            ?> 
 
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" 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 date("d M Y", strtotime($data[$key]['DATE'])) ?></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" style="vertical-align:top;">
-                                    <table width="830px">
+                                    <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="/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 _('PACKAGE_DELETE_CONFIRMATION',$key);?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+
+                                    <a href="/edit/package/?package=<?php echo $key ?>">
+                                        <span class="data-controls" width="50px">
+                                            <img src="/images/edit.png" width="8px" height="8px">
+                                        <?php print _('edit');?> 
+                                        </span>
+                                    </a>
+                                    <table class="data-col2" width="830px">
                                         <tr>
-                                            <td></td>
-                                            <td class="data-controls" width="50px"><a href="/edit/package/?package=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
-                                            <td class="data-controls do_delete" width="70px">
-                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                                                <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 _('PACKAGE_DELETE_CONFIRMATION',$key);?></p>
-                                                </div>
+                                            <td colspan=3 class="username" style="padding: 10 0 0 4px;">
+                                                <b><?php echo $key?></b>
                                             </td>
                                         </tr>
-                                </table>
-                                <table class="data-col2" width="830px">
-                                    <tr>
-                                        <td colspan=3 class="username" style="padding: 10 0 0 4px;">
-                                            <b><?php echo $key?></b>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td style="vertical-align:top;" >
-                                            <table>
-                                                <tr>
-                                                    <td class="counter-name" style="padding: 4px 0px 0px 0;" width="68%">
-                                                        <?php print _('Default Template');?>:
-                                                    </td>
-                                                    <td class="counter-value" style="padding: 4px 0 0 6px;">
-                                                        <?php echo $data[$key]['TEMPLATE'] ?>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="counter-name" style="padding: 0px 0px 6px 0;">
-                                                        <?php print _('SSH Access');?>:
-                                                    </td>
-                                                    <td class="counter-value">
-                                                        <?php echo $data[$key]['SHELL'] ?> 
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
-                                                        <?php print _('Bandwidth');?>: <?php echo humanize_usage($data[$key]['BANDWIDTH']) ?>
-                                                        <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
-                                                            <div style="width:0%; height:6px; 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:6px; font-size:0;background-color:#c7d5b3;">
-                                                            <div style="width:0%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                        </div>
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td style="vertical-align:top;" width="320">
-                                            <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 count');?>:
-                                                    </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="250">
-                                            <table class="data-col4" width="250">
-                                                <tr>
-                                                    <td class="counter-name" width="43%">
-                                                        <?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>
-                                                <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>
+                                        <tr>
+                                            <td style="vertical-align:top;" >
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name" style="padding: 4px 0px 0px 0;" >
+                                                            <?php print _('Template');?>:
+                                                        </td>
+                                                        <td class="counter-value" style="padding: 4px 0 0 6px;">
+                                                            <?php echo $data[$key]['TEMPLATE'] ?> 
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name" style="padding: 0px 0px 6px 0;">
+                                                            <?php print _('SSH Access');?>:
+                                                        </td>
+                                                        <td class="counter-value" width="58px">
+                                                            <?php echo $data[$key]['SHELL'] ?> 
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
+                                                            <?php print _('Bandwidth');?>: <?php echo humanize_usage($data[$key]['BANDWIDTH']) ?> 
+                                                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                                <div style="width:0%; height:6px; 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:6px; font-size:0;background-color:#c7d5b3;">
+                                                                <div style="width:0%; height:6px; 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 count');?>:
+                                                        </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>
+                                                    <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
-                            }
-                        ?>
-                    </table>
-                    </form>
+                            <?php
+                                }
+                            ?> 
+                        </table>
+                        </form>
 
-                    <table class="data-count">
-                        <tr>
-                            <td width="160px"></td>
-                            <td>
-                                <?php
-                                    if ( $i == 1) {
-                                        echo _('one package');
-                                    } else {
-                                        echo _('%s packages',$i);
-                                    }
-                                ?>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
+                        <table class="data-count">
+                            <tr>
+                                <td width="160px"></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 d7b9635b..04a1b179 100644
--- a/web/templates/admin/list_rrd.html
+++ b/web/templates/admin/list_rrd.html
@@ -35,17 +35,17 @@
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" 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 date("d M Y", strtotime($data[$key]['DATE']))?></a></td></tr>
+                                        <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><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" style="vertical-align:top;">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                            <td class="data-controls" width="80px"><a href="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>" target="_blank"><img src="/images/download.png" width="8px" height="8px"> <?php print _('download');?></a></td>
-                                        </tr>
-                                    </table>
+                                    <a href="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>" target="_blank">
+                                        <span class="data-controls" width="80px">
+                                            <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>
diff --git a/web/templates/admin/list_search.html b/web/templates/admin/list_search.html
index 315b2b56..a43ca437 100644
--- a/web/templates/admin/list_search.html
+++ b/web/templates/admin/list_search.html
@@ -40,179 +40,156 @@
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" 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 date("d M Y", strtotime($data[$key]['DATE']))?></a></td></tr>
+                                        <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" style="vertical-align:top;">
-                                    <table 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'];
+                                        }
+                                        if ($data[$key]['KEY'] == 'ACCOUNT') {
+                                            $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                                        }
+                                        if ($data[$key]['KEY'] == 'JOB') {
+                                            $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                                        }
+                                        if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB')) {
+                                            $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                                        }
+                                    ?> 
+                                    <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 _('USER_ACTION_CONFIRMATION',_('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'];
+                                        }
+                                        if ($data[$key]['KEY'] == 'ACCOUNT') {
+                                            $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                                        }
+                                        if ($data[$key]['KEY'] == 'JOB') {
+                                             $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                                        }
+                                        if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB')) {
+                                            $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                                        }
+                                    ?> 
+                                    <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 _('USER_ACTION_CONFIRMATION',_($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'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB')) {
+                                             $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></td>
-                                            <?php
-                                                if ($data[$key]['USER'] != $user) {
-
-                                            ?> 
-                                            <td class="data-controls" width="70px">
-                                                <a href="/login/?loginas=<?php echo $data[$key]['USER'] ?>">
-                                                <img src="/images/login-as.png" width="8px" height="8px"> <?php print _('login as');?></a>
+                                            <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>
-                                            <?php
-                                                    }
-                                            ?> 
-                                            <td class="data-controls" width="50px">
-                                                <?php
-                                                    if ($data[$key]['KEY'] == 'RECORD') {
-                                                        echo '<a href="/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'];
-                                                        echo '&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'].'">';
-                                                    }
-
-                                                    if ($data[$key]['KEY'] == 'ACCOUNT') {
-                                                        echo '<a href="/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'];
-                                                        echo '&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'].'">';
-                                                    }
-
-                                                    if ($data[$key]['KEY'] == 'JOB') {
-                                                        echo '<a href="/edit/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'];
-                                                        echo '&user='.$data[$key]['USER'].'">';
-                                                    }
-
-                                                    if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB')) {
-                                                        echo '<a href="/edit/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'];
-                                                        echo '&user='.$data[$key]['USER'].'">';
-                                                    }
-                                                ?> 
-                                                <img src="/images/edit.png" width="8px" height="8px"> edit</a>
+                                            <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>
-                                            <td class="data-controls do_<?php echo $spnd_action ?>" width="80px">
-                                                <img src="/images/suspend.png" width="7px" height="8px" class="do_<?php echo $spnd_action ?>">
-                                                <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>"> <?php echo _($spnd_action); ?></a>
-                                                <?php
-                                                    if ($data[$key]['KEY'] == 'RECORD') {
-                                                        echo '<input type="hidden" name="'.$spnd_action.'_url" ';
-                                                        echo 'value="/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'];
-                                                        echo '&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'].'"  />';
-                                                    }
-
-                                                    if ($data[$key]['KEY'] == 'ACCOUNT') {
-                                                        echo '<input type="hidden" name="'.$spnd_action.'_url" ';
-                                                        echo 'value="/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'];
-                                                        echo '&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'].'"  />';
-                                                    }
-
-                                                    if ($data[$key]['KEY'] == 'JOB') {
-                                                        echo '<input type="hidden" name="'.$spnd_action.'_url" ';
-                                                        echo 'value="/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'];
-                                                        echo '&user='.$data[$key]['USER'].'"  />';
-                                                    }
-
-                                                    if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB')) {
-                                                        echo '<input type="hidden" name="'.$spnd_action.'_url" ';
-                                                        echo 'value="/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'];
-                                                        echo '&user='.$data[$key]['USER'].'"  />';
-                                                    }
-                                                ?> 
-                                                <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 _('USER_ACTION_CONFIRMATION',_($spnd_action),$data[$key]['RESULT']);?></p>
-                                                </div>
-                                            </td>
-                                            <td class="data-controls do_delete" width="70px">
-                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                                                <?php
-                                                    if ($data[$key]['KEY'] == 'RECORD') {
-                                                        echo '<input type="hidden" name="delete_url" ';
-                                                        echo 'value="/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'];
-                                                        echo '&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'].'"  />';
-                                                    }
-
-                                                    if ($data[$key]['KEY'] == 'ACCOUNT') {
-                                                        echo '<input type="hidden" name="delete_url" ';
-                                                        echo 'value="/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'];
-                                                        echo '&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'].'"  />';
-                                                    }
-
-                                                    if ($data[$key]['KEY'] == 'JOB') {
-                                                        echo '<input type="hidden" name="delete_url" ';
-                                                        echo 'value="/delete/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'];
-                                                        echo '&user='.$data[$key]['USER'].'"  />';
-                                                    }
-
-                                                    if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB')) {
-                                                        echo '<input type="hidden" name="delete_url" ';
-                                                        echo 'value="/delete/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'];
-                                                        echo '&user='.$data[$key]['USER'].'"  />';
-                                                    }
-                                                ?> 
-                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
-                                                    <p class="counter-value"><?php print _('USER_ACTION_CONFIRMATION',_('delete'),$data[$key]['RESULT']);?></p>
-                                                </div>
+                                            <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>
-                                </table>
-
-                                <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 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>
-                                        <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>
-                                </table>
-                            </td>
-                        </tr>
-
-                        <?php
-                            }
-                        ?>
-                    </table>
-                    </form>
-
-                    <table class="data-count">
-                        <tr>
-                            <td width="160px"></td>
-                            <td>
-                                <?php
-                                    if ( $i == 1){
-                                        echo _('one object');
-                                    } else {
-                                        echo _('%s objects',$i);
-                                    }
-                                ?>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
+                                    </table>
+                                </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>
diff --git a/web/templates/admin/list_stats.html b/web/templates/admin/list_stats.html
index f8325fc8..e06dc678 100644
--- a/web/templates/admin/list_stats.html
+++ b/web/templates/admin/list_stats.html
@@ -46,7 +46,7 @@
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" 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 date("d M Y", strtotime($key))?></a></td></tr>
+                                        <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($key))?></a></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
@@ -59,7 +59,7 @@
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td colspan=3 class="username" style="padding: 10 0 0 4px;">
-                                                <b><?php echo date("M Y", strtotime($key))?></b>
+                                                <b><?php echo strftime("%b %Y", strtotime($key))?></b>
                                             </td>
                                         </tr>
                                         <tr>
@@ -91,7 +91,7 @@
                                                             <table class="chart2">
                                                                 <tr>
                                                                     <td>
-                                                                        <?php print _('Hosting');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
+                                                                        <?php print _('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
                                                                         <?php print _('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?><br>
                                                                     </td>
                                                                     <td style="padding: 0px 10px 0px 8px">
@@ -151,8 +151,8 @@
                                             <td style="vertical-align:top;" width="250">
                                                 <table class="data-col4" width="250">
                                                     <tr>
-                                                        <td class="counter-name" width="43%">
-                                                            <?php print _('Mail domains');?>:
+                                                        <td class="counter-name" width="50%">
+                                                            <?php print _('Mail Domains');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_MAIL_DOMAINS'] ?>
@@ -184,7 +184,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('IP Adresses');?>:
+                                                            <?php print _('IP Addresses');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['IP_OWNED'] ?> 
@@ -209,7 +209,7 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('one month');
+                                            echo _('1 month');
                                         } else {
                                             echo _('%s months',$i);
                                         }
diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html
index 2e38aba1..08da5406 100644
--- a/web/templates/user/list_cron.html
+++ b/web/templates/user/list_cron.html
@@ -12,7 +12,7 @@
                                             </div>
                                             <div style="float:left; padding-left: 26px;">
                                                 <form action="/bulk/cron/" method="post" id="objects">
-                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> toggle all </a>
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
                                                 <select style="margin:0 2px 0 0px;" name="action">
                                                     <option><?php print _('apply to selected');?></option>
                                                     <option><?php print _('delete');?></option>
@@ -39,32 +39,33 @@
                                         $status = 'active';
                                         $spnd_action = 'suspend';
                                     }
-                            ?>
+                            ?> 
 
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" 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 date("d M Y", strtotime($data[$key]['DATE'])) ?></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-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                            <td class="data-controls" width="50px"><a href="/edit/cron/?job=<?php echo $data[$key]['JOB'] ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
-                                            <td class="data-controls do_delete" width="70px">
-                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                                                <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 _('CRON_ACTION_CONFIRMATION',_('delete'));?></p>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    </table>
-
+                                    <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="/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 _('CRON_ACTION_CONFIRMATION',_('delete'));?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <a href="/edit/cron/?job=<?php echo $data[$key]['JOB'] ?>">
+                                        <span class="data-controls">
+                                            <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;">
@@ -76,7 +77,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Min');?>
+                                                            <?php print _('Min');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -90,7 +91,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Hour');?>
+                                                            <?php print _('Hour');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -104,7 +105,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Day');?>
+                                                            <?php print _('Day');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -118,12 +119,12 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Month');?>
+                                                            <?php print _('Month');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="cron-counter-value">
-                                                            <?php echo $data[$key]['MONTH'] ?>
+                                                            <?php echo $data[$key]['MONTH'] ?> 
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -132,12 +133,12 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Day of week');?>
+                                                            <?php print _('Day of week');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="cron-counter-value">
-                                                            <?php echo $data[$key]['WDAY'] ?>
+                                                            <?php echo $data[$key]['WDAY'] ?> 
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -149,9 +150,9 @@
 
                             <?php
                                 }
-                            ?>
+                            ?> 
                         </table>
-                        </form>
+                        </from>
 
                         <table class="data-count">
                             <tr>
@@ -159,11 +160,11 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('one cron job');
+                                            echo _('1 cron job');
                                         } else {
                                             echo _('%s cron jobs',$i);
                                         }
-                                    ?>
+                                    ?> 
                                 </td>
                             </tr>
                         </table>
diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html
index b9ad0b19..fb3a1f5e 100644
--- a/web/templates/user/list_db.html
+++ b/web/templates/user/list_db.html
@@ -91,7 +91,7 @@
                                                         </td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="chart1" style="padding: 0px 0 0px 2px"><?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
+                                                        <td class="chart1" style="padding: 0px 0 0px 2px"><?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
diff --git a/web/templates/user/list_stats.html b/web/templates/user/list_stats.html
index bbad6a84..6cead350 100644
--- a/web/templates/user/list_stats.html
+++ b/web/templates/user/list_stats.html
@@ -3,6 +3,7 @@
                                     <tr>
                                         <td style="padding: 12px 0 0 16px">
                                             <div style="float:left">
+
                                             </div>
                                             <div style="text-align: right; float: right;">
                                                 <form action="/search/" method="get" >
@@ -28,7 +29,7 @@
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" 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 date("d M Y", strtotime($key))?></a></td></tr>
+                                        <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($key))?></a></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
@@ -41,7 +42,7 @@
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td colspan=3 class="username" style="padding: 10 0 0 4px;">
-                                                <b><?php echo date("M Y", strtotime($key))?></b>
+                                                <b><?php echo strftime("%b %Y", strtotime($key))?></b>
                                             </td>
                                         </tr>
                                         <tr>
@@ -73,7 +74,7 @@
                                                             <table class="chart2">
                                                                 <tr>
                                                                     <td>
-                                                                        <?php print _('Hosting');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
+                                                                        <?php print _('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
                                                                         <?php print _('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?><br>
                                                                     </td>
                                                                     <td style="padding: 0px 10px 0px 8px">
@@ -133,8 +134,8 @@
                                             <td style="vertical-align:top;" width="250">
                                                 <table class="data-col4" width="250">
                                                     <tr>
-                                                        <td class="counter-name" width="43%">
-                                                            <?php print _('Mail domains');?>:
+                                                        <td class="counter-name" width="50%">
+                                                            <?php print _('Mail Domains');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_MAIL_DOMAINS'] ?>
@@ -166,7 +167,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('IP Adresses');?>:
+                                                            <?php print _('IP Addresses');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['IP_OWNED'] ?> 
@@ -191,7 +192,7 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('one month');
+                                            echo _('1 month');
                                         } else {
                                             echo _('%s months',$i);
                                         }
diff --git a/web/templates/user/panel.html b/web/templates/user/panel.html
index 4b5f7e35..a6f00ada 100644
--- a/web/templates/user/panel.html
+++ b/web/templates/user/panel.html
@@ -28,7 +28,6 @@
                                             <p class="nav-counters" style="decoration: none;">
                                                 <?php print _('disk');?>: <? echo humanize_usage($panel[$user]['U_DISK']) ?> <br>
                                                 <?php print _('traffic');?>: <? echo humanize_usage($panel[$user]['U_BANDWIDTH']) ?><br>
-                                                <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED']?>
                                             </p>
                                         </span>
                                         </a>
@@ -40,7 +39,7 @@
                                                 <p class="nav-counters" style="decoration: none;">
                                                     <?php print _('domains');?>: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
                                                     <?php print _('aliases');?>: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_WEB']?>
+                                                    <?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_WEB']?>
                                                 </p>
                                             </span>
                                             </a>
@@ -53,7 +52,7 @@
                                                 <p class="nav-counters" style="decoration: none;">
                                                     <?php print _('domains');?>: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
                                                     <?php print _('records');?>: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_DNS']?>
+                                                    <?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_DNS']?>
                                                 </p>
                                             </span>
                                             </a>
@@ -66,7 +65,7 @@
                                                 <p class="nav-counters" style="decoration: none;">
                                                     <?php print _('domains');?>: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
                                                     <?php print _('accounts');?>: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?>
+                                                    <?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?>
                                                 </p>
                                             </span>
                                             </a>
@@ -78,7 +77,7 @@
                                                 </p>
                                                 <p class="nav-counters" style="decoration: none;">
                                                     <?php print _('databases');?>: <? echo $panel[$user]['U_DATABASES']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_DB']?>
+                                                    <?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_DB']?>
                                                 </p>
                                             </span>
                                             </a>
@@ -90,7 +89,7 @@
                                                 </p>
                                                 <p class="nav-counters" style="decoration: none;">
                                                     <?php print _('jobs');?>: <? echo $panel[$user]['U_CRON_JOBS']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_CRON']?>
+                                                    <?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_CRON']?>
                                                 </p>
                                             </span>
                                             </a>