diff --git a/web/add/db/index.php b/web/add/db/index.php
index 0b9be7161..e23f205ed 100644
--- a/web/add/db/index.php
+++ b/web/add/db/index.php
@@ -53,7 +53,7 @@ top_panel($user,$TAB);
                 unset($v_password);
                 unset($output);
             } else {
-                $_SESSION['ok_msg'] = "OK: database <b>".$user."_".$_POST['v_database']."</b> has been created successfully.";
+                $_SESSION['ok_msg'] = "OK: database <a href='/edit/db/?database=".$user."_".$_POST['v_database']."'><b>".$user."_".$_POST['v_database']."</b></a> has been created successfully.";
                 unset($v_database);
                 unset($v_dbuser);
                 unset($v_password);
diff --git a/web/add/dns/index.php b/web/add/dns/index.php
index 3abfa6ff7..b47fef76c 100644
--- a/web/add/dns/index.php
+++ b/web/add/dns/index.php
@@ -79,7 +79,7 @@ top_panel($user,$TAB);
             }
 
             if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = "OK: domain <b>".$_POST[v_domain]."</b> has been created successfully.";
+                $_SESSION['ok_msg'] = "OK: domain <a href='/list/dns/?domain=".$_POST[v_domain]."'><b>".$_POST[v_domain]."</b></a> has been created successfully.";
                 unset($v_domain);
             }
         }
@@ -122,7 +122,7 @@ top_panel($user,$TAB);
             }
             unset($output);
             if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = "OK: record <b>".$_POST[v_rec]."</b> has been created successfully.";
+                $_SESSION['ok_msg'] = "OK: record <b>".$_POST[v_rec].".".$_POST[v_domain]."</b> has been created successfully.";
                 unset($v_domain);
                 unset($v_rec);
                 unset($v_val);
diff --git a/web/add/ip/index.php b/web/add/ip/index.php
index 898cdc58e..4e3b1f47f 100644
--- a/web/add/ip/index.php
+++ b/web/add/ip/index.php
@@ -62,7 +62,7 @@ if ($_SESSION['user'] == 'admin') {
                 unset($v_password);
                 unset($output);
             } else {
-                $_SESSION['ok_msg'] = "OK: ip <b>".$_POST['v_ip']."</b> has been created successfully.";
+                $_SESSION['ok_msg'] = "OK: ip <a href='/edit/ip/?ip=".$_POST['v_ip']."'><b>".$_POST['v_ip']."</b></a> has been created successfully.";
                 unset($v_ip);
                 unset($v_netmask);
                 unset($v_name);
diff --git a/web/add/mail/index.php b/web/add/mail/index.php
index 871e4a7c5..59dac6b71 100644
--- a/web/add/mail/index.php
+++ b/web/add/mail/index.php
@@ -61,7 +61,7 @@ top_panel($user,$TAB);
             unset($output);
 
             if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = "OK: domain <b>".$_POST[v_domain]."</b> has been created successfully.";
+                $_SESSION['ok_msg'] = "OK: domain <a href='/list/mail/?domain=".$_POST[v_domain]."'><b>".$_POST[v_domain]."</b></a> has been created successfully.";
                 unset($v_domain);
             }
         }
@@ -149,7 +149,7 @@ top_panel($user,$TAB);
 
             unset($output);
             if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = "OK: account <b>".$_POST['v_account']."</b> has been created successfully.";
+                $_SESSION['ok_msg'] = "OK: account <a href='/edit/mail/?account=".$_POST['v_account']."&domain=".$_POST[v_domain]."'><b>".$_POST['v_account']."@".$_POST[v_domain]."</b></a> has been created successfully.";
                 unset($v_account);
                 unset($v_password);
                 unset($v_password);
diff --git a/web/add/package/index.php b/web/add/package/index.php
index 7c9aa020f..cd093c836 100644
--- a/web/add/package/index.php
+++ b/web/add/package/index.php
@@ -119,7 +119,7 @@ if ($_SESSION['user'] == 'admin') {
 
             // Check output
             if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = "OK: package <b>".$_POST['v_package']."</b> has been created successfully.";
+                $_SESSION['ok_msg'] = "OK: package <a href='/edit/package/?package=".$_POST['v_package']."'><b>".$_POST['v_package']."</b></a> has been created successfully.";
                 unset($v_package);
             }
 
