diff --git a/mojotrollz/img/backgrounds/help_paper.png b/mojotrollz/img/backgrounds/help_paper.png
new file mode 100644
index 0000000..5996ef3
Binary files /dev/null and b/mojotrollz/img/backgrounds/help_paper.png differ
diff --git a/mojotrollz/img/backgrounds/rexxar.png b/mojotrollz/img/backgrounds/rexxar.png
new file mode 100644
index 0000000..deb7a49
Binary files /dev/null and b/mojotrollz/img/backgrounds/rexxar.png differ
diff --git a/mojotrollz/img/backgrounds/rexxar.psd b/mojotrollz/img/backgrounds/rexxar.psd
new file mode 100644
index 0000000..6b7afc4
Binary files /dev/null and b/mojotrollz/img/backgrounds/rexxar.psd differ
diff --git a/mojotrollz/img/buttons/friendlist.png b/mojotrollz/img/buttons/friendlist.png
new file mode 100644
index 0000000..57973c8
Binary files /dev/null and b/mojotrollz/img/buttons/friendlist.png differ
diff --git a/mojotrollz/img/buttons/wanted.png b/mojotrollz/img/buttons/wanted.png
new file mode 100644
index 0000000..5b4f6a1
Binary files /dev/null and b/mojotrollz/img/buttons/wanted.png differ
diff --git a/mojotrollz/img/register_img.php b/mojotrollz/img/register_img.php
index 76c528c..f5ae089 100644
--- a/mojotrollz/img/register_img.php
+++ b/mojotrollz/img/register_img.php
@@ -1,2 +1,5 @@
 <?php
