diff --git a/mojotrollz/page/account_serverstatus/account_serverstatus.php b/mojotrollz/page/account_serverstatus/account_serverstatus.php
new file mode 100644
index 0000000..9fee92e
--- /dev/null
+++ b/mojotrollz/page/account_serverstatus/account_serverstatus.php
@@ -0,0 +1,22 @@
+<?php
+class account_serverstatus implements \SYSTEM\PAGE\Page {
+    public static function title(){
+        return \SYSTEM\PAGE\text::get('title_account');}
+    public static function meta(){
+        return \SYSTEM\PAGE\text::tag('meta_account');}
+    public static function js(){
+        return array(new \PPAGE('account_serverstatus/js/account_serverstatus.js'));}
+    public function html(){
+        $vars = \SYSTEM\PAGE\text::tag('mojotrollz');
+        
+        if(!\SYSTEM\SECURITY\security::isLoggedIn()){
+            return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('account_website/tpl/account_login.tpl'))->SERVERPATH(), $vars);}
+        
+        $vars['realm_online']   = \SAI\saimod_mojotrollz_server_handling::sai_mod__SAI_saimod_mojotrollz_server_handling_action_run_tbc_realm_status() == 1 ? 'online' : 'offline';
+        $vars['world_online']   = \SAI\saimod_mojotrollz_server_handling::sai_mod__SAI_saimod_mojotrollz_server_handling_action_run_tbc_world_status() == 1 ? 'online' : 'offline';
+        $vars['test_online']    = \SAI\saimod_mojotrollz_server_handling::sai_mod__SAI_saimod_mojotrollz_server_handling_action_run_tbc_world_test_status() == 1 ? 'online' : 'offline';
+        return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('account_serverstatus/tpl/account_serverstatus.tpl'))->SERVERPATH(), $vars);
+    }
+
+    public static function css() {return array();}
+}
\ No newline at end of file
diff --git a/mojotrollz/page/account_serverstatus/autoload.inc b/mojotrollz/page/account_serverstatus/autoload.inc
new file mode 100644
index 0000000..e2c9da4
--- /dev/null
+++ b/mojotrollz/page/account_serverstatus/autoload.inc
@@ -0,0 +1,2 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__));
\ No newline at end of file
diff --git a/mojotrollz/page/account_serverstatus/js/account_serverstatus.js b/mojotrollz/page/account_serverstatus/js/account_serverstatus.js
new file mode 100644
index 0000000..fb9e3fc
--- /dev/null
+++ b/mojotrollz/page/account_serverstatus/js/account_serverstatus.js
@@ -0,0 +1,4 @@
+function init_account_serverstatus(){
+    $("#account_menu li").removeClass("active");
+    $('#li_serverstatus').addClass('active');
+}
\ No newline at end of file
diff --git a/mojotrollz/page/account_serverstatus/tpl/account_serverstatus.tpl b/mojotrollz/page/account_serverstatus/tpl/account_serverstatus.tpl
new file mode 100644
index 0000000..22e2a29
--- /dev/null
+++ b/mojotrollz/page/account_serverstatus/tpl/account_serverstatus.tpl
@@ -0,0 +1,31 @@
+<div class="panel panel-default">
+    <div class="panel-heading"><h4>Server Status</h4></div>
+    <div class="panel-body">
+        <table style="width: 100%;">
+            <tr>
+                <td>
+                    <b>Realm Server:&nbsp;&nbsp;</b>
+                </td>
+                <td style="text-align: right;">
+                    ${realm_online}&nbsp;&nbsp;<img src="./api.php?call=files&cat=content&id=${realm_online}.png" width="18" height="18"/>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <b>World Server: </b>
+                </td>
+                <td style="text-align: right;">
+                    ${world_online}&nbsp;&nbsp;<img src="./api.php?call=files&cat=content&id=${world_online}.png" width="18" height="18"/>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <b>Test Server: </b>
+                </td>
+                <td style="text-align: right;">
+                    ${test_online}&nbsp;&nbsp;<img src="./api.php?call=files&cat=content&id=${test_online}.png" width="18" height="18"/>
+                </td>
+            </tr>
+        </table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/mojotrollz/page/account_tbc/tpl/account_tbc.tpl b/mojotrollz/page/account_tbc/tpl/account_tbc.tpl
index fa85d67..e7be014 100644
--- a/mojotrollz/page/account_tbc/tpl/account_tbc.tpl
+++ b/mojotrollz/page/account_tbc/tpl/account_tbc.tpl
@@ -4,7 +4,7 @@
         <div class="row-fluid">
             <div class="col-md-6"><b>Username</b></div>
             <div class="col-md-3"><b>Chars</b></div>
