diff --git a/mojotrollz/page/account_tbc/account_tbc.php b/mojotrollz/page/account_tbc/account_tbc.php
new file mode 100644
index 0000000..3d71431
--- /dev/null
+++ b/mojotrollz/page/account_tbc/account_tbc.php
@@ -0,0 +1,25 @@
+<?php
+class account_tbc 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_tbc/js/account_tbc.js'));}
+    public function html(){
+        if(!\SYSTEM\SECURITY\security::isLoggedIn()){
+            throw new \SYSTEM\LOG\ERROR("You need to be logged in!");}
+        
+        $vars = \SYSTEM\PAGE\text::tag('mojotrollz');
+        $vars['email'] = \SYSTEM\SECURITY\security::getUser()->email;
+        $vars['wow_accounts'] = '';
+        $res = \SYSTEM\SECURITY\security::getUser()->email_confirmed ? \SQL\MOJO_ACCOUNT_ACCOUNTS::QQ(array($vars['email'])) : \SQL\MOJO_ACCOUNT_MAIN_ACCOUNT::QQ(array($vars['username'],$vars['email']));
+        while($row = $res->next()){
+            $row['online'] = $row['online'] == 1 ? 'online' : 'offline';
+            $vars['wow_accounts'] .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_account/tpl/wow_account.tpl'))->SERVERPATH(), $row);}
+        $vars['wow_accounts_confirm'] = \SYSTEM\SECURITY\security::getUser()->email_confirmed ? '' : \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_account/tpl/wow_accounts_confirm.tpl'))->SERVERPATH());
+        return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('account_tbc/tpl/account_tbc.tpl'))->SERVERPATH(), $vars);
+    }
+
+    public static function css() {return array();}
+}
\ No newline at end of file
diff --git a/mojotrollz/page/account_tbc/autoload.inc b/mojotrollz/page/account_tbc/autoload.inc
new file mode 100644
index 0000000..a05a7ef
--- /dev/null
+++ b/mojotrollz/page/account_tbc/autoload.inc
@@ -0,0 +1,3 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__));
+//\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','SQL');
\ No newline at end of file
diff --git a/mojotrollz/page/account_tbc/js/account_tbc.js b/mojotrollz/page/account_tbc/js/account_tbc.js
new file mode 100644
index 0000000..16796e0
--- /dev/null
+++ b/mojotrollz/page/account_tbc/js/account_tbc.js
@@ -0,0 +1,4 @@
+function init_account_tbc(){
+    $("#account_menu li").removeClass("active");
+    $('#li_tbc').addClass('active');
+}
\ 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
new file mode 100644
index 0000000..fa85d67
--- /dev/null
+++ b/mojotrollz/page/account_tbc/tpl/account_tbc.tpl
@@ -0,0 +1,12 @@
+<div class="panel panel-default">
+    <div class="panel-heading"><h4>TBC WoW Account</h4></div>
+    <div class="panel-body">
+        <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>
+        ${wow_accounts}
+        ${wow_accounts_confirm}
+    </div>
+</div>
\ No newline at end of file
diff --git a/mojotrollz/page/account_website/account_website.php b/mojotrollz/page/account_website/account_website.php
new file mode 100644
index 0000000..d80f55d
--- /dev/null
+++ b/mojotrollz/page/account_website/account_website.php
@@ -0,0 +1,22 @@
+<?php
+class account_website 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_website/js/account_website.js'));}
+    public function html(){
+        if(!\SYSTEM\SECURITY\security::isLoggedIn()){
+            throw new \SYSTEM\LOG\ERROR("You need to be logged in!");}
+        
+        $vars = \SYSTEM\PAGE\text::tag('mojotrollz');
+        $vars['email'] = \SYSTEM\SECURITY\security::getUser()->email;
+        $vars['username'] = \SYSTEM\SECURITY\security::getUser()->username;
+        $vars['option_confirm_email'] = \SYSTEM\SECURITY\security::getUser()->email_confirmed ? '' : \SYSTEM\PAGE\replace::replaceFile((new PPAGE('account_website/tpl/option_confirm_email.tpl'))->SERVERPATH(),$vars);
+    
+        return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('account_website/tpl/account_website.tpl'))->SERVERPATH(), $vars);
+    }
+
+    public static function css() {return array();}
+}
\ No newline at end of file
diff --git a/mojotrollz/page/account_website/autoload.inc b/mojotrollz/page/account_website/autoload.inc
new file mode 100644
index 0000000..a05a7ef
--- /dev/null
+++ b/mojotrollz/page/account_website/autoload.inc
@@ -0,0 +1,3 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__));
+//\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','SQL');
\ No newline at end of file
diff --git a/mojotrollz/page/account_website/js/account_website.js b/mojotrollz/page/account_website/js/account_website.js
new file mode 100644
index 0000000..b906eda
--- /dev/null
+++ b/mojotrollz/page/account_website/js/account_website.js
@@ -0,0 +1,15 @@
+function init_account_website(){
+    $('#link_confirm_email').click(function(){
+        system.account_confirm_email($(this).attr('user'),function (data) {
+            if(data.status){
+                $('#notice_email_confirm').html("EMail sent");
+            } else {
+                $('#notice_email_confirm').html("An Error occurred.");
+            }
+            $('#notice_email_confirm').show();
+        });
+    });
+    
+    $("#account_menu li").removeClass("active");
+    $('#li_account').addClass('active');
+}
\ No newline at end of file
diff --git a/mojotrollz/page/account_website/tpl/account_website.tpl b/mojotrollz/page/account_website/tpl/account_website.tpl
new file mode 100644
index 0000000..fa6044b
--- /dev/null
+++ b/mojotrollz/page/account_website/tpl/account_website.tpl
@@ -0,0 +1,8 @@
+<div class="panel panel-default">
+    <div class="panel-heading"><h4>Account</h4></div>
+    <div class="panel-body">
+        You are logged in as <b>${email}</b><br>
+        Your Website Account-Name is: <b>${username}</b><br>
+        ${option_confirm_email}
+    </div>
+</div>
\ No newline at end of file
diff --git a/mojotrollz/page/default_account/tpl/option_confirm_email.tpl b/mojotrollz/page/account_website/tpl/option_confirm_email.tpl
similarity index 100%
rename from mojotrollz/page/default_account/tpl/option_confirm_email.tpl
rename to mojotrollz/page/account_website/tpl/option_confirm_email.tpl
diff --git a/mojotrollz/page/autoload.inc b/mojotrollz/page/autoload.inc
index d347d2a..141d1d8 100644
--- a/mojotrollz/page/autoload.inc
+++ b/mojotrollz/page/autoload.inc
@@ -8,4 +8,7 @@ require_once dirname(__FILE__).'/default_serverlist/autoload.inc';
 require_once dirname(__FILE__).'/default_beta/autoload.inc';
 require_once dirname(__FILE__).'/default_article/autoload.inc';
 require_once dirname(__FILE__).'/default_donate/autoload.inc';
