diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html
index aa6eccde9..25bef8118 100644
--- a/web/templates/admin/panel.html
+++ b/web/templates/admin/panel.html
@@ -11,15 +11,15 @@
                                         <td>
                                             <b><a class="top-<?php if($TAB == 'PACKAGE' ) echo 'selected-' ?>link" href="/list/package/"> <?php print __('Packages') ?> </a></b>
                                             <b><a class="top-<?php if($TAB == 'IP' ) echo 'selected-' ?>link" href="/list/ip/"> <?php print __('IP') ?> </a></b>
-                                            <b><a class="top-<?php if($TAB == 'RRD' ) echo 'selected-' ?>link" href="/list/rrd/"> <?php print __('Graphics') ?> </a></b>
+                                            <b><a class="top-<?php if($TAB == 'RRD' ) echo 'selected-' ?>link" href="/list/rrd/"> <?php print __('Graphs') ?> </a></b>
                                             <b><a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/"> <?php print __('Statistics') ?> </a></b>
                                             <b><a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"> <?php print __('Log') ?> </a></b>
                                             <b><a class="top-<?php if($TAB == 'SERVICES' ) echo 'selected-' ?>link" href="/list/services/"> <?php print __('Services') ?>  </a></b>
                                             <b><a class="top-<?php if($TAB == 'UPDATES' ) echo 'selected-' ?>link" href="/list/updates/"> <?php print __('Updates') ?> </a></b>
                                         </td>
                                         <td>
-                                            <b><?php echo $user ?></b>
-                                            <a class="top-logout" style="padding: 5px 0px 5px 2px; border:0px" href="/logout/"> <?php print __('Log out') ?> </a>
+                                            <b><a class="top-user" href="/edit/user/?user=<?php echo $user; ?>"><?php echo $user ?></a></b>
+                                            <a class="top-logout" href="/logout/"> <?php print __('Log out') ?> </a>
                                         </td>
                                     </tr>
                                 </thead>
diff --git a/web/templates/header.html b/web/templates/header.html
index eb8830262..3c4a1f27c 100644
--- a/web/templates/header.html
+++ b/web/templates/header.html
@@ -10,7 +10,7 @@
                 margin-left: auto;
                 margin-right: auto;
                 font-family: Arial, Helvetica, sans-serif;
-                background: #e9e9e9;
+                background-color: #e9e9e9;
             }
 
             form {
@@ -22,7 +22,7 @@
             }
 
             .main {
-                background: #ffffff;
+                background-color: #ffffff;
                 padding: 0 0 18px 0;
                 box-shadow: 0 2px 6px rgba(100, 100, 100, 0.3);
             }
@@ -41,7 +41,7 @@
             }
 
             .top thead td {
-                background: #505050;
+                background-color: #505050;
                 border-bottom: 1px solid #fff;
                 height: 25px;
                 text-align: right;
@@ -66,19 +66,19 @@
 
             .top-link:hover {
                 color: #fff;
-                background: #999;
+                background-color: #999;
             }
 
             .top-link:active{
                 color: #fff;
-                background: #f79b44;
+                background-color: #f79b44;
             }
 
             .top-selected-link {
                 padding: 5px 22px;
                 text-decoration: none;
                 color: #555;
-                background: #fff;
+                background-color: #fff;
                 border-right: 1px solid #fff;
             }
 
@@ -86,15 +86,29 @@
                 color: #174f82;
             }
 
+            .top-user {
+                padding: 0 2px 0 0;
+                text-decoration: none;
+                color: #ffd76e;
+            }
+
+            .top-user:hover {
+                color: #fff;
+            }
+
+            .top-user:active{
+                color: #fff;
+                background-color: #f79b44;
+            }
+
             .top-logout {
                 text-decoration: none;
                 color: #d3d3d3;
-                padding: 0 0 0 2px;
                 border: noner;
             }
 
             .top-logout:hover {
-                color: #;
+                color: #fff;
             }
 
             .top-logout:active {
@@ -141,7 +155,7 @@
                 height: 107px;
                 width: 118px;
                 float: left;
-                background: #fff;
+                background-color: #fff;
                 border-bottom: 4px solid #777;
                 cursor: pointer;
             }
@@ -187,7 +201,7 @@
                 text-align: left;
                 vertical-align:top;
                 padding: 0px 10px 0px 0;
-                background: none repeat scroll 0% 0% white;
+                background-color: none repeat scroll 0% 0% white;
             }
 
             .submenu td {
@@ -282,7 +296,7 @@
             }
 
             .bottom {
-                background: #ebe9dc;
+                background-color: #ebe9dc;
                 color: #555;
                 margin: 30px 0 0 0;
                 padding: 4px 20px 8px 0;
@@ -474,7 +488,7 @@
 
             .data-controls:hover {
                 color: #ffffff;
-                background: #f79b44;
+                background-color: #f79b44;
             }
 
             .data-controls img {
@@ -483,7 +497,7 @@
 
             .data-count {
                 font-family: Arial, Helvetica, sans-serif;
-                background: #f3f3f3;
+                background-color: #f3f3f3;
                 color: #555;
                 font-size: 8pt;
                 margin: 18px 0 0 0;
@@ -763,7 +777,7 @@
                 font-family:Arial, Helvetica, sans-serif;
                 margin: 80px 0 80px 0;
                 padding: 0;
-                background: #fff;
+                background-color: #fff;
                 text-align: left;
                 vertical-align:top;
                 width: 500px;
@@ -782,7 +796,7 @@
                 vertical-align:top;
                 width: 500px;
                 height: 50px;
-                background: #ebe9dc;
+                background-color: #ebe9dc;
                 padding: 0 8px 0 0;
                 margin: 0;
             }
@@ -854,7 +868,7 @@
                     height: 109px;
                     width: 118px;
                     float: left;
-                    background: #fff;
+                    background-color: #fff;
                     border-bottom: 4px solid #777;
                     cursor: pointer;
                 }
diff --git a/web/templates/user/panel.html b/web/templates/user/panel.html
index 95c39e26c..e01fc5cae 100644
--- a/web/templates/user/panel.html
+++ b/web/templates/user/panel.html
@@ -13,8 +13,8 @@
                                             <b><a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"> <?php print __('Log') ?> </a></b>
                                         </td>
                                         <td>
-                                            <b><?php if(($_SESSION['user'] == 'admin') && ($user != 'admin')) echo 'admin / ' ?><?php echo $user ?></b>
-                                            <a class="top-logout" style="padding: 5px 0px 5px 2px; border:0px" href="/logout/"> <?php print __('Log out') ?> </a>
+                                            <b><a class="top-user" href="/edit/user/?user=<?php echo $user; ?>"><?php if(($_SESSION['user'] == 'admin') && ($user != 'admin')) echo 'admin / ' ?><?php echo $user ?></a></b>
+                                            <a class="top-logout" href="/logout/"> <?php print __('Log out') ?> </a>
                                         </td>
                                     </tr>
                                 </thead>