diff --git a/mojotrollz/page/wizard_guild/tpl/guild.tpl b/mojotrollz/page/wizard_guild/tpl/guild.tpl
index b970f67..87b8bfe 100644
--- a/mojotrollz/page/wizard_guild/tpl/guild.tpl
+++ b/mojotrollz/page/wizard_guild/tpl/guild.tpl
@@ -1,2 +1,2 @@
 guild
-<div id="frame_content_toolbar" style="padding-top: 115px; margin-top: 420px; height: 175px;"></div>
\ No newline at end of file
+<div id="frame_content_toolbar" style="padding-top: 15px; height: 75px;"></div>
\ 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_register/tpl/register.tpl b/mojotrollz/page/wizard_register/tpl/register.tpl
index b2447ee..310afe8 100644
--- a/mojotrollz/page/wizard_register/tpl/register.tpl
+++ b/mojotrollz/page/wizard_register/tpl/register.tpl
@@ -53,7 +53,9 @@
                             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}back.png"/></a><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
index c3f7a63..77012fe 100644
--- a/mojotrollz/page/wizard_register/wizard_register.php
+++ b/mojotrollz/page/wizard_register/wizard_register.php
@@ -1,5 +1,11 @@
 <?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');
diff --git a/mojotrollz/page/wizard_spawn/tpl/spawn.tpl b/mojotrollz/page/wizard_spawn/tpl/spawn.tpl
index bf432a5..291d093 100644
--- a/mojotrollz/page/wizard_spawn/tpl/spawn.tpl
+++ b/mojotrollz/page/wizard_spawn/tpl/spawn.tpl
@@ -8,38 +8,34 @@
                 </div>             
         </div>
     </div>
-    <div style="float: left; margin: 0px; margin: 15px; width: 33%; min-height: 200px;">
+    <div style="float: left; margin: 0px; margin: 15px;">
         <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 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 href="#"><img width="48" 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 class="fadein city_icon_hover" id="ironforge" style="position: relative; left: 160px; top: 140px;">
+                    <a href="#"><img width="48" 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 class="fadein city_icon_hover" id="stormwind" style="position: relative; left: 145px; top: 175px;">
+                    <a href="#"><img width="48" 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 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 href="#"><img width="48" 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 class="fadein city_icon_hover" id="orgrimmar" style="position: relative; left: 245px; top: 115px;">
+                    <a href="#"><img width="48" 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 class="fadein city_icon_hover" id="thunderbluff" style="position: relative; left: 160px; top: 115px;">
+                    <a href="#"><img width="48" 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;">&nbsp;</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_summary/tpl/summary.tpl b/mojotrollz/page/wizard_summary/tpl/summary.tpl
index e6f66c3..353cf4d 100644
--- a/mojotrollz/page/wizard_summary/tpl/summary.tpl
+++ b/mojotrollz/page/wizard_summary/tpl/summary.tpl
@@ -1,2 +1,60 @@
-Not implemented
-<div id="frame_content_toolbar" style="padding-top: 115px; margin-top: 420px; height: 175px;"></div>
\ No newline at end of file
+<H4>Summary</H4>
+<table>
+    <tr>
+        <th>Option</th>
+        <th>Wert</th>
+    </tr>
+    <tr>
+        <td>Name</td>
+        <td>${char_name}</td>
+    </tr>
+    <tr>
+        <td>Gender</td>
+        <td>${char_gender}</td>
+    </tr>
+    <tr>
+        <td>Race</td>
+        <td>${char_race}</td>
+    </tr>
+    <tr>
+        <td>Class</td>
+        <td>${char_class}</td>
+    </tr>
+    <tr>
+        <td>Skin Color</td>
+        <td>${char_skin_color}</td>
+    </tr>
+    <tr>
+        <td>Hair</td>
+        <td>${char_hair}</td>
+    </tr>
+    <tr>
+        <td>Hair Color</td>
+        <td>${char_hair_color}</td>
+    </tr>
+    <tr>
+        <td>Face</td>
+        <td>${char_face}</td>
+    </tr>
+    <tr>
+        <td>Facial Hair</td>
+        <td>${char_facial_hair}</td>
+    </tr>
+    <tr>
+        <td>Facial Hair Color</td>
+        <td>${char_facial_hair_color}</td>
+    </tr>
+    <tr>
+        <td>Skill Tree</td>
+        <td>${char_skill_tree}</td>
+    </tr>
+    <tr>
+        <td>Guild</td>
+        <td>${char_guild}</td>
+    </tr>
+    <tr>
+        <td>Spawn</td>
+        <td>${char_spawn}</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
index a4192a5..eb9c508 100644
--- a/mojotrollz/page/wizard_summary/wizard_summary.php
+++ b/mojotrollz/page/wizard_summary/wizard_summary.php
@@ -2,7 +2,7 @@
 class wizard_summary extends SYSTEM\PAGE\Page {
 
     public function html(){
-        $vars = array();
+        $vars = charcreation::data(NULL,false);
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_summary/tpl/summary.tpl'), $vars);       
     }
 }
\ No newline at end of file