-require_once dirname(__FILE__).'/default_register/autoload.inc';
\ No newline at end of file
+require_once dirname(__FILE__).'/default_register/autoload.inc';
+
+require_once dirname(__FILE__).'/account_website/autoload.inc';
+require_once dirname(__FILE__).'/account_tbc/autoload.inc';
\ No newline at end of file
diff --git a/mojotrollz/page/default_account/default_account.php b/mojotrollz/page/default_account/default_account.php
index 44aa36d..9f42fc3 100644
--- a/mojotrollz/page/default_account/default_account.php
+++ b/mojotrollz/page/default_account/default_account.php
@@ -10,17 +10,6 @@ class default_account implements \SYSTEM\PAGE\Page {
         $vars = \SYSTEM\PAGE\text::tag('mojotrollz');
         if(!\SYSTEM\SECURITY\security::isLoggedIn()){
             return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_account/tpl/loggedout.tpl'))->SERVERPATH(), $vars);}
-        
-        $vars['email'] = \SYSTEM\SECURITY\security::getUser()->email;
-        $vars['username'] = \SYSTEM\SECURITY\security::getUser()->username;
-        $vars['option_confirm_email'] = \SYSTEM\SECURITY\security::getUser()->email_confirmed ? '' : \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_account/tpl/option_confirm_email.tpl'))->SERVERPATH(),$vars);
-    
-        $vars['wow_accounts'] = '';
-        $res = \SYSTEM\SECURITY\security::getUser()->email_confirmed ? \SQL\MOJO_ACCOUNT_ACCOUNTS::QQ(array($vars['email'])) : \SQL\MOJO_ACCOUNT_MAIN_ACCOUNT::QQ(array($vars['username'],$vars['email']));
-        while($row = $res->next()){
-            $row['online'] = $row['online'] == 1 ? 'online' : 'offline';
-            $vars['wow_accounts'] .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_account/tpl/wow_account.tpl'))->SERVERPATH(), $row);}
-        $vars['wow_accounts_confirm'] = \SYSTEM\SECURITY\security::getUser()->email_confirmed ? '' : \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_account/tpl/wow_accounts_confirm.tpl'))->SERVERPATH());
         return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_account/tpl/loggedin.tpl'))->SERVERPATH(), $vars);
     }
 
diff --git a/mojotrollz/page/default_account/js/default_account.js b/mojotrollz/page/default_account/js/default_account.js
index 9b01a39..131f449 100644
--- a/mojotrollz/page/default_account/js/default_account.js
+++ b/mojotrollz/page/default_account/js/default_account.js
@@ -30,15 +30,4 @@ function init_account(){
             event.preventDefault();
         }
     });