-            <div class="col-md-3"><b>Online</b></div>
+            <div class="col-md-3" style="text-align: right;"><b>Online</b></div>
         </div>
         ${wow_accounts}
         ${wow_accounts_confirm}
diff --git a/mojotrollz/page/account_tbc_account/tpl/account_tbc_account.tpl b/mojotrollz/page/account_tbc_account/tpl/account_tbc_account.tpl
index 97c9353..ae9731e 100644
--- a/mojotrollz/page/account_tbc_account/tpl/account_tbc_account.tpl
+++ b/mojotrollz/page/account_tbc_account/tpl/account_tbc_account.tpl
@@ -4,7 +4,7 @@
         <div class="row-fluid">
             <div class="col-md-6"><b>Character</b></div>
             <div class="col-md-3"><b>Level</b></div>
-            <div class="col-md-3"><b>Online</b></div>
+            <div class="col-md-3" style="text-align: right;"><b>Online</b></div>
         </div>
         ${wow_characters}
         ${account_changepassword}
diff --git a/mojotrollz/page/account_tbc_account/tpl/wow_character.tpl b/mojotrollz/page/account_tbc_account/tpl/wow_character.tpl
index 86acd99..d556fd1 100644
--- a/mojotrollz/page/account_tbc_account/tpl/wow_character.tpl
+++ b/mojotrollz/page/account_tbc_account/tpl/wow_character.tpl
@@ -1,5 +1,5 @@
 <div class="row-fluid">
     <div class="col-md-6">${name}</div>
     <div class="col-md-3">${level}</div>
-    <div class="col-md-3"><img src="./api.php?call=files&cat=content&id=${online}.png" width="18" height="18"/></div>
+    <div class="col-md-3" style="text-align: right;"><img src="./api.php?call=files&cat=content&id=${online}.png" width="18" height="18"/></div>
 </div>
\ No newline at end of file
diff --git a/mojotrollz/page/autoload.inc b/mojotrollz/page/autoload.inc
index e7b8c0d..58b044f 100644
--- a/mojotrollz/page/autoload.inc
+++ b/mojotrollz/page/autoload.inc
@@ -14,6 +14,7 @@ require_once dirname(__FILE__).'/default_resetpassword/autoload.inc';
 require_once dirname(__FILE__).'/account_website/autoload.inc';
 require_once dirname(__FILE__).'/account_changepassword/autoload.inc';
 require_once dirname(__FILE__).'/account_changeemail/autoload.inc';
+require_once dirname(__FILE__).'/account_serverstatus/autoload.inc';
 
 require_once dirname(__FILE__).'/account_tbc/autoload.inc';
 require_once dirname(__FILE__).'/account_tbc_new/autoload.inc';
diff --git a/mojotrollz/page/default_account/tpl/loggedin.tpl b/mojotrollz/page/default_account/tpl/loggedin.tpl
index 61e4c02..18256eb 100644
--- a/mojotrollz/page/default_account/tpl/loggedin.tpl
+++ b/mojotrollz/page/default_account/tpl/loggedin.tpl
@@ -6,8 +6,9 @@
             <div class="panel-heading"><h4>Account</h4></div>
             <div class="panel-body">
                 <ul class="nav nav-pills nav-stacked" id="account_menu">
