diff --git a/mojotrollz/files/achievements_pvp/1.jpg b/mojotrollz/files/achievements_pvp/1.jpg
new file mode 100644
index 0000000..2252b21
Binary files /dev/null and b/mojotrollz/files/achievements_pvp/1.jpg differ
diff --git a/mojotrollz/files/achievements_pvp/3.jpg b/mojotrollz/files/achievements_pvp/3.jpg
new file mode 100644
index 0000000..ea011eb
Binary files /dev/null and b/mojotrollz/files/achievements_pvp/3.jpg differ
diff --git a/mojotrollz/files/achievements_pvp/9.jpg b/mojotrollz/files/achievements_pvp/9.jpg
new file mode 100644
index 0000000..071241d
Binary files /dev/null and b/mojotrollz/files/achievements_pvp/9.jpg differ
diff --git a/mojotrollz/files/achievements_pvp/b.jpg b/mojotrollz/files/achievements_pvp/b.jpg
new file mode 100644
index 0000000..99a434e
Binary files /dev/null and b/mojotrollz/files/achievements_pvp/b.jpg differ
diff --git a/mojotrollz/files/achievements_pvp/c.jpg b/mojotrollz/files/achievements_pvp/c.jpg
new file mode 100644
index 0000000..99a434e
Binary files /dev/null and b/mojotrollz/files/achievements_pvp/c.jpg differ
diff --git a/mojotrollz/files/achievements_pvp/e.jpg b/mojotrollz/files/achievements_pvp/e.jpg
new file mode 100644
index 0000000..b701b18
Binary files /dev/null and b/mojotrollz/files/achievements_pvp/e.jpg differ
diff --git a/mojotrollz/files/achievements_pvp/images.jpg b/mojotrollz/files/achievements_pvp/images.jpg
new file mode 100644
index 0000000..d8f6a35
Binary files /dev/null and b/mojotrollz/files/achievements_pvp/images.jpg differ
diff --git a/mojotrollz/files/achievements_pvp/stage0.jpg b/mojotrollz/files/achievements_pvp/stage0.jpg
new file mode 100644
index 0000000..46846ce
Binary files /dev/null and b/mojotrollz/files/achievements_pvp/stage0.jpg differ
diff --git a/mojotrollz/files/achievements_pvp/stage1.jpg b/mojotrollz/files/achievements_pvp/stage1.jpg
new file mode 100644
index 0000000..2b554d2
Binary files /dev/null and b/mojotrollz/files/achievements_pvp/stage1.jpg differ
diff --git a/mojotrollz/files/achievements_pvp/stage2.jpg b/mojotrollz/files/achievements_pvp/stage2.jpg
new file mode 100644
index 0000000..0df27f7
Binary files /dev/null and b/mojotrollz/files/achievements_pvp/stage2.jpg differ
diff --git a/mojotrollz/files/achievements_pvp/stage3.jpg b/mojotrollz/files/achievements_pvp/stage3.jpg
new file mode 100644
index 0000000..9d91ae8
Binary files /dev/null and b/mojotrollz/files/achievements_pvp/stage3.jpg differ
diff --git a/mojotrollz/files/achievements_pvp/stage4.jpg b/mojotrollz/files/achievements_pvp/stage4.jpg
new file mode 100644
index 0000000..0f8d37b
Binary files /dev/null and b/mojotrollz/files/achievements_pvp/stage4.jpg differ
diff --git a/mojotrollz/files/achievements_pvp/stage5.jpg b/mojotrollz/files/achievements_pvp/stage5.jpg
new file mode 100644
index 0000000..585fc8b
Binary files /dev/null and b/mojotrollz/files/achievements_pvp/stage5.jpg differ
diff --git a/mojotrollz/files/register_files.php b/mojotrollz/files/register_files.php
index 6685a8a..5ec7564 100644
--- a/mojotrollz/files/register_files.php
+++ b/mojotrollz/files/register_files.php
@@ -18,4 +18,7 @@
 \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
+\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/default_start/','default_start','*.png');
+
+\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/achievements_acc/','achievements_acc','*.*');
+\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/achievements_pvp/','achievements_pvp','*.*');
\ No newline at end of file
diff --git a/mojotrollz/page/autoload.inc b/mojotrollz/page/autoload.inc
index 330d093..65b88fa 100644
--- a/mojotrollz/page/autoload.inc
+++ b/mojotrollz/page/autoload.inc
@@ -18,6 +18,7 @@
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_start','');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_character','');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_menu','');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_shop_menu','');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_achievements_menu','');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_achievements_menu_sub','');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_achievements_content','');
diff --git a/mojotrollz/page/default_page/css/default_page.css b/mojotrollz/page/default_page/css/default_page.css
index beb9a60..5031af8 100644
--- a/mojotrollz/page/default_page/css/default_page.css
+++ b/mojotrollz/page/default_page/css/default_page.css
@@ -126,21 +126,43 @@ body {
     height: 50px;
     padding-top: 7px;
     padding-left: 20px;
-    width: 250px;
+    width: 260px;
     font-size: 16pt;
+    color: gold;
     list-style: none;
     text-align: left;
     text-decoration: none;
     
 }
 .btn_menu:hover, .btn_menu:active{
-    width: 250px;
+    width: 260px;
     background: url(http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=wowicons&id=button_red.png) no-repeat;
     background-size: cover;
     text-decoration: none;
     color: gold;
 }
 