diff --git a/web/add/user/index.php b/web/add/user/index.php
index 19a37ae34..521e8b7b6 100644
--- a/web/add/user/index.php
+++ b/web/add/user/index.php
@@ -78,7 +78,7 @@ if ($_SESSION['user'] == 'admin') {
                     send_email($to, $subject, $mailtext, $from);
                 }
 
-                $_SESSION['ok_msg'] = "OK: user <b>".$_POST[v_username]."</b> has been created successfully.";
+                $_SESSION['ok_msg'] = "OK: user <a href='/edit/user/?user=".$_POST[v_username]."'><b>".$_POST[v_username]."</b></a> has been created successfully.";
                 unset($v_username);
                 unset($v_password);
                 unset($v_email);
diff --git a/web/add/web/index.php b/web/add/web/index.php
index 66bfe7b4a..716ccb3c9 100644
--- a/web/add/web/index.php
+++ b/web/add/web/index.php
@@ -287,7 +287,7 @@ top_panel($user,$TAB);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
-                $_SESSION['ok_msg'] = "OK: domain <b>".$_POST[v_domain]."</b> has been created successfully.";
+                $_SESSION['ok_msg'] = "OK: domain <a href='/edit/web/?domain=".$_POST[v_domain]."'><b>".$_POST[v_domain]."</b></a> has been created successfully.";
                 unset($v_domain);
                 unset($v_aliases);
                 unset($v_ssl);
diff --git a/web/templates/admin/add_cron.html b/web/templates/admin/add_cron.html
index aaee94a30..501a1fe7d 100644
--- a/web/templates/admin/add_cron.html
+++ b/web/templates/admin/add_cron.html
@@ -13,10 +13,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Adding Cron Job</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/add_db.html b/web/templates/admin/add_db.html
index 679946814..09c125c37 100644
--- a/web/templates/admin/add_db.html
+++ b/web/templates/admin/add_db.html
@@ -13,10 +13,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Adding Database</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/add_dns.html b/web/templates/admin/add_dns.html
index 6af2059c8..ca30f8df8 100644
--- a/web/templates/admin/add_dns.html
+++ b/web/templates/admin/add_dns.html
@@ -13,10 +13,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Adding DNS Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/add_dns_rec.html b/web/templates/admin/add_dns_rec.html
index e7faf55b7..8a9628906 100644
--- a/web/templates/admin/add_dns_rec.html
+++ b/web/templates/admin/add_dns_rec.html
@@ -13,10 +13,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Adding DNS Record</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/add_ip.html b/web/templates/admin/add_ip.html
index 79cc025f0..dd518a15b 100644
--- a/web/templates/admin/add_ip.html
+++ b/web/templates/admin/add_ip.html
@@ -13,10 +13,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Adding IP Address</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/add_mail.html b/web/templates/admin/add_mail.html
index e90535535..b26994e0b 100644
--- a/web/templates/admin/add_mail.html
+++ b/web/templates/admin/add_mail.html
@@ -13,10 +13,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Adding Mail Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html
index 38cac8bc8..ab657a508 100644
--- a/web/templates/admin/add_mail_acc.html
+++ b/web/templates/admin/add_mail_acc.html
@@ -13,10 +13,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Adding Mail Account</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html
index 28c066613..196df5eae 100644
--- a/web/templates/admin/add_package.html
+++ b/web/templates/admin/add_package.html
@@ -13,10 +13,10 @@
                                         <td style="padding: 10x 2px 0 0;" ><a class="name"><b>Adding Package</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html