-\SYSTEM\IMG\img::registerFolder(dirname(__FILE__).'/wowicons/','wowicons','*.png');
\ No newline at end of file
+\SYSTEM\IMG\img::registerFolder(dirname(__FILE__).'/wowicons/','wowicons','*.png');
+\SYSTEM\IMG\img::registerFolder(dirname(__FILE__).'/wow_city_icons/','wow_city_icons','*.png');
+\SYSTEM\IMG\img::registerFolder(dirname(__FILE__).'/buttons/','buttons','*.png');
+\SYSTEM\IMG\img::registerFolder(dirname(__FILE__).'/backgrounds/','backgrounds','*.png');
\ No newline at end of file
diff --git a/mojotrollz/img/wow_city_icons/Darnassus.png b/mojotrollz/img/wow_city_icons/Darnassus.png
new file mode 100644
index 0000000..5567652
Binary files /dev/null and b/mojotrollz/img/wow_city_icons/Darnassus.png differ
diff --git a/mojotrollz/img/wow_city_icons/Ironforge.png b/mojotrollz/img/wow_city_icons/Ironforge.png
new file mode 100644
index 0000000..00106c9
Binary files /dev/null and b/mojotrollz/img/wow_city_icons/Ironforge.png differ
diff --git a/mojotrollz/img/wow_city_icons/Orgrimmar.png b/mojotrollz/img/wow_city_icons/Orgrimmar.png
new file mode 100644
index 0000000..9df744b
Binary files /dev/null and b/mojotrollz/img/wow_city_icons/Orgrimmar.png differ
diff --git a/mojotrollz/img/wow_city_icons/Stormwind.png b/mojotrollz/img/wow_city_icons/Stormwind.png
new file mode 100644
index 0000000..ff976ab
Binary files /dev/null and b/mojotrollz/img/wow_city_icons/Stormwind.png differ
diff --git a/mojotrollz/img/wow_city_icons/Thunder_Bluff.png b/mojotrollz/img/wow_city_icons/Thunder_Bluff.png
new file mode 100644
index 0000000..1aa2322
Binary files /dev/null and b/mojotrollz/img/wow_city_icons/Thunder_Bluff.png differ
diff --git a/mojotrollz/img/wow_city_icons/Undercity.png b/mojotrollz/img/wow_city_icons/Undercity.png
new file mode 100644
index 0000000..35fc309
Binary files /dev/null and b/mojotrollz/img/wow_city_icons/Undercity.png differ
diff --git a/mojotrollz/page/default_page/default_page.php b/mojotrollz/page/default_page/default_page.php
index 6e42c51..7b1556b 100644
--- a/mojotrollz/page/default_page/default_page.php
+++ b/mojotrollz/page/default_page/default_page.php
@@ -7,8 +7,10 @@ class default_page extends SYSTEM\PAGE\Page {
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PBOOTSTRAP(),'js/bootstrap.min.js').'"></script>'.
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PVALIDATION(),'jqBootstrapValidation.js').'"></script>'.
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PCRYPTOSHA(),'jquery.sha1.js').'"></script>'.
+                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PCRYPTOSHA(),'jquery.md5.js').'"></script>'.
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/wizard.js').'"></script>'.
-                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'wizard_details/js/wizard_details.js').'"></script>';
+                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'wizard_details/js/wizard_details.js').'"></script>'.
+                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'wizard_spawn/js/wizard_spawn.js').'"></script>';
     }
       
     private function css (){
@@ -20,8 +22,8 @@ class default_page extends SYSTEM\PAGE\Page {
     public function html(){
         $vars = array();               
         $vars['js'] = $this->js();
-        $vars['css'] = $this->css();
-        $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=wowicons&id=';
+        $vars['css'] = $this->css();        
+        $vars['WOWICONS'] = \SYSTEM\IMG\img::getURL('wowicons');
         $vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(), 'default_page/img/');
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/default_page.tpl'), $vars);        
diff --git a/mojotrollz/page/default_page/default_page.tpl b/mojotrollz/page/default_page/default_page.tpl
index 7998381..83c5243 100644
--- a/mojotrollz/page/default_page/default_page.tpl
+++ b/mojotrollz/page/default_page/default_page.tpl
@@ -12,8 +12,7 @@
         <div id="wrapper"style="width: 1000px;  margin: auto; -webkit-box-shadow: 3px 3px 4px 2px rgba(0, 0, 0, 1); box-shadow: 3px 3px 4px 2px rgba(0, 0, 0, 1); border-radius: 5px;">
             <div id="wizard_navbar" class="navbar" style="background: black; height:48px; font-size: 22px;">
                  <div class="navbar-inner" style="background-image: url(${PICPATH}nav_test.png);">
-                    <ul id="nav" class="nav">
-                        <a class="brand active" href=""><font color="gold">Welcome</font></a>                                  
+                    <ul id="nav" class="nav">                                  
 
                     </ul>
                  </div>
diff --git a/mojotrollz/page/default_page/img/button.psd b/mojotrollz/page/default_page/img/button.psd
index 1d3511d..8fa4eb5 100644
Binary files a/mojotrollz/page/default_page/img/button.psd and b/mojotrollz/page/default_page/img/button.psd differ
diff --git a/mojotrollz/page/wizard_friend/friend.tpl b/mojotrollz/page/wizard_friend/friend.tpl
index f31b632..66ec25a 100644
--- a/mojotrollz/page/wizard_friend/friend.tpl
+++ b/mojotrollz/page/wizard_friend/friend.tpl
@@ -1,23 +1,25 @@
-<div id="friendlist" style="float: left; width: 30%;">
-    <h1>${friend_title}</h1>
-    <br>
-    <input type="text" class="form-control input-lg" id="friend_name" placeholder="${friend_name}">
-    <div class="" id="added_friend_list">
-        <div class="" style="outline: 2px white; background: url(${PICPATH}wall.png); height: 200px;">
-            <div style="background: url(${PICPATH}background2.png);">
-                <div style="float: left; padding: 5px;">Molanor</div>
-            <img src="${WOWICONS}warrior.png" width="30px;"/>
-            <img src="${WOWICONS}ork_male.png" width="30px;"/>
-            <img src="${PICPATH}x.png" style="float: right; padding: 7px;"/>
+<div id="friendlist" style="float: left; width: 30%; min-height: 320px; background: url(${BG}help_paper.png) no-repeat; background-size: 280px 300px;">
+    <img src="${BUTTONS}friendlist.png"/>
+
+    <div style="margin-left: 15px;">
+        <input type="text" class="form-control input-lg" id="friend_name" placeholder="${friend_name}">
+        <div class="" id="added_friend_list">
+            <div class="" style="outline: 2px white; height: 200px;">
+                <div style="float: left;">                  
+                <img src="${WOWICONS}warrior.png" width="30px;"/>
+                <img src="${WOWICONS}ork_male.png" width="30px;"/>
+                 Molanor</div>
+                <img src="${PICPATH}x.png" style="float: right; margin-right: 15px;"/>               
             </div>
         </div>
     </div>
 </div>
-<div id="guildlist" style="float: left; min-height: 250px;">
-    <h1>${guild_title}</h1>
-    
+<div id="guildlist" style="float: left;  margin-top:5px; margin-left: 10px; min-height: 300px; background: url(${BG}help_paper.png) no-repeat; background-size: 280px 300px;">
+    <div style="margin-top: -5px;">
+        <img width="280" src="${BUTTONS}wanted.png"/>
+    </div>
 </div>
-    <div id="friend_help" style="float: right; min-height: 250px;">
-    <h1>${help_title}</h1>
+    <div id="friend_help" style="float: right; margin-top: 5px; min-height: 250px; background: url(${BG}help_paper.png) no-repeat; width: 20%;">
+    <h3>${help_title}</h3>
     
 </div>
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_friend/wizard_friend.php b/mojotrollz/page/wizard_friend/wizard_friend.php
index 5412cb3..b98892e 100644
--- a/mojotrollz/page/wizard_friend/wizard_friend.php
+++ b/mojotrollz/page/wizard_friend/wizard_friend.php
@@ -34,7 +34,9 @@ class wizard_friend extends SYSTEM\PAGE\Page {
         $vars['js'] = $this->js();
         $vars['css'] = $this->css();
         $vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(),'wizard_friend/img/');
-        $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=wowicons&id=';
+        $vars['WOWICONS'] = \SYSTEM\IMG\img::getURL('wowicons');
+        $vars['BUTTONS'] = \SYSTEM\IMG\img::getURL('buttons');
+        $vars['BG'] = \SYSTEM\IMG\img::getURL('backgrounds');
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_friend/friend.tpl'), $vars);
         
diff --git a/mojotrollz/page/wizard_spawn/js/wizard_spawn.js b/mojotrollz/page/wizard_spawn/js/wizard_spawn.js
index 8b13789..f1ba02d 100644
--- a/mojotrollz/page/wizard_spawn/js/wizard_spawn.js
+++ b/mojotrollz/page/wizard_spawn/js/wizard_spawn.js
@@ -1 +1,29 @@
-
+var map_kalim=false;
+function wizard_spawn(){   
+    $('#mapchange').click(function(){
+        if (map_kalim){
+            $('#city_kalim').hide();
+            $('#map_kalimdor').slideUp(500);
+//            $('#map_kalimdor').hide();
+//            $('#map_eastern_kingdoms').show();
+            $('#map_eastern_kingdoms').slideDown(500);
+            $('#city_eastern').show(1000);
+            map_kalim=false;
+        } else {
+            $('#city_eastern').hide();
+            $('#map_eastern_kingdoms').slideUp(500);
+//            $('#map_eastern_kingdoms').hide();
+//            $('#map_kalimdor').show();
+            $('#map_kalimdor').slideDown(500);
+            $('#city_kalim').show(1000);
+            map_kalim=true;
+        }
+    });
+    
+    $('.city_icon_hover').hover(function(){
+        $(this).removeClass('fadein');
+    }, function(){
+        $(this).addClass('fadein');
+        
+    });
+}
diff --git a/mojotrollz/page/wizard_spawn/spawn.tpl b/mojotrollz/page/wizard_spawn/spawn.tpl
index 83e9d57..da57bf0 100644
--- a/mojotrollz/page/wizard_spawn/spawn.tpl
+++ b/mojotrollz/page/wizard_spawn/spawn.tpl
@@ -1,23 +1,46 @@
 <div style="padding: 0; margin: 0;">
-    <div style="float: left; 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 id="mapchange" style="float: left;">
-            <a class="" style="margin: 5px; margin-top: 0px; padding: 10px;" href="#"><img src="${PICPATH}mapchange.png"/></a>
-            <br>
-            <a class="" style="margin: 5px; padding: 10px;" href="#"><img src="${PICPATH}friendload.png"/></a>
+    <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: right; margin: 0px; margin: 15px;  width: 33%">
+    <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" class="hidden" style="margin: 10px; width: 30%;" hidden="1">
+        
+        <div id="map_kalimdor" style="display: none;">
             <img src="${PICPATH}kalim_map.png"/>
-        </div>
+            <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/wizard_spawn.php b/mojotrollz/page/wizard_spawn/wizard_spawn.php
index a59db23..b189927 100644
--- a/mojotrollz/page/wizard_spawn/wizard_spawn.php
+++ b/mojotrollz/page/wizard_spawn/wizard_spawn.php
@@ -15,6 +15,8 @@ class wizard_spawn extends SYSTEM\PAGE\Page {
         $vars['js'] = $this->js();
         $vars['css'] = $this->css();
         $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 = 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);