-                    <li id="li_account" class="active"><a href="#!account">Website Account</a></li>
-                    <li id="li_tbc"><a href="#!account(tbc)">WoW TBC Accounts</a></li>
+                    <li id="li_account" class="active"><a href="#!account"><span class="glyphicon glyphicon-user" aria-hidden="true"></span>&nbsp;&nbsp;Website Account</a></li>
+                    <li id="li_serverstatus"><a href="#!account(serverstatus)"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span>&nbsp;&nbsp;Serverstatus</a></li>
+                    <li id="li_tbc"><a href="#!account(tbc)"><span class="glyphicon glyphicon-star" aria-hidden="true"></span>&nbsp;&nbsp;WoW TBC Accounts</a></li>
                     <br>
                     <li>
                         <form class="textbox" style="padding:10px" id="logout_form">
diff --git a/mojotrollz/page/default_account/tpl/wow_account.tpl b/mojotrollz/page/default_account/tpl/wow_account.tpl
index 471f492..836b912 100644
--- a/mojotrollz/page/default_account/tpl/wow_account.tpl
+++ b/mojotrollz/page/default_account/tpl/wow_account.tpl
@@ -1,5 +1,5 @@
 <div class="row-fluid">
     <div class="col-md-6"><a href="#!account(tbc_account);account.${username}">${username}</a></div>
     <div class="col-md-3">${count}</div>
-    <div class="col-md-3"><img src="./api.php?call=files&cat=content&id=${online}.png" width="18" height="18"/></div>
+    <div class="col-md-3" style="text-align: right;"><img src="./api.php?call=files&cat=content&id=${online}.png" width="18" height="18"/></div>
 </div>
\ No newline at end of file
diff --git a/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl b/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl
index 1746a6f..f1062a2 100644
--- a/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl
+++ b/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl
@@ -15,29 +15,29 @@
 <div class="panel panel-success">
     <div class="panel-heading"><h4>Server Status</h4></div>
     <div class="panel-body">
-        <table>
+        <table style="width: 100%;">
             <tr>
                 <td>
-                    <b>Realm:&nbsp;&nbsp;</b>
+                    <b>Realm Server:&nbsp;&nbsp;</b>
                 </td>
-                <td>
-                    <img src="./api.php?call=files&cat=content&id=${realm_online}.png" width="18" height="18"/>&nbsp;&nbsp;${realm_online}
+                <td style="text-align: right;">
+                    ${realm_online}&nbsp;&nbsp;<img src="./api.php?call=files&cat=content&id=${realm_online}.png" width="18" height="18"/>
                 </td>
             </tr>
             <tr>
                 <td>
-                    <b>World: </b>
+                    <b>World Server: </b>
                 </td>
-                <td>
-                    <img src="./api.php?call=files&cat=content&id=${world_online}.png" width="18" height="18"/>&nbsp;&nbsp;${world_online}
+                <td style="text-align: right;">
+                    ${world_online}&nbsp;&nbsp;<img src="./api.php?call=files&cat=content&id=${world_online}.png" width="18" height="18"/>
                 </td>
             </tr>
             <tr>
                 <td>
-                    <b>Test: </b>
+                    <b>Test Server: </b>
                 </td>
-                <td>
-                    <img src="./api.php?call=files&cat=content&id=${test_online}.png" width="18" height="18"/>&nbsp;&nbsp;${test_online}
+                <td style="text-align: right;">
+                    ${test_online}&nbsp;&nbsp;<img src="./api.php?call=files&cat=content&id=${test_online}.png" width="18" height="18"/>
                 </td>
             </tr>
         </table>
@@ -49,7 +49,7 @@
         <div class="row-fluid">
             <div class="col-md-6"><b>Username</b></div>
             <div class="col-md-3"><b>Chars</b></div>
-            <div class="col-md-3"><b>Online</b></div>
+            <div class="col-md-3" style="text-align: right;"><b>Online</b></div>
         </div>
         ${wow_accounts}
     </div>
