diff --git a/mojotrollz/page/autoload.inc b/mojotrollz/page/autoload.inc
index e9d7ba9..330d093 100644
--- a/mojotrollz/page/autoload.inc
+++ b/mojotrollz/page/autoload.inc
@@ -8,9 +8,10 @@
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_visuals','');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_friend','');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_skills','');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_guild','');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_spawn','');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_summ','');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_reg','');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_summary','');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_register','');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/wizard_toolbar','');
 
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_default','');
diff --git a/mojotrollz/page/default_page/tpl/default_page.tpl b/mojotrollz/page/default_page/tpl/default_page.tpl
index c60e7a2..7d6a31e 100644
--- a/mojotrollz/page/default_page/tpl/default_page.tpl
+++ b/mojotrollz/page/default_page/tpl/default_page.tpl
@@ -18,7 +18,7 @@
                 </div>
                 <div class="threecol_row" style="">
                     <div id="frame_left_border" class="threecol_col" style="background: url(${PICPATH}border_left.png) repeat-y;"></div>
-                    <div id="frame_content"></div>                    
+                    <div id="frame_content"></div>
                     <div id="frame_right_border" class="threecol_col" style="background: url(${PICPATH}border_right.png) repeat-y;"></div>
                 </div>
                 <div id="frame_footer" class="threecol_row">