-    
-    $('#link_confirm_email').click(function(){
-        system.account_confirm_email($(this).attr('user'),function (data) {
-            if(data.status){
-                $('#notice_email_confirm').html("EMail sent");
-            } else {
-                $('#notice_email_confirm').html("An Error occurred.");
-            }
-            $('#notice_email_confirm').show();
-        });
-    });
 }
\ No newline at end of file
diff --git a/mojotrollz/page/default_account/tpl/loggedin.tpl b/mojotrollz/page/default_account/tpl/loggedin.tpl
index 57dfa08..61e4c02 100644
--- a/mojotrollz/page/default_account/tpl/loggedin.tpl
+++ b/mojotrollz/page/default_account/tpl/loggedin.tpl
@@ -1,44 +1,27 @@
 <div class="row-fluid">
-    <br><br>
-    <div class="col-md-6 col-md-offset-3">
+    <br>
+    <br>
+    <div class="col-md-3">
         <div class="panel panel-success">
             <div class="panel-heading"><h4>Account</h4></div>
             <div class="panel-body">
-                You are logged in as <b>${email}</b><br>
-                Your Website Account-Name is: <b>${username}</b><br>
-                ${option_confirm_email}
-            </div>
-        </div>
-    </div>
-</div>
-<div class="row-fluid">
-    <div class="col-md-6 col-md-offset-3">
-        <div class="panel panel-default">
-            <div class="panel-heading"><h4>WoW Account</h4></div>
-            <div class="panel-body">
-                <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>
-                ${wow_accounts}
-                ${wow_accounts_confirm}
-            </div>
-        </div>
-    </div>
-</div>
-<div class="row-fluid">
-    <div class="col-md-6 col-md-offset-3">
-        <div class="panel panel-default">
-            <div class="panel-body">
-                <form class="textbox" style="padding:10px" id="logout_form">
-                    <div class="control-group">
-                        <input type="hidden" />
-                        <button class="btn-sm btn btn-primary" style="width: 100%;" type="submit" id="logout_submit"><span class="glyphicon glyphicon-log-out" aria-hidden="true"></span> ${basic_logout}</button>
-                        <div class="help-block"></div>
-                    </div>
-                </form>
+                <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>
+                    <br>
+                    <li>
+                        <form class="textbox" style="padding:10px" id="logout_form">
+                            <div class="control-group">
+                                <input type="hidden" />
+                                <button class="btn-sm btn btn-primary" style="width: 100%;" type="submit" id="logout_submit"><span class="glyphicon glyphicon-log-out" aria-hidden="true"></span> ${basic_logout}</button>
+                                <div class="help-block"></div>
+                            </div>
+                        </form>
+                    </li>
+                </ul>
             </div>
         </div>
+        
     </div>
+    <div class="col-md-9" id="content_account"></div>
 </div>
\ No newline at end of file
diff --git a/mojotrollz/page/page_mojotrollz.php b/mojotrollz/page/page_mojotrollz.php
index 17d533d..3f03f8a 100644
--- a/mojotrollz/page/page_mojotrollz.php
+++ b/mojotrollz/page/page_mojotrollz.php
@@ -33,4 +33,10 @@ class page_mojotrollz extends \SYSTEM\API\api_default {
         
     public static function page_register(){
         return (new default_register())->html();}
+        
+    public static function page_account_website(){
+        return (new account_website())->html();}
+        
+    public static function page_account_tbc(){
+        return (new account_tbc())->html();}
 }
\ No newline at end of file