diff --git a/mojotrollz/page/page_mojotrollz.php b/mojotrollz/page/page_mojotrollz.php
index 0dcad05..2b1d777 100644
--- a/mojotrollz/page/page_mojotrollz.php
+++ b/mojotrollz/page/page_mojotrollz.php
@@ -46,6 +46,9 @@ class page_mojotrollz extends \SYSTEM\API\api_default {
     public static function page_account_changeemail(){
         return (new account_changeemail())->html();}
         
+    public static function page_account_serverstatus(){
+        return (new account_serverstatus())->html();}
+        
     public static function page_account_tbc(){
         return (new account_tbc())->html();}
     
diff --git a/mojotrollz/sql/mysql/system_page.sql b/mojotrollz/sql/mysql/system_page.sql
index 85586eb..ee147bd 100644
--- a/mojotrollz/sql/mysql/system_page.sql
+++ b/mojotrollz/sql/mysql/system_page.sql
@@ -11,15 +11,16 @@ REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`
 REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (21, 1, 'website', 'account', 20, 1, 0, '#content_account', './?page=account_website', 'init_account_website', 'account_website');
 REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (22, 1, 'changepassword', 'account', 20, 1, 1, '#content_account', './?page=account_changepassword', 'init_account_changepassword', 'account_changepassword');
 REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (23, 1, 'changeemail', 'account', 20, 1, 1, '#content_account', './?page=account_changeemail', 'init_account_changeemail', 'account_changeemail');
+REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (24, 1, 'serverstatus', 'account', 20, 1, 1, '#content_account', './?page=account_serverstatus', 'init_account_serverstatus', 'account_serverstatus');
 
-REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (24, 1, 'tbc', 'account', 20, 1, 1, '#content_account', './?page=account_tbc', 'init_account_tbc', 'account_tbc');
-REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (25, 1, 'tbc_new', 'account', 20, 1, 1, '#content_account', './?page=account_tbc_new', 'init_account_tbc_new', 'account_tbc_new');
-REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (26, 1, 'tbc_account', 'account', 20, 1, 1, '#content_account', './?page=account_tbc_account&account=${account}', 'init_account_tbc_account', 'account_tbc_account');
-REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (27, 1, 'tbc_changepassword', 'account', 20, 1, 1, '#content_account', './?page=account_tbc_changepassword&account=${account}', 'init_account_tbc_changepassword', 'account_tbc_changepassword');
+REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (25, 1, 'tbc', 'account', 20, 1, 1, '#content_account', './?page=account_tbc', 'init_account_tbc', 'account_tbc');
+REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (26, 1, 'tbc_new', 'account', 20, 1, 1, '#content_account', './?page=account_tbc_new', 'init_account_tbc_new', 'account_tbc_new');
+REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (27, 1, 'tbc_account', 'account', 20, 1, 1, '#content_account', './?page=account_tbc_account&account=${account}', 'init_account_tbc_account', 'account_tbc_account');
+REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (28, 1, 'tbc_changepassword', 'account', 20, 1, 1, '#content_account', './?page=account_tbc_changepassword&account=${account}', 'init_account_tbc_changepassword', 'account_tbc_changepassword');
 
-REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (28, 1, 'beta', 'beta', -1, 0, 0, '#content', './?page=beta', 'init_beta', 'default_beta');
-REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (29, 1, 'register', 'register', -1, 0, 0, '#content', './?page=register', 'init_register', 'default_register');
+REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (29, 1, 'beta', 'beta', -1, 0, 0, '#content', './?page=beta', 'init_beta', 'default_beta');
+REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (30, 1, 'register', 'register', -1, 0, 0, '#content', './?page=register', 'init_register', 'default_register');
 
-REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (30, 1, 'article', 'article', -1, 0, 0, '#content', './?page=article&id=${article}', 'init_article', 'default_article');
+REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (31, 1, 'article', 'article', -1, 0, 0, '#content', './?page=article&id=${article}', 'init_article', 'default_article');
 
 REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (35, 1, 'donate', 'donate', -1, 0, 0, '#content', './?page=donate', 'init_donate', 'default_donate');