diff --git a/mojotrollz/page/page_mojotrollz.php b/mojotrollz/page/page_mojotrollz.php
index 952dfbe..30571f6 100644
--- a/mojotrollz/page/page_mojotrollz.php
+++ b/mojotrollz/page/page_mojotrollz.php
@@ -23,15 +23,18 @@ class page_mojotrollz extends \SYSTEM\API\api_default {
         
     public static function page_wizard_skills(){
         return new wizard_skills();}
+        
+    public static function page_wizard_guild(){
+        return new wizard_guild();}
     
     public static function page_wizard_spawn(){
         return new wizard_spawn();}
     
-    public static function page_wizard_summ(){
-        return new wizard_summ();}
+    public static function page_wizard_summary(){
+        return new wizard_summary();}
         
-    public static function page_wizard_reg(){
-        return new wizard_reg();}
+    public static function page_wizard_register(){
+        return new wizard_register();}
         
     public static function page_wizard_toolbar($last,$next){
         return new wizard_toolbar($last,$next);}
diff --git a/mojotrollz/page/wizard_details/js/wizard_details.js b/mojotrollz/page/wizard_details/js/wizard_details.js
index bcd5844..39021e8 100644
--- a/mojotrollz/page/wizard_details/js/wizard_details.js
+++ b/mojotrollz/page/wizard_details/js/wizard_details.js
@@ -1,6 +1,3 @@
-function init_wizard_details_toolbar(){
-    wizard_toolbar();}
-
 function init_wizard_details (){
     /*$('#charname').keyup(function(event){
         if(event.keyCode == 13){
diff --git a/mojotrollz/page/wizard_guild/js/wizard_guild.js b/mojotrollz/page/wizard_guild/js/wizard_guild.js
new file mode 100644
index 0000000..f745e90
--- /dev/null
+++ b/mojotrollz/page/wizard_guild/js/wizard_guild.js
@@ -0,0 +1,2 @@
+function init_wizard_guild(){
+}
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_guild/tpl/guild.tpl b/mojotrollz/page/wizard_guild/tpl/guild.tpl
new file mode 100644
index 0000000..b970f67
--- /dev/null
+++ b/mojotrollz/page/wizard_guild/tpl/guild.tpl
@@ -0,0 +1,2 @@
+guild
+<div id="frame_content_toolbar" style="padding-top: 115px; margin-top: 420px; height: 175px;"></div>
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_guild/wizard_guild.php b/mojotrollz/page/wizard_guild/wizard_guild.php
new file mode 100644
index 0000000..e8d3cf6
--- /dev/null
+++ b/mojotrollz/page/wizard_guild/wizard_guild.php
@@ -0,0 +1,13 @@
+<?php
+class wizard_guild extends SYSTEM\PAGE\Page {
+    public static function js(){
+        return array(    \SYSTEM\WEBPATH(new PPAGE(),'wizard_guild/js/wizard_guild.js'));}
+      
+    public static function css (){
+       return array();}
+
+    public function html(){
+        $vars = charcreation::data(NULL, false);
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_guild/tpl/guild.tpl'), $vars);
+    }
+}
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_reg/wizard_reg.php b/mojotrollz/page/wizard_reg/wizard_reg.php
deleted file mode 100644
index 1274d8e..0000000
--- a/mojotrollz/page/wizard_reg/wizard_reg.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-class wizard_reg extends SYSTEM\PAGE\Page {
-    
-    private function js(){        
-        return  '';
-   }
-   
-   private function css (){
-       return '';
-   }
-
-    public function html(){
-        $vars = array();               
-        $vars['js'] = $this->js();
-        $vars['css'] = $this->css();
-        $vars['BG'] = \SYSTEM\IMG\img::getURL('backgrounds');
-        $vars['BUTTONS'] = \SYSTEM\IMG\img::getURL('buttons');
-        $vars['WOWICONS'] = \SYSTEM\IMG\img::getURL('wowicons');
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_INFOTEXT_HELP));
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_reg/reg.tpl'), $vars);
-        
-    }
-}
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_reg/reg.tpl b/mojotrollz/page/wizard_register/tpl/register.tpl
similarity index 78%
rename from mojotrollz/page/wizard_reg/reg.tpl
rename to mojotrollz/page/wizard_register/tpl/register.tpl
index 123233e..b2447ee 100644
--- a/mojotrollz/page/wizard_reg/reg.tpl
+++ b/mojotrollz/page/wizard_register/tpl/register.tpl
@@ -42,9 +42,18 @@
                             minlength="5" data-validation-minlength-message="${register_password_too_short}"
                             maxlength="16" data-validation-maxlength-message="${register_password_too_long}"
                             required data-validation-required-message="${register_password_required}"/>
-                </div>        
-                
+                </div>
+                <div class="controls">
+                    <input  type="text"
+                            size="30"
+                            style="margin-bottom: 10px;"
+                            id="bt_register_password"
+                            placeholder="${register_beta_code}"
+                            minlength="5" data-validation-minlength-message="${register_beta_code_too_short}"
+                            maxlength="16" data-validation-maxlength-message="${register_beta_code_too_long}"
+                            required data-validation-required-message="${register_beta_code_required}"/>
+                </div>
         </form>
-                                    <div id="register" style=""><a href="#"><img src="${BUTTONS}register.png"/></a></div>
+        <div id="register" style=""><a href="#"><img src="${BUTTONS}back.png"/></a><a href="#"><img src="${BUTTONS}register.png"/></a></div>
     </div>
 </div>
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_register/wizard_register.php b/mojotrollz/page/wizard_register/wizard_register.php
new file mode 100644
index 0000000..c3f7a63
--- /dev/null
+++ b/mojotrollz/page/wizard_register/wizard_register.php
@@ -0,0 +1,12 @@
+<?php
+class wizard_register extends SYSTEM\PAGE\Page {
+    public function html(){
+        $vars = array();               
+        $vars['BG'] = \SYSTEM\FILES\files::getURL('backgrounds');
+        $vars['BUTTONS'] = \SYSTEM\FILES\files::getURL('buttons');
+        $vars['WOWICONS'] = \SYSTEM\FILES\files::getURL('wowicons');
+        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
+        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_INFOTEXT));
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_register/tpl/register.tpl'), $vars);
+    }
+}
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_skills/js/wizard_skills.js b/mojotrollz/page/wizard_skills/js/wizard_skills.js
index 5fac8af..09f3667 100644
--- a/mojotrollz/page/wizard_skills/js/wizard_skills.js
+++ b/mojotrollz/page/wizard_skills/js/wizard_skills.js
@@ -1,5 +1,2 @@
-function init_wizard_skills_toolbar(){
-    wizard_toolbar();}
-
 function init_wizard_skills(){
     skilltree();}
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_spawn/js/wizard_spawn.js b/mojotrollz/page/wizard_spawn/js/wizard_spawn.js
index f94d449..4cf7837 100644
--- a/mojotrollz/page/wizard_spawn/js/wizard_spawn.js
+++ b/mojotrollz/page/wizard_spawn/js/wizard_spawn.js
@@ -1,5 +1,5 @@
 var map_kalim=false;
-function wizard_spawn(){   
+function init_wizard_spawn(){   
     $('#mapchange').click(function(){
         if (map_kalim){
             $('#city_kalim').hide();
diff --git a/mojotrollz/page/wizard_spawn/spawn.tpl b/mojotrollz/page/wizard_spawn/tpl/spawn.tpl
similarity index 91%
rename from mojotrollz/page/wizard_spawn/spawn.tpl
rename to mojotrollz/page/wizard_spawn/tpl/spawn.tpl
index da57bf0..bf432a5 100644
--- a/mojotrollz/page/wizard_spawn/spawn.tpl
+++ b/mojotrollz/page/wizard_spawn/tpl/spawn.tpl
@@ -39,8 +39,7 @@
             </div>
         </div>            
     </div>
-         <div style="float: right; background: url(${BG}rexxar.png) no-repeat; width: 250px; height: 300px; margin-top: 100px;">
-                    &nbsp;
-         </div>       
+    <div style="float: right; background: url(${BG}rexxar.png) no-repeat; width: 250px; height: 300px;">&nbsp;</div>       
 </div>
-        
\ No newline at end of file
+<div class="clear"></div>
+<div id="frame_content_toolbar" style="padding-top: 15px; height: 75px;"></div>
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_spawn/wizard_spawn.php b/mojotrollz/page/wizard_spawn/wizard_spawn.php
index b189927..224e3ea 100644
--- a/mojotrollz/page/wizard_spawn/wizard_spawn.php
+++ b/mojotrollz/page/wizard_spawn/wizard_spawn.php
@@ -1,25 +1,20 @@
 <?php
-
 class wizard_spawn extends SYSTEM\PAGE\Page {
     
-    private function js(){        
-        return  '';
-   }
-   
-   private function css (){
-       return '';
-   }
+    public static function js(){
+        return array(   \SYSTEM\WEBPATH(new PPAGE(),'wizard_spawn/js/wizard_spawn.js'));}
+      
+    public static function css (){
+       return array();}
 
     public function html(){
-        $vars = array();               
-        $vars['js'] = $this->js();
-        $vars['css'] = $this->css();
+        $vars = array();
         $vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(),'wizard_spawn/img/');
-        $vars['CITYICONS'] = \SYSTEM\IMG\img::getURL('wow_city_icons');
-        $vars['BG'] = \SYSTEM\IMG\img::getURL('backgrounds');
+        $vars['CITYICONS'] = \SYSTEM\FILES\files::getURL('wow_city_icons');
+        $vars['BG'] = \SYSTEM\FILES\files::getURL('backgrounds');
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_INFOTEXT_HELP));
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_spawn/spawn.tpl'), $vars);
+        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_INFOTEXT));
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_spawn/tpl/spawn.tpl'), $vars);
         
     }
 }
diff --git a/mojotrollz/page/wizard_summ/wizard_summ.php b/mojotrollz/page/wizard_summ/wizard_summ.php
deleted file mode 100644
index ffd43ba..0000000
--- a/mojotrollz/page/wizard_summ/wizard_summ.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-class wizard_summ extends SYSTEM\PAGE\Page {
-    
-    private function js(){        
-        return  '';
-   }
-   
-   private function css (){
-       return '';
-   }
-
-    public function html(){
-        $vars = array();               
-        $vars['js'] = $this->js();
-        $vars['css'] = $this->css();        
-        return 'not implemented';        
-    }
-}
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_summary/tpl/summary.tpl b/mojotrollz/page/wizard_summary/tpl/summary.tpl
new file mode 100644
index 0000000..e6f66c3
--- /dev/null
+++ b/mojotrollz/page/wizard_summary/tpl/summary.tpl
@@ -0,0 +1,2 @@
+Not implemented
+<div id="frame_content_toolbar" style="padding-top: 115px; margin-top: 420px; height: 175px;"></div>
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_summary/wizard_summary.php b/mojotrollz/page/wizard_summary/wizard_summary.php
new file mode 100644
index 0000000..a4192a5
--- /dev/null
+++ b/mojotrollz/page/wizard_summary/wizard_summary.php
@@ -0,0 +1,8 @@
+<?php
+class wizard_summary extends SYSTEM\PAGE\Page {
+
+    public function html(){
+        $vars = array();
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_summary/tpl/summary.tpl'), $vars);       
+    }
+}
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_toolbar/js/wizard_toolbar.js b/mojotrollz/page/wizard_toolbar/js/wizard_toolbar.js
index 7a25ac4..815d540 100644
--- a/mojotrollz/page/wizard_toolbar/js/wizard_toolbar.js
+++ b/mojotrollz/page/wizard_toolbar/js/wizard_toolbar.js
@@ -1,2 +1,2 @@
-function wizard_toolbar(){
+function init_wizard_toolbar(){
     $('.tb_link').click(function(){system.load($(this).attr('sysload'));});}
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl b/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl
index 4c9324a..c17ad0b 100644
--- a/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl
+++ b/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl
@@ -4,7 +4,7 @@
 <a class="tb_link" id="tb_class" sysload="wizard_details" href="#wizard_details" style="padding-left: 10px;"><img src="${WOW_CLASS}${char_class}.png" /></a>
 <a class="tb_link" id="tb_visuals" sysload="wizard_visuals" href="#wizard_visuals" style="padding-left: 30px;"><img src="${WOWICONS}default.png" /></a>
 <a class="tb_link" id="tb_skills" sysload="wizard_skills" href="#wizard_skills" style="padding-left: 30px;"><img src="${WOWICONS}default.png" /></a>
-<a class="skill" href="#" style="padding-left: 30px;"><img src="${WOWICONS}default.png" /></a>
-<a class="skill" href="#" style="padding-left: 30px;"><img src="${WOWICONS}default.png" /></a>
-<a class="spawn" href="#" style="padding-left: 30px;"><img src="${WOWICONS}default.png" /></a>
+<a class="tb_link" id="tb_guild" sysload="wizard_guild" href="#wizard_guild" style="padding-left: 30px;"><img src="${WOWICONS}default.png" /></a>
+<a class="tb_link" id="tb_spawn" sysload="wizard_spawn" href="#wizard_spawn" style="padding-left: 30px;"><img src="${WOWICONS}default.png" /></a>
+<a class="tb_link" id="tb_summary" sysload="wizard_summary" href="#wizard_summary" style="padding-left: 30px;"><img src="${WOWICONS}default.png" /></a>
 <a class="tb_link" id="tb_next" sysload="${next}" href="#${next}" style="padding-left: 15px;"><img src="${WOWICONS}arrow_right.png" /></a>
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_visuals/js/wizard_visuals.js b/mojotrollz/page/wizard_visuals/js/wizard_visuals.js
index b3a47cc..2fdebe5 100644
--- a/mojotrollz/page/wizard_visuals/js/wizard_visuals.js
+++ b/mojotrollz/page/wizard_visuals/js/wizard_visuals.js
@@ -1,6 +1,3 @@
-function init_wizard_visuals_toolbar(){
-    wizard_toolbar();}
-
 function init_wizard_visuals (){
     $('#sel_0').change(function(){
         sendInfo('{"char_skin_color" : "'+$(this).val()+'"}','wizard_visuals');});