diff --git a/web/templates/admin/add_db.html b/web/templates/admin/add_db.html
index f0254e92f..ad6952e91 100644
--- a/web/templates/admin/add_db.html
+++ b/web/templates/admin/add_db.html
@@ -87,7 +87,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
+                                    <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                                 </td>
                             </tr>
                             <tr>
diff --git a/web/templates/admin/add_dns_rec.html b/web/templates/admin/add_dns_rec.html
index 7b79d882b..44024745c 100644
--- a/web/templates/admin/add_dns_rec.html
+++ b/web/templates/admin/add_dns_rec.html
@@ -93,7 +93,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Priority');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                    <?php print __('Priority');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
                             <tr>
diff --git a/web/templates/admin/add_ip.html b/web/templates/admin/add_ip.html
index f4439a433..fdf03a080 100644
--- a/web/templates/admin/add_ip.html
+++ b/web/templates/admin/add_ip.html
@@ -123,7 +123,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text" style="padding: 10 0 0 2px;">
-                                    <?php print __('Assigned domain');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                    <?php print __('Assigned domain');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
                             <tr>
@@ -133,7 +133,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text" style="padding: 10 0 0 2px;">
-                                    <?php print __('NAT IP association');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                    <?php print __('NAT IP association');?> <span class="optional"">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
                             <tr>
diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html
index aa1e65a5c..0ddb92d4c 100644
--- a/web/templates/admin/add_mail_acc.html
+++ b/web/templates/admin/add_mail_acc.html
@@ -81,7 +81,7 @@
                         </tr>
                         <tr>
                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
+                                <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                             </td>
                         </tr>
                         <tr>
diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html
index 2beaefa69..fe1bc63eb 100644
--- a/web/templates/admin/add_user.html
+++ b/web/templates/admin/add_user.html
@@ -70,7 +70,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Password');?> <a href="javascript:randomString();" class="genpass" ><?php print __('generate');?></a>
+                                    <?php print __('Password');?> / <a href="javascript:randomString();" class="generate" ><?php print __('generate');?></a>
                                 </td>
                             </tr>
                             <tr>
@@ -124,12 +124,14 @@
                                             foreach ($languages as $key => $value) {
                                                 echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$value."\"";
                                                 $svalue = "'".$value."'";
-                                                if (( $value == $v_language ) || ( $svalue == $v_language)){
-                                                    echo 'selected' ;
-                                                }
                                                 if (( $value == 'en' ) && (empty($v_language))){
                                                     echo 'selected' ;
                                                 }
+                                                if (isset($v_language)){
+                                                    if (( $value == $v_language ) || ( $svalue == $v_language)){
+                                                        echo 'selected' ;
+                                                    }
+                                                }
                                                 echo ">".$value."</option>\n";
                                             }
                                         ?>
diff --git a/web/templates/admin/edit_db.html b/web/templates/admin/edit_db.html
index 115b973b9..28d36fc88 100644
--- a/web/templates/admin/edit_db.html
+++ b/web/templates/admin/edit_db.html
@@ -89,7 +89,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
+                                    <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                                 </td>
                             </tr>
                             <tr>
diff --git a/web/templates/admin/edit_dns_rec.html b/web/templates/admin/edit_dns_rec.html
index 3a03cfc62..c66906b7c 100644
--- a/web/templates/admin/edit_dns_rec.html
+++ b/web/templates/admin/edit_dns_rec.html
@@ -87,7 +87,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Priority');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                    <?php print __('Priority');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
                             <tr>
diff --git a/web/templates/admin/edit_ip.html b/web/templates/admin/edit_ip.html
index f8005f459..e077e641e 100644
--- a/web/templates/admin/edit_ip.html
+++ b/web/templates/admin/edit_ip.html
@@ -116,7 +116,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text" style="padding: 10 0 0 2px;">
-                                    <?php print __('Assigned domain');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                    <?php print __('Assigned domain');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
                             <tr>
@@ -126,7 +126,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text" style="padding: 10 0 0 2px;">
-                                    <?php print __('NAT IP association');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
+                                    <?php print __('NAT IP association');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
                             <tr>
diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html
index 81e73d0e8..a2c9c828e 100644
--- a/web/templates/admin/edit_mail_acc.html
+++ b/web/templates/admin/edit_mail_acc.html
@@ -80,7 +80,7 @@
                         </tr>
                         <tr>
                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
+                                <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                             </td>
                         </tr>
                         <tr>
diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html
index 6f0dbaafb..5c2615942 100644
--- a/web/templates/admin/edit_user.html
+++ b/web/templates/admin/edit_user.html
@@ -69,7 +69,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
+                                    <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                                 </td>
                             </tr>
                             <tr>