+.btn_menu_off{
+    background: url(http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=buttons&id=nav_off.png) no-repeat;
+    background-size: cover;
+    height: 25px;
+    padding-top: 1px;
+    padding-left: 10px;
+    width: 140px;
+    font-size: 12pt;
+    list-style: none;
+    text-align: left;
+    text-decoration: none;
+}
+
 .no_deco{
     text-decoration: none
+}
+
+.controls input{
+    color: black;
+}
+
+td select{
+    color: black;
 }
\ No newline at end of file
diff --git a/mojotrollz/page/page_mojotrollz.php b/mojotrollz/page/page_mojotrollz.php
index 30571f6..e8fae0c 100644
--- a/mojotrollz/page/page_mojotrollz.php
+++ b/mojotrollz/page/page_mojotrollz.php
@@ -64,6 +64,11 @@ class page_mojotrollz extends \SYSTEM\API\api_default {
             throw new ERROR("You need to be logged in to view this ressource.");}
         return new user_database();}
     
+    public static function page_user_shop_menu(){
+        if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
+            throw new ERROR("You need to be logged in to view this ressource.");}
+        return new user_shop_menu();}
+        
     public static function page_user_achievements_menu(){
         if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
             throw new ERROR("You need to be logged in to view this ressource.");}
diff --git a/mojotrollz/page/user_achievements_content/tpl/acc_element.tpl b/mojotrollz/page/user_achievements_content/tpl/acc_element.tpl
index 621eeb3..3170547 100644
--- a/mojotrollz/page/user_achievements_content/tpl/acc_element.tpl
+++ b/mojotrollz/page/user_achievements_content/tpl/acc_element.tpl
@@ -4,7 +4,7 @@
         ${name}
     </td>
     <td>
-        Erledigt: ${counter}
+        accomplished: ${counter}
     </td>
 </tr>
 <tr class="spacer"></tr>
\ No newline at end of file
diff --git a/mojotrollz/page/user_achievements_content/tpl/pvp_element.tpl b/mojotrollz/page/user_achievements_content/tpl/pvp_element.tpl
index ecd565a..454301d 100644
--- a/mojotrollz/page/user_achievements_content/tpl/pvp_element.tpl
+++ b/mojotrollz/page/user_achievements_content/tpl/pvp_element.tpl
@@ -1,19 +1,33 @@
 <tr class="element_bg2" style="margin-top: 10px;">
     <td style="padding: 20px;">
-        <img src="${ico}" width="50"/>
-        <p>
-            ${name}<br>
-        current stage: ${stage}
+        <span style="float: left">
+            <p>Achievement: ${name}</p>
+            <img src="${ico}"/>
+        </span>
+        <span style="float: left; margin-left: 30px;">
+            <p>current stage:</p>
+            ${stage}<br>
+            accomplished: ${counter}
+        </span>
+        
+    </td>
+    <td style="padding: 20px;">
+        <p>Details:<br>
+        ${txt}
         </p>
     </td>
+    
+    
+    
+
     <td>
         <p>Threshold</p>
         <p>
-            stage 1: ${stage_1_count}<br>
-            stage 2: ${stage_2_count}<br>
-            stage 3: ${stage_3_count}<br>
-            stage 4: ${stage_4_count}<br>
-            stage 5: ${stage_5_count}<br>
+            <img width="20" src="http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=achievements_pvp&id=stage1.jpg"/>stage 1: ${stage_1_count}&nbsp;<br>
+            <img width="20" src="http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=achievements_pvp&id=stage2.jpg"/>stage 2: ${stage_2_count}&nbsp;<br>
+            <img width="20" src="http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=achievements_pvp&id=stage3.jpg"/>stage 3: ${stage_3_count}&nbsp;<br>
+            <img width="20" src="http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=achievements_pvp&id=stage4.jpg"/>stage 4: ${stage_4_count}&nbsp;<br>
+            <img width="20" src="http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=achievements_pvp&id=stage5.jpg"/>stage 5: ${stage_5_count}&nbsp;<br>
         </p>
     </td>
 </tr>
