diff --git a/mojotrollz/api/char/charcreation_validator.php b/mojotrollz/api/char/charcreation_validator.php
index 5a9ec92..08c5ebe 100644
--- a/mojotrollz/api/char/charcreation_validator.php
+++ b/mojotrollz/api/char/charcreation_validator.php
@@ -64,5 +64,9 @@ class charcreation_validator {
     public static function char_skill_tree($value){}
     public static function char_equip($value){}
     public static function char_guild($value){}
-    public static function char_spawn($value){}
+    public static function char_spawn($value){
+        $data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY);
+        $data['char_spawn'] = $value;
+        \SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data);
+    }
 }
\ No newline at end of file
diff --git a/mojotrollz/api/char/qq/RACE_VISUALS_BY_ID.php b/mojotrollz/api/char/qq/RACE_VISUALS_BY_ID.php
new file mode 100644
index 0000000..4d629fa
--- /dev/null
+++ b/mojotrollz/api/char/qq/RACE_VISUALS_BY_ID.php
@@ -0,0 +1,12 @@
+<?php
+namespace DBD;
+
+class RACE_VISUALS_BY_ID extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'',
+//mys
+'SELECT * FROM mojotrollz_visuals WHERE race = ? AND type = ? AND id = ?;'
+);}}
+
diff --git a/mojotrollz/api/database/player_spawns.php b/mojotrollz/api/database/player_spawns.php
new file mode 100644
index 0000000..97ede34
--- /dev/null
+++ b/mojotrollz/api/database/player_spawns.php
@@ -0,0 +1,53 @@
+<?php
+class player_spawns {
+    const UNDERCITY = 1;
+    const UNDERCITY_NAME = 'Undercity';
+    
+    const IRONFORGE = 2;
+    const IRONFORGE_NAME = 'Ironforge';
+    
+    const STORMWIND = 3;
+    const STORMWIND_NAME = 'Stormwind';
+    
+    const DARNASSUS = 4;
+    const DARNASSUS_NAME = 'Darnassus';
+    
+    const ORGRIMMAR = 5;
+    const ORGRIMMAR_NAME = 'Orgrimmar';
+    
+    const THUNDERBLUFF = 6;
+    const THUNDERBLUFF_NAME = 'Thunderbluff';
+    
+    public static function name($city){
+        switch($city){
+            case self::UNDERCITY:
+                return self::UNDERCITY_NAME;
+            case self::IRONFORGE:
+                return self::IRONFORGE_NAME;
+            case self::STORMWIND:
+                return self::STORMWIND_NAME;
+            case self::DARNASSUS:
+                return self::DARNASSUS_NAME;
+            case self::ORGRIMMAR:
+                return self::ORGRIMMAR_NAME;
+            case self::THUNDERBLUFF:
+                return self::THUNDERBLUFF_NAME;
+            default:
+                return 'default';
+        }
+    }
+    
+    public static function is($city){
+        switch($city){
+            case self::UNDERCITY:
+            case self::IRONFORGE:
+            case self::STROMWIND:
+            case self::DARNASSUS:
+            case self::ORGRIMMAR:
+            case self::THUNDERBLUF:
+                return true;
+            default:
+                return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/mojotrollz/dbd/db/mangos_world_dev.php b/mojotrollz/dbd/db/mangos_world_dev.php
new file mode 100644
index 0000000..ff65840
--- /dev/null
+++ b/mojotrollz/dbd/db/mangos_world_dev.php
@@ -0,0 +1,8 @@
+<?php
+namespace DBD;
+
+class mangos_world_dev extends \SYSTEM\DB\DBInfoMYS {
+
+    public function  __construct() {
+        parent::__construct('mangos_zero_world_dev', 'mojotrolls_dev', 'dsjgfasudzfsvad', '127.0.0.1');}
+}
\ No newline at end of file
diff --git a/mojotrollz/files/wow_city_icons/Darnassus.png b/mojotrollz/files/city/Darnassus.png
similarity index 100%
rename from mojotrollz/files/wow_city_icons/Darnassus.png
rename to mojotrollz/files/city/Darnassus.png
diff --git a/mojotrollz/files/wow_city_icons/Ironforge.png b/mojotrollz/files/city/Ironforge.png
similarity index 100%
rename from mojotrollz/files/wow_city_icons/Ironforge.png
rename to mojotrollz/files/city/Ironforge.png
diff --git a/mojotrollz/files/wow_city_icons/Orgrimmar.png b/mojotrollz/files/city/Orgrimmar.png
similarity index 100%
rename from mojotrollz/files/wow_city_icons/Orgrimmar.png
rename to mojotrollz/files/city/Orgrimmar.png
diff --git a/mojotrollz/files/wow_city_icons/Stormwind.png b/mojotrollz/files/city/Stormwind.png
similarity index 100%
rename from mojotrollz/files/wow_city_icons/Stormwind.png
rename to mojotrollz/files/city/Stormwind.png
diff --git a/mojotrollz/files/wow_city_icons/Thunder_Bluff.png b/mojotrollz/files/city/Thunderbluff.png
similarity index 100%
rename from mojotrollz/files/wow_city_icons/Thunder_Bluff.png
rename to mojotrollz/files/city/Thunderbluff.png
diff --git a/mojotrollz/files/wow_city_icons/Undercity.png b/mojotrollz/files/city/Undercity.png
similarity index 100%
rename from mojotrollz/files/wow_city_icons/Undercity.png
rename to mojotrollz/files/city/Undercity.png
diff --git a/mojotrollz/files/city/default.png b/mojotrollz/files/city/default.png
new file mode 100644
index 0000000..abb4c79
Binary files /dev/null and b/mojotrollz/files/city/default.png differ
diff --git a/mojotrollz/files/wowicons/female.png b/mojotrollz/files/gender/female.png
similarity index 100%
rename from mojotrollz/files/wowicons/female.png
rename to mojotrollz/files/gender/female.png
diff --git a/mojotrollz/files/wowicons/male.png b/mojotrollz/files/gender/male.png
similarity index 100%
rename from mojotrollz/files/wowicons/male.png
rename to mojotrollz/files/gender/male.png
diff --git a/mojotrollz/files/register_files.php b/mojotrollz/files/register_files.php
index a1b3c3b..6685a8a 100644
--- a/mojotrollz/files/register_files.php
+++ b/mojotrollz/files/register_files.php
@@ -1,21 +1,21 @@
 <?php
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/wowicons/','wowicons','*.png');
-\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/wow_city_icons/','wow_city_icons','*.png');
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/buttons/','buttons','*.png');
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/backgrounds/','backgrounds','*.png');
-\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/wow_city_icons/','wow_city_icons','*.png');
 
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/skilltree/','skilltree','*.*');
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/skilltree/tree/','skilltree_tree','*.*');
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/skilltree/skills/','skilltree_skills','*.*');
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/skilltree/skills_grey/','skilltree_skills_grey','*.*');
 
-\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/equipment/','equipment','*.*');
-
-\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/inventory/','inventory','*.*');
-
-\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/class/','class','*.*');
+\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/gender/','gender','*.*');
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/race/','race','*.*');
+\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/class/','class','*.*');
+
+\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/city/','city','*.png');
+
+\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/equipment/','equipment','*.*');
+\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/inventory/','inventory','*.*');
 
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/default_page/','default_page','*.png');
 \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/default_start/','default_start','*.png');
\ No newline at end of file
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_details/tpl/details.tpl b/mojotrollz/page/wizard_details/tpl/details.tpl
index 1bbc6a0..5907848 100644
--- a/mojotrollz/page/wizard_details/tpl/details.tpl
+++ b/mojotrollz/page/wizard_details/tpl/details.tpl
@@ -1,8 +1,8 @@
 <div id="details_gender" style="float: left; margin: 15px;">
     <input type="text" class="form-control input-lg" id="charname" maxlength="12" value="${char_name}">
     <button class="btn btn-success" id="btn_check_name">Check</button></br></br>
-    <a class="male fadein"                  gender="male" href="#"><img src="${WOWICONS}male.png" width="110px"/></a>
-    <a class="female fadein"                gender="female" href="#"><img src="${WOWICONS}female.png" width="110px"/></a>
+    <a class="male fadein"                  gender="male" href="#"><img src="${WOW_GENDER}male.png" width="110px"/></a>
+    <a class="female fadein"                gender="female" href="#"><img src="${WOW_GENDER}female.png" width="110px"/></a>
 </div>
 <div id="details_race" style="float: left; margin: 15px;">
     <a class="male human fadein info"        info="race_human" race="1" rrace="human" gender="male" href="#"><img src="${WOW_RACE}human_male.png"/></a>
diff --git a/mojotrollz/page/wizard_details/wizard_details.php b/mojotrollz/page/wizard_details/wizard_details.php
index 992b10f..4efe8e1 100644
--- a/mojotrollz/page/wizard_details/wizard_details.php
+++ b/mojotrollz/page/wizard_details/wizard_details.php
@@ -9,7 +9,7 @@ class wizard_details extends SYSTEM\PAGE\Page {
     public function html(){
         $vars = charcreation::data(NULL, false);
         
-        $vars['WOWICONS']   = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=wowicons&id=';
+        $vars['WOW_GENDER']  = \SYSTEM\FILES\files::getURL('gender');
         $vars['WOW_RACE']   = \SYSTEM\FILES\files::getURL('race');
         $vars['WOW_CLASS']  = \SYSTEM\FILES\files::getURL('class');
         $vars['INV_PICS']   = \SYSTEM\FILES\files::getURL('inventory');
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..87b8bfe
--- /dev/null
+++ b/mojotrollz/page/wizard_guild/tpl/guild.tpl
@@ -0,0 +1,2 @@
+guild
+<div id="frame_content_toolbar" style="padding-top: 15px; height: 75px;"></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_register/js/wizard_register.js b/mojotrollz/page/wizard_register/js/wizard_register.js
new file mode 100644
index 0000000..50f7bc0
--- /dev/null
+++ b/mojotrollz/page/wizard_register/js/wizard_register.js
@@ -0,0 +1,3 @@
+function init_wizard_register(){
+    $('#back_link').click(function(){system.load($(this).attr('sysload'));});
+}
\ 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 75%
rename from mojotrollz/page/wizard_reg/reg.tpl
rename to mojotrollz/page/wizard_register/tpl/register.tpl
index 123233e..310afe8 100644
--- a/mojotrollz/page/wizard_reg/reg.tpl
+++ b/mojotrollz/page/wizard_register/tpl/register.tpl
@@ -42,9 +42,20 @@
                             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>
+                <div id="register" style=""><a href="#"><img src="${BUTTONS}register.png"/></a></div>
+            </div>
         </form>
-                                    <div id="register" style=""><a href="#"><img src="${BUTTONS}register.png"/></a></div>
     </div>
-</div>
\ No newline at end of file
+</div>
+<div style="float: left; margin-top: -70px;"><a id="back_link" sysload="wizard_summary" href="#wizard_summary"><img src="${WOWICONS}arrow_left.png"/></a></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..77012fe
--- /dev/null
+++ b/mojotrollz/page/wizard_register/wizard_register.php
@@ -0,0 +1,18 @@
+<?php
+class wizard_register extends SYSTEM\PAGE\Page {
+    public static function js(){
+        return array(   \SYSTEM\WEBPATH(new PPAGE(),'wizard_register/js/wizard_register.js'));}
+      
+    public static function css (){
+       return array();}
+       
+    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..2f17bdb 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();
@@ -23,8 +23,15 @@ function wizard_spawn(){
     $('.city_icon_hover').hover(function(){
         $(this).removeClass('fadein');
     }, function(){
-        $(this).addClass('fadein');
-        
+        $(this).addClass('fadein');});
+    
+    $('.icon_city').click(function(){
+       sendInfo('{"char_spawn" : "'+$(this).attr('city')+'"}','wizard_spawn'); 
+    });
+    
+    $('.info').mouseover(function(){
+        var info = $(this).attr('info');
+        $('#info_content').load('./?page=default_info&id='+info);
     });
     
 }
diff --git a/mojotrollz/page/wizard_spawn/spawn.tpl b/mojotrollz/page/wizard_spawn/spawn.tpl
deleted file mode 100644
index da57bf0..0000000
--- a/mojotrollz/page/wizard_spawn/spawn.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<div style="padding: 0; margin: 0;">
-    <div id="mapchange" style="float: left;">
-        <a class="" style="margin: 5px; margin-top: 0px; padding: 10px;" href="#"><img src="${PICPATH}mapchange.png"/></a>
-        <div style="margin: 5px;">    
-                <div id="map_info" style="padding: 25px; margin: 15px; margin-bottom: 5px; background: url(${PICPATH}help_background.png); background-size: 100% 100%">
-                    <h3 style=""><img style="" src="${PICPATH}help_questionmark.png"width="25px"/>&nbsp;${spawn_info_title}</h3>
-                    <h4>${spawn_info_text}</h4>
-                </div>             
-        </div>
-    </div>
-    <div style="float: left; margin: 0px; margin: 15px; width: 33%; min-height: 200px;">
-        <div id="map_eastern_kingdoms">
-            <img src="${PICPATH}eastern_map.png"/>
-            <div id="city_eastern">
-                <div class="fadein city_icon_hover" id="undercity" style="position: absolute; left: 490px; top: 50px;">
-                    <a href="#"><img width="70%" src="${CITYICONS}Undercity.png"/></a>
-                </div>
-                <div class="fadein city_icon_hover" id="ironforge" style="position: absolute; left: 500px; top: 150px;">
-                    <a href="#"><img width="70%" src="${CITYICONS}Ironforge.png"/></a>
-                </div>
-                <div class="fadein city_icon_hover" id="stormwind" style="position: absolute; left: 490px; top: 200px;">
-                    <a href="#"><img width="70%" src="${CITYICONS}Stormwind.png"/></a>
-                </div>
-            </div>
-        </div>
-        
-        <div id="map_kalimdor" style="display: none;">
-            <img src="${PICPATH}kalim_map.png"/>
-            <div id="city_kalim">
-                <div class="fadein city_icon_hover" id="darnassus" style="position: absolute; left: 470px; top: 15px;">
-                   <a href="#"><img width="70%" src="${CITYICONS}Darnassus.png"/></a>
-                </div>
-                <div class="fadein city_icon_hover" id="orgrimmar" style="position: absolute; left: 570px; top: 120px;">
-                    <a href="#"><img width="70%" src="${CITYICONS}Orgrimmar.png"/></a>
-                </div>
-                <div class="fadein city_icon_hover" id="thunderbluff" style="position: absolute; left: 495px; top: 150px;">
-                    <a href="#"><img width="70%" src="${CITYICONS}Thunder_Bluff.png"/></a>
-                </div>
-            </div>
-        </div>            
-    </div>
-         <div style="float: right; background: url(${BG}rexxar.png) no-repeat; width: 250px; height: 300px; margin-top: 100px;">
-                    &nbsp;
-         </div>       
-</div>
-        
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_spawn/tpl/spawn.tpl b/mojotrollz/page/wizard_spawn/tpl/spawn.tpl
new file mode 100644
index 0000000..ae9d5fa
--- /dev/null
+++ b/mojotrollz/page/wizard_spawn/tpl/spawn.tpl
@@ -0,0 +1,41 @@
+<div style="padding: 0; margin: 0;">
+    <div id="mapchange" style="float: left;">
+        <a class="" style="margin: 5px; margin-top: 0px; padding: 10px;" href="#wizard_spawn"><img src="${PICPATH}mapchange.png"/></a>
+        <div style="margin: 5px;">    
+                <div id="map_info" style="padding: 25px; margin: 15px; margin-bottom: 5px; background: url(${PICPATH}help_background.png); background-size: 100% 100%">
+                    <h3 style=""><img style="" src="${PICPATH}help_questionmark.png"width="25px"/>&nbsp;${spawn_info_title}</h3>
+                    <div id="info_content"></div>
+                </div>             
+        </div>
+    </div>
+    <div style="float: left; margin: 0px; margin: 15px;">
+        <div id="map_eastern_kingdoms">
+            <div id="city_eastern" style="background: url(${PICPATH}eastern_map.png) no-repeat; width: 450px; height: 500px;">
+                <div class="fadein city_icon_hover" id="undercity" style="position: relative; left: 145px; top: 60px;">
+                    <a class="icon_city info" info="city_undercity"  href="#wizard_spawn" city="1"><img width="48" src="${WOW_CITY}Undercity.png"/></a>
+                </div>
+                <div class="fadein city_icon_hover" id="ironforge" style="position: relative; left: 160px; top: 140px;">
+                    <a class="icon_city info" info="city_ironforge"  href="#wizard_spawn" city="2"><img width="48" src="${WOW_CITY}Ironforge.png"/></a>
+                </div>
+                <div class="fadein city_icon_hover" id="stormwind" style="position: relative; left: 145px; top: 175px;">
+                    <a class="icon_city info" info="city_stormwind"  href="#wizard_spawn" city="3"><img width="48" src="${WOW_CITY}Stormwind.png"/></a>
+                </div>
+            </div>
+        </div>
+        <div id="map_kalimdor" style="display: none;">
+            <div id="city_kalim" style="background: url(${PICPATH}kalim_map.png) no-repeat; width: 450px; height: 500px;">
+                <div class="fadein city_icon_hover" id="darnassus" style="position: relative; left: 120px; top: 7px;">
+                   <a class="icon_city info" info="city_darnassus"  href="#wizard_spawn" city="4"><img width="48" src="${WOW_CITY}Darnassus.png"/></a>
+                </div>
+                <div class="fadein city_icon_hover" id="orgrimmar" style="position: relative; left: 245px; top: 115px;">
+                    <a class="icon_city info" info="city_orgrimmar"  href="#wizard_spawn" city="5"><img width="48" src="${WOW_CITY}Orgrimmar.png"/></a>
+                </div>
+                <div class="fadein city_icon_hover" id="thunderbluff" style="position: relative; left: 160px; top: 115px;">
+                    <a class="icon_city info" info="city_thunderbluff"  href="#wizard_spawn" city="6"><img width="48" src="${WOW_CITY}Thunderbluff.png"/></a>
+                </div>
+            </div>
+        </div>            
+    </div>
+</div>
+<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..5dd9c96 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['WOW_CITY'] = \SYSTEM\FILES\files::getURL('city');
+        $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..74a80c7
--- /dev/null
+++ b/mojotrollz/page/wizard_summary/tpl/summary.tpl
@@ -0,0 +1,74 @@
+<H4>Summary</H4>
+<table>
+    <tr>
+        <th>Option</th>
+        <th>Wert</th>
+        <th>Check</th>
+    </tr>
+    <tr>
+        <td>Name</td>
+        <td>${char_name}</td>
+        <td>${char_name_ok}</td>
+    </tr>
+    <tr>
+        <td>Gender</td>
+        <td><img src="${WOW_GENDER}${char_gender}.png"/></td>
+        <td>${char_gender_ok}</td>
+    </tr>
+    <tr>
+        <td>Race</td>
+        <td><img src="${WOW_RACE}${char_race}_${char_gender}.png"/></td>
+        <td>${char_race_ok}</td>
+    </tr>
+    <tr>
+        <td>Class</td>
+        <td><img src="${WOW_CLASS}${char_class}.png"/></td>
+        <td>${char_class_ok}</td>
+    </tr>
+    <tr>
+        <td>Skin Color</td>
+        <td>${char_skin_color}</td>
+        <td>${char_skin_color_ok}</td>
+    </tr>
+    <tr>
+        <td>Hair</td>
+        <td>${char_hair}</td>
+        <td>${char_hair_ok}</td>
+    </tr>
+    <tr>
+        <td>Hair Color</td>
+        <td>${char_hair_color}</td>
+        <td>${char_hair_color_ok}</td>
+    </tr>
+    <tr>
+        <td>Face</td>
+        <td>${char_face}</td>
+        <td>${char_face_ok}</td>
+    </tr>
+    <tr>
+        <td>Facial Hair</td>
+        <td>${char_facial_hair}</td>
+        <td>${char_facial_hair_ok}</td>
+    </tr>
+    <tr>
+        <td>Facial Hair Color</td>
+        <td>${char_facial_hair_color}</td>
+        <td>${char_facial_hair_color_ok}</td>
+    </tr>
+    <tr>
+        <td>Skill Tree</td>
+        <td>${char_skill_tree}</td>
+        <td>${char_skill_tree_ok}</td>
+    </tr>
+    <tr>
+        <td>Guild</td>
+        <td>${char_guild}</td>
+        <td>${char_guild_ok}</td>
+    </tr>
+    <tr>
+        <td>Spawn</td>
+        <td>${char_spawn}</td>
+        <td>${char_spawn_ok}</td>
+    </tr>
+</table>
+<div id="frame_content_toolbar" style="padding-top: 15px; height: 75px;"></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..c2194fb
--- /dev/null
+++ b/mojotrollz/page/wizard_summary/wizard_summary.php
@@ -0,0 +1,23 @@
+<?php
+class wizard_summary extends SYSTEM\PAGE\Page {
+
+    public function html(){
+        $vars = charcreation::data(NULL,false);
+        
+        $vars['char_skin_color']        = \DBD\RACE_VISUALS_BY_ID::Q1(array($vars['char_race'],race_visuals::VISUAL_SKIN,$vars['char_skin_color']))['name'];
+        $vars['char_hair']              = \DBD\RACE_VISUALS_BY_ID::Q1(array($vars['char_race'],race_visuals::VISUAL_HAIR,$vars['char_hair']))['name'];
+        $vars['char_hair_color']        = \DBD\RACE_VISUALS_BY_ID::Q1(array($vars['char_race'],race_visuals::VISUAL_HAIR_COLOR,$vars['char_hair_color']))['name'];
+        $vars['char_face']              = \DBD\RACE_VISUALS_BY_ID::Q1(array($vars['char_race'],race_visuals::VISUAL_FACE,$vars['char_face']))['name'];
+        $vars['char_facial_hair']       = \DBD\RACE_VISUALS_BY_ID::Q1(array($vars['char_race'],race_visuals::VISUAL_FACIAL_HAIR,$vars['char_facial_hair']))['name'];
+        $vars['char_facial_hair_color'] = \DBD\RACE_VISUALS_BY_ID::Q1(array($vars['char_race'],race_visuals::VISUAL_FACIAL_HAIR_COLOR,$vars['char_facial_hair_color']))['name'];
+        
+        $vars['char_race'] = player_races::name($vars['char_race']);
+        $vars['char_class'] = player_classes::name($vars['char_class']);
+        
+        $vars['WOW_GENDER']   = \SYSTEM\FILES\files::getURL('gender');
+        $vars['WOW_RACE']   = \SYSTEM\FILES\files::getURL('race');
+        $vars['WOW_CLASS']  = \SYSTEM\FILES\files::getURL('class');
+        
+        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..4e80a34 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="${WOW_CITY}${char_spawn}.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_toolbar/wizard_toolbar.php b/mojotrollz/page/wizard_toolbar/wizard_toolbar.php
index d6e34d8..730b80a 100644
--- a/mojotrollz/page/wizard_toolbar/wizard_toolbar.php
+++ b/mojotrollz/page/wizard_toolbar/wizard_toolbar.php
@@ -17,11 +17,13 @@ class wizard_toolbar extends SYSTEM\PAGE\Page {
         $vars = charcreation::data(NULL,false);
         $vars['char_class'] = player_classes::name($vars['char_class']);
         $vars['char_race'] = player_races::name($vars['char_race']);
+        $vars['char_spawn'] = player_spawns::name($vars['char_spawn']);
         $vars['last'] = $this->last;
         $vars['next'] = $this->next;
         $vars['WOWICONS'] = \SYSTEM\FILES\files::getURL('wowicons');
         $vars['WOW_RACE'] = \SYSTEM\FILES\files::getURL('race');
         $vars['WOW_CLASS'] = \SYSTEM\FILES\files::getURL('class');
+        $vars['WOW_CITY'] = \SYSTEM\FILES\files::getURL('city');
         return  SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_toolbar/tpl/wizard_toolbar.tpl'), $vars);
     }
 }
\ 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');});