diff --git a/web/templates/admin/list_weblog.html b/web/templates/admin/list_weblog.html
index da0fa0948..7aa7de688 100644
--- a/web/templates/admin/list_weblog.html
+++ b/web/templates/admin/list_weblog.html
@@ -4,124 +4,26 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <title>Web Log Manager</title>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <style type="text/css">
-body {
-    margin: 0;
-    margin-left: auto;
-    margin-right: auto;
-    font-family: Arial, Helvetica, sans-serif;
-    padding: 0 0 0 8px;
-}
-
-.main {
-    background-color: #ffffff;
-    padding: 0 0 18px 0;
-    box-shadow: 0 2px 6px rgba(100, 100, 100, 0.3);
-}
-
-.top {
-    color: #ffd76e;
-    padding: 0;
-    font-family: Arial, Helvetica, sans-serif;
-    margin: 0;
-    font-size: 10pt;
-    text-align: left;
-    border: 0px;
-    border-collapse:collapse;
-
-}
-
-.top thead td {
-    background-color: #505050;
-    border-bottom: 1px solid #fff;
-    height: 25px;
-    text-align: right;
-    padding: 0 24px 0 0px;
-    weight:120px;
-}
-
-.top thead td:first-child{
-    border-left: 1px solid #fff;
-    border-right:none;
-    text-align:left;
-    padding: 0 0 0 0;
-    width:auto;
-}
-
-.top-link {
-    padding: 5px 22px 4px;
-    text-decoration: none;
-    color: #fff;
-    border-right: 1px solid #fff;
-}
-
-.top-link:hover {
-    color: #fff;
-    background-color: #999;
-}
-
-.top-link:active{
-    color: #fff;
-    background-color: #f79b44;
-}
-
-.top-selected-link {
-    padding: 5px 22px;
-    text-decoration: none;
-    color: #555;
-    background-color: #fff;
-    border-right: 1px solid #fff;
-}
-
-.top-selected-link:hover {
-    color: #174f82;
-}
-
-.top-selected-link:active {
-    color: #fff;
-    background-color: #f79b44;
-}
-
-.top-user {
-    padding: 0 2px 0 0;
-    text-decoration: none;
-    color: #ffd76e;
-}
-
-.top-user:hover {
-    color: #fff;
-}
-
-.top-user:active{
-    color: #fff;
-    background-color: #f79b44;
-}
-    </style>
+    <link type="text/css" href="/css/main.css" rel="stylesheet" />
 </head>
 <body>
-<table class="top">
-    <thead>
-        <tr>
-<td>
-    <b><a class="top-<?php if($_GET['type'] == 'access' ) echo 'selected-' ?>link" href="/list/web-log/?domain=<?php echo $_GET['domain']."&type=access"?>">
-        <?php print __('AccessLog') ?> 
-    </a></b>
-
-    <b><a class="top-<?php if($_GET['type'] == 'error' ) echo 'selected-' ?>link" href="/list/web-log/?domain=<?php echo $_GET['domain']."&type=error"?>">
-        <?php print __('ErrorLog') ?> 
-    </a></b>
-
-    <b><a class="top-link" href="/download/web-log/?domain=<?php echo $_GET['domain']."&type=access"?>">
-        <?php print __('Download AccessLog') ?>
-    </a></b>
-
-    <b><a class="top-link" href="/download/web-log/?domain=<?php echo $_GET['domain']."&type=error"?>">
-        <?php print __('Download ErrorLog') ?>
-    </a></b>
-
-</td>
-        </tr>
-    </thead>
-</table>
-<div style="color: #323232; padding: 16px 0px;"><?php echo __('Last 70 lines of %s.%s.log',$_GET['domain'],$_GET['type']) ;?></div>
-<pre>
+    <div style="margin:0 auto;display: block; background: #fff;" >
+        <div class="top">
+            <div class="top-menu">
+                <a class="top-<?php if($_GET['type'] == 'access') echo 'selected-' ?>link" href="/list/web-log/?domain=<?php echo $_GET['domain']."&type=access"?>">
+                    <?php print __('AccessLog') ?> 
+                </a>
+                <a class="top-<?php if($_GET['type'] == 'error' ) echo 'selected-' ?>link" href="/list/web-log/?domain=<?php echo $_GET['domain']."&type=error"?>">
+                    <?php print __('ErrorLog') ?> 
+                </a>
+                <a class="top-link" href="/download/web-log/?domain=<?php echo $_GET['domain']."&type=access"?>">
+                    <?php print __('Download AccessLog') ?>
+                </a>
+                <a class="top-link" href="/download/web-log/?domain=<?php echo $_GET['domain']."&type=error"?>">
+                    <?php print __('Download ErrorLog') ?>
+                </a>
+            </div>
+        </div>
+    </div>
+    <div style="color: #323232; padding: 40px 0 20px 0;background: #fff;"><?php echo __('Last 70 lines of %s.%s.log',$_GET['domain'],$_GET['type']) ;?></div>
+    <pre>
diff --git a/web/templates/user/edit_user.html b/web/templates/user/edit_user.html
index 52924234a..1508c59f7 100644
--- a/web/templates/user/edit_user.html
+++ b/web/templates/user/edit_user.html
@@ -69,7 +69,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
+                                    <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                                 </td>
                             </tr>
                             <tr>