diff --git a/mojotrollz/page/user_achievements_content/user_achievements_content.php b/mojotrollz/page/user_achievements_content/user_achievements_content.php
index 077f198..ade1721 100644
--- a/mojotrollz/page/user_achievements_content/user_achievements_content.php
+++ b/mojotrollz/page/user_achievements_content/user_achievements_content.php
@@ -41,16 +41,22 @@ class user_achievements_content extends SYSTEM\PAGE\Page {
                 $data = \DBD\ACC_DATA::QQ(array(3));
                 while($row=$data->next()){
                     if($row['counter'] >= $row['stage_5_count']){
-                        $row['stage'] = '5';
+                        $row['stage'] = '<img src="http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=achievements_pvp&id=stage5.jpg"/>';
                     }
                     elseif ($row['counter'] >= $row['stage_4_count']) {
-                        $row['stage'] = '4';
+                        $row['stage'] = '<img src="http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=achievements_pvp&id=stage4.jpg"/>';
                     }
+                    elseif ($row['counter'] >= $row['stage_3_count']) {
+                    $row['stage'] = '<img src="http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=achievements_pvp&id=stage3.jpg"/>';
+                }
                     elseif ($row['counter'] >= $row['stage_2_count']) {
-                    $row['stage'] = '2';
+                    $row['stage'] = '<img src="http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=achievements_pvp&id=stage2.jpg"/>';
                 }
                     elseif ($row['counter'] >= $row['stage_1_count']) {
-                    $row['stage'] = '1';
+                    $row['stage'] = '<img src="http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=achievements_pvp&id=stage1.jpg"/>';
+                }
+                else{
+                    $row['stage'] = '<img src="http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=achievements_pvp&id=stage0.jpg"/>';
                 }
                     $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/pvp_element.tpl'), $row);    
                 }
diff --git a/mojotrollz/page/user_menu/js/user_menu.js b/mojotrollz/page/user_menu/js/user_menu.js
index 711afd8..a93c33d 100644
--- a/mojotrollz/page/user_menu/js/user_menu.js
+++ b/mojotrollz/page/user_menu/js/user_menu.js
@@ -9,6 +9,9 @@ function init_user_menu(){
     $("#btn_achieve").click(function(){
        sys.load('user_achievements_menu'); 
     });
+    $("#btn_shop").click(function(){
+       sys.load('user_shop_menu'); 
+    });
 }
 function register_logout(){
     $("#btn_logout").click(function(){
diff --git a/mojotrollz/page/user_menu/user_menu.tpl b/mojotrollz/page/user_menu/user_menu.tpl
index 58a0cd9..2320738 100644
--- a/mojotrollz/page/user_menu/user_menu.tpl
+++ b/mojotrollz/page/user_menu/user_menu.tpl
@@ -1,7 +1,7 @@
 <div style="width: 180px;">
     <button class="btn btn_blue no_deco" id="btn_news" href="#user_start">Overview</button>
     <button class="btn btn_blue no_deco" id="btn_achieve" href="#user_achievements_menu">Compendium</button>
-    <button class="btn btn_blue no_deco" id="btn_inv" href="#">Inventory</button>
+    <button class="btn btn_blue no_deco" id="btn_shop" href="user_shop_menu">Shop</button>
     <button class="btn btn_blue no_deco" id="btn_arm" href="#">Armory</button>
     <button class="btn btn_blue no_deco" id="btn_logout" href="#">Logout</button>    
 </div>
\ No newline at end of file
diff --git a/mojotrollz/page/user_shop_menu/tpl/js/user_shop_menu.js b/mojotrollz/page/user_shop_menu/tpl/js/user_shop_menu.js
new file mode 100644
index 0000000..7e1c757
--- /dev/null
+++ b/mojotrollz/page/user_shop_menu/tpl/js/user_shop_menu.js
@@ -0,0 +1,3 @@
+function init_user_shop_menu(){
+
+}
\ No newline at end of file
diff --git a/mojotrollz/page/user_shop_menu/tpl/user_shop_menu.tpl b/mojotrollz/page/user_shop_menu/tpl/user_shop_menu.tpl
new file mode 100644
index 0000000..b5d0631
--- /dev/null
+++ b/mojotrollz/page/user_shop_menu/tpl/user_shop_menu.tpl
@@ -0,0 +1,21 @@
+<div style="width: 25%; height: 100%; float: left; padding: 20px;" class="">
+    <button class="btn btn_blue no_deco" id="btn_shop_menu_vendor" href="#user_shop_vendor">Web Vendors</button>
+    <div style="width: 100%;" id="shop_content_vendor"></div>
+    <button class="btn btn_blue no_deco" id="btn_shop_menu_ah" href="#user_shop_ah">Auction House</button>
+    <div style="width: 100%;" id="shop_content_ah"></div>
+    <button class="btn btn_blue no_deco" id="btn_shop_menu_vote" href="#user_shop_vote">Vote Points</button>
+    <div style="width: 100%;" id="shop_content_vote"></div>
+    <button class="btn btn_blue no_deco" id="btn_shop_menu_sell" href="#user_shop_sell">Sell Item</button>
+    <div style="width: 100%;" id="shop_content_sell"></div>
+
+<div class="window_bg2" style="float: left; padding: 20px; width: 70%;" id="shop_list">
+    <div style="float: left; width: 50%;">
+        <img width="400" src="http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=default_start&id=help_gnome.png"/>
+    </div>
+    
+    <div style="float: left; width: 50%;">
+    <H3>Shop Section</H3>
+    <p>Welcome to the shopping Section. It's currently under construction,so gtfo. Thanks.</p>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/mojotrollz/page/user_shop_menu/user_shop_menu.php b/mojotrollz/page/user_shop_menu/user_shop_menu.php
new file mode 100644
index 0000000..a56bf88
--- /dev/null
+++ b/mojotrollz/page/user_shop_menu/user_shop_menu.php
@@ -0,0 +1,23 @@
+<?php
+class user_shop_menu extends SYSTEM\PAGE\Page {
+    public static function js(){
+        return array(   \SYSTEM\WEBPATH(new PPAGE(),'user_shop_menu/js/user_shop_menu.js'));}
+      
+    public static function css (){
+       return array();}
+       
+    
+    
+     
+    public function html(){
+        $vars = array();
+        
+        $vars['PICPATH'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=default_page&id=';
+        $vars['PIC'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=race&id=';
+        $vars['PI'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=class&id=';
+        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE),
+                                    \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_SERVERINFO),
+                                    \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_BASIC));
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_shop_menu/tpl/user_shop_menu.tpl'), $vars);
+    }
+}
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_details/tpl/details.tpl b/mojotrollz/page/wizard_details/tpl/details.tpl
index 5907848..ea75bb9 100644
--- a/mojotrollz/page/wizard_details/tpl/details.tpl
+++ b/mojotrollz/page/wizard_details/tpl/details.tpl
@@ -1,14 +1,14 @@
 <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>
+    <button class="btn btn_menu" id="btn_check_name">Check</button></br></br>
     <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>
     <a class="female human fadein info"      info="race_human" race="1" rrace="human" gender="female" href="#"><img src="${WOW_RACE}human_female.png" /></a>
-    <a class="male ork fadein info"          info="race_ork" race="2" rrace="ork" gender="male" href="#"><img src="${WOW_RACE}ork_male.png" /></a>
-    <a class="female ork fadein info"        info="race_ork" race="2" rrace="ork" gender="female" href="#"><img src="${WOW_RACE}ork_female.png" /></a>
+    <a class="male ork fadein info"          info="race_ork" race="2" rrace="ork" gender="male" href="#"><img src="${WOW_RACE}orc_male.png" /></a>
+    <a class="female ork fadein info"        info="race_ork" race="2" rrace="ork" gender="female" href="#"><img src="${WOW_RACE}orc_female.png" /></a>
     <br>
     <a class="male dwarf fadein info"        info="race_dwarf" race="3" rrace="dwarf" gender="male" href="#"><img src="${WOW_RACE}dwarf_male.png" /></a>
     <a class="female dwarf fadein info"      info="race_dwarf" race="3" rrace="dwarf" gender="female" href="#"><img src="${WOW_RACE}dwarf_female.png" /></a>
diff --git a/mojotrollz/page/wizard_spawn/tpl/spawn.tpl b/mojotrollz/page/wizard_spawn/tpl/spawn.tpl
index ae9d5fa..f2f0f4a 100644
--- a/mojotrollz/page/wizard_spawn/tpl/spawn.tpl
+++ b/mojotrollz/page/wizard_spawn/tpl/spawn.tpl
@@ -1,8 +1,9 @@
 <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%">
+                    <a class="" style="margin: 5px; margin-top: 0px; padding: 10px;" href="#wizard_spawn"><li class="btn_menu">switch map</li></a>
                     <h3 style=""><img style="" src="${PICPATH}help_questionmark.png"width="25px"/>&nbsp;${spawn_info_title}</h3>
                     <div id="info_content"></div>
                 </div>             
diff --git a/mojotrollz/page/wizard_visuals/tpl/select.tpl b/mojotrollz/page/wizard_visuals/tpl/select.tpl
index 4110b42..dd16a41 100644
--- a/mojotrollz/page/wizard_visuals/tpl/select.tpl
+++ b/mojotrollz/page/wizard_visuals/tpl/select.tpl
@@ -1,5 +1,5 @@
 <tr>
-    <td>${type}</td>
+    <td><li class="btn_menu_off">${type}</li></td>
     <td><select id="${id}">
         ${options}
     </select></td>