index f1468c72b..79364c636 100644
--- a/web/templates/admin/add_user.html
+++ b/web/templates/admin/add_user.html
@@ -13,10 +13,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Adding User</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?> 
diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html
index e997090b5..e7e662ced 100644
--- a/web/templates/admin/add_web.html
+++ b/web/templates/admin/add_web.html
@@ -13,10 +13,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Adding Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/edit_cron.html b/web/templates/admin/edit_cron.html
index 44cf72def..63e430277 100644
--- a/web/templates/admin/edit_cron.html
+++ b/web/templates/admin/edit_cron.html
@@ -13,10 +13,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Editing Cron Job</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/edit_db.html b/web/templates/admin/edit_db.html
index 6ab99dc92..eb204aedd 100644
--- a/web/templates/admin/edit_db.html
+++ b/web/templates/admin/edit_db.html
@@ -12,10 +12,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Editing Database</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/edit_dns.html b/web/templates/admin/edit_dns.html
index 0eb029b4b..d47103ecf 100644
--- a/web/templates/admin/edit_dns.html
+++ b/web/templates/admin/edit_dns.html
@@ -12,10 +12,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Editing DNS Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/edit_dns_rec.html b/web/templates/admin/edit_dns_rec.html
index 0be931a2a..01a389aa3 100644
--- a/web/templates/admin/edit_dns_rec.html
+++ b/web/templates/admin/edit_dns_rec.html
@@ -12,10 +12,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Editing DNS Record</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/edit_ip.html b/web/templates/admin/edit_ip.html
index 7d46233ca..b7cd3b158 100644
--- a/web/templates/admin/edit_ip.html
+++ b/web/templates/admin/edit_ip.html
@@ -12,10 +12,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Editing IP Address</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/edit_mail.html b/web/templates/admin/edit_mail.html
index c1ebfd774..2e67ad06d 100644
--- a/web/templates/admin/edit_mail.html
+++ b/web/templates/admin/edit_mail.html
@@ -12,10 +12,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Editing Mail Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html
index 2a1c2f1a7..e2103502b 100644
--- a/web/templates/admin/edit_mail_acc.html
+++ b/web/templates/admin/edit_mail_acc.html
@@ -12,10 +12,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Editing Mail Account</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html
index ac87beaa3..c0f3326af 100644
--- a/web/templates/admin/edit_package.html
+++ b/web/templates/admin/edit_package.html
@@ -3,7 +3,7 @@
                                     if (empty($back)) {
                                         $back = "location.href='/list/package/'";
                                     } else {
-                                        $back = "javascript:history.back(1)";
+                                        $back = "location.href='".$back."'";
                                     }
                                 ?> 
 
@@ -12,10 +12,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Editing Package</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html
index 8e0987d16..eb560d07c 100644
--- a/web/templates/admin/edit_user.html
+++ b/web/templates/admin/edit_user.html
@@ -12,10 +12,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Editing User</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html
index 03f483bfd..35871c9e9 100644
--- a/web/templates/admin/edit_web.html
+++ b/web/templates/admin/edit_web.html
@@ -12,10 +12,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Editing Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/header.html b/web/templates/header.html
index 7d9ea06dd..449eb6b7d 100644
--- a/web/templates/header.html
+++ b/web/templates/header.html
@@ -171,7 +171,7 @@
             .nav-slink {
                 letter-spacing: -1.0px;
                 font-size: 16pt;
-                color: #7fa1cb;
+                color: #58a3ca;
                 font-family: Arial, sans-serif;
                 text-decoration: none;
             }
@@ -496,6 +496,15 @@
                 padding: 0 0 0 6px;
             }
 
+            .add-ok a{
+                color: #58934f;
+                text-decoration: none;
+            }
+
+            .add-ok a:hover{
+                text-decoration: underline;
+            }
+
             .add-error {
                 font-family: Arial;
                 font-size: 18px;
diff --git a/web/templates/user/add_dns.html b/web/templates/user/add_dns.html
index cb55a39b2..eca0732b7 100644
--- a/web/templates/user/add_dns.html
+++ b/web/templates/user/add_dns.html
@@ -12,10 +12,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Adding DNS Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
diff --git a/web/templates/user/add_web.html b/web/templates/user/add_web.html
index 32d7c014d..5ae6a638e 100644
--- a/web/templates/user/add_web.html
+++ b/web/templates/user/add_web.html
@@ -12,10 +12,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b>Adding Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"add-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"add-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>