diff --git a/mojotrollz/api/api_mojotrollz.php b/mojotrollz/api/api_mojotrollz.php
index 884a1aa..3091ebf 100644
--- a/mojotrollz/api/api_mojotrollz.php
+++ b/mojotrollz/api/api_mojotrollz.php
@@ -6,4 +6,9 @@ class api_mojotrollz extends \SYSTEM\API\api_system {
         return \SYSTEM\LOG\JsonResult::toString($result);}
      public static function call_charcreation($json=NULL){
          return charcreation::data($json);}
+     public static function call_quest($entry){
+        if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
+            throw new ERROR("You need to be logged in to view this ressource.");}
+            $quest = quest::test($entry);
+        return $quest;}
 }
diff --git a/mojotrollz/page/page_mojotrollz.php b/mojotrollz/page/page_mojotrollz.php
index e92e21a..1d126cf 100644
--- a/mojotrollz/page/page_mojotrollz.php
+++ b/mojotrollz/page/page_mojotrollz.php
@@ -83,12 +83,6 @@ class page_mojotrollz extends \SYSTEM\API\api_default {
         if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
             throw new ERROR("You need to be logged in to view this ressource.");}
         return new user_achievements_content($menu, $filter);}
-    
-    public static function page_user_achievements_content_quest($entry){
-        if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
-            throw new ERROR("You need to be logged in to view this ressource.");}
-            $quest = quest::test($entry);
-        return $quest;}
         
     public static function page_user_logout(){
         if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
diff --git a/mojotrollz/page/user_achievements_content/tpl/quest_element.tpl b/mojotrollz/page/user_achievements_content/tpl/quest_element.tpl
index 8b4d00b..01654ea 100644
--- a/mojotrollz/page/user_achievements_content/tpl/quest_element.tpl
+++ b/mojotrollz/page/user_achievements_content/tpl/quest_element.tpl
@@ -1,15 +1,15 @@
 <tr class="element_bg2">
     <td>
-        <a href="http://www.wowhead.com/quest=${entry}/" target="_blank">${Title}</a>
-        <p>Min&nbsp;Lvl:&nbsp;${MinLevel}<br>
+        <p>${Title}<br>
+        Min&nbsp;Lvl:&nbsp;${MinLevel}<br>
         Quest&nbsp;Lvl:&nbsp;${QuestLevel}</p>
         <button class="btn btn_menu_add btn_quest_info" entry="${entry}" href="#">Detail</button>
     </td>
     
     <td style="min-width: 170px;">
-        <p>Previous Quest: ${PrevQuestId}<br>
-        Next Quest: ${NextQuestId}<br>
-        Next Quest in Chain: ${NextQuestInChain}</p>
+        ${prevquest}<br>
+        ${nextquest}
+        <p></p>
     </td>
     
     <td style="max-width: 450px;">
diff --git a/mojotrollz/page/user_achievements_content/user_achievements_content.php b/mojotrollz/page/user_achievements_content/user_achievements_content.php
index e9d9ab6..aad3967 100644
--- a/mojotrollz/page/user_achievements_content/user_achievements_content.php
+++ b/mojotrollz/page/user_achievements_content/user_achievements_content.php
@@ -68,158 +68,53 @@ class user_achievements_content extends SYSTEM\PAGE\Page {
     }
     
     private function menu_creature(){
-        switch($this->filter){
-            case 1:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(1));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 2:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(2));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 3:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(3));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 4:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(4));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 5:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(5));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 6:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(6));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 7:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(7));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 8:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(8));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 9:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(9));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 10:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(10));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 11:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(11));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            case 12:
-                $result = '';
-                $data = \DBD\CREATURE_TYPE::QQ(array(12));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
-            
-                default:
-                return 'filter fail';
+        $result = '';
+        $data = \DBD\CREATURE_TYPE::QQ(array($this->filter));
+        while($row=$data->next()){    
+            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature_element.tpl'), $row);    
         }
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/creature.tpl'), array('content' => $result));
     }
     
     private function menu_quest(){
+        $_filter = null;
         switch($this->filter){
             case 1:
-                $result = '';
-                $data = \DBD\QUEST_TYPE::QQ(array(81));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest.tpl'), array('content' => $result));
+                $_filter = 81;
+                break;
             case 2:
-                $result = '';
-                $data = \DBD\QUEST_TYPE::QQ(array(62));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest.tpl'), array('content' => $result));
-            
+                $_filter = 62;
+                break;
             case 3:
-                $result = '';
-                $data = \DBD\QUEST_TYPE::QQ(array(1));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest.tpl'), array('content' => $result));
-            
+                $_filter = 1;
+                break;
             case 4:
-                $result = '';
-                $data = \DBD\QUEST_TYPE::QQ(array(83));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest.tpl'), array('content' => $result));
-            
+                $_filter = 83;
+                break;
             case 5:
-                $result = '';
-                $data = \DBD\QUEST_TYPE::QQ(array(84));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest.tpl'), array('content' => $result));
-            
-           
+                $_filter = 84;
             case 7:
-                $result = '';
-                $data = \DBD\QUEST_TYPE::QQ(array(41));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest.tpl'), array('content' => $result));
-             
+                $_filter = 41;
             case 8:
-                $result = '';
-                $data = \DBD\QUEST_TYPE::QQ(array(0));
-                while($row=$data->next()){    
-                    $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest_element.tpl'), $row);    
-                }
-                return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest.tpl'), array('content' => $result));
-                
+                $_filter = 0;                
             default:
                 return 'filter fail';
         }
+        
+        $result = '';
+        $data = \DBD\QUEST_TYPE::QQ(array($_filter));
+        while($row=$data->next()){
+            $row['prevquest'] = '';
+            if ($row['PrevQuestId']){
+              $row['prevquest'] = 'Previous:&nbsp;<a class=" btn_quest_info" entry="${PrevQuestId}" href="#">'.\DBD\GET_BASE_DATA::Q1(array($row['PrevQuestId']))['Title'].'</a>';  
+            }
+            $row['nextquest'] = '';
+            if ($row['NextQuestId']){
+              $row['nextquest'] = 'Next:&nbsp;<a class=" btn_quest_info" entry="${NextQuestId}" href="#">'.\DBD\GET_BASE_DATA::Q1(array($row['NextQuestId']))['Title'].'</a';  
+            }
+            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest_element.tpl'), $row);    
+        }
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_achievements_content/tpl/quest.tpl'), array('content' => $result));
     }
     
     private function menu_item(){
diff --git a/mojotrollz/page/user_achievements_menu/js/user_achievements_menu.js b/mojotrollz/page/user_achievements_menu/js/user_achievements_menu.js
index c6831d4..86fbb10 100644
--- a/mojotrollz/page/user_achievements_menu/js/user_achievements_menu.js
+++ b/mojotrollz/page/user_achievements_menu/js/user_achievements_menu.js
@@ -1,23 +1,51 @@
 function init_user_achievements_menu(){
     $("#btn_achieve_menu_acc").click(function(){
-       sys.load('user_achievements_menu_sub_1'); 
+        if($('#achievement_content_acc').html() == ''){
+            sys.load('user_achievements_menu_sub_1');
+        } else {
+            $('#achievement_content_acc').html('');
+        }
     });
     $("#btn_achieve_menu_boss").click(function(){
-       sys.load('user_achievements_menu_sub_2'); 
+        if($('#achievement_content_boss').html() == ''){
+            sys.load('user_achievements_menu_sub_2');
+        } else {
+            $('#achievement_content_boss').html('');
+        }
     });
     $("#btn_achieve_menu_pvp").click(function(){
-       sys.load('user_achievements_menu_sub_3'); 
+        if($('#achievement_content_pvp').html() == ''){
+            sys.load('user_achievements_menu_sub_3');
+        } else {
+            $('#achievement_content_pvp').html('');
+        }
     });
     $("#btn_achieve_menu_creature").click(function(){
-       sys.load('user_achievements_menu_sub_4'); 
+        if($('#achievement_content_creature').html() == ''){
+            sys.load('user_achievements_menu_sub_4');
+        } else {
+            $('#achievement_content_creature').html('');
+        }
     });
     $("#btn_achieve_menu_quest").click(function(){
-       sys.load('user_achievements_menu_sub_5'); 
+        if($('#achievement_content_quest').html() == ''){
+            sys.load('user_achievements_menu_sub_5');
+        } else {
+            $('#achievement_content_quest').html('');
+        } 
     });
     $("#btn_achieve_menu_item").click(function(){
-       sys.load('user_achievements_menu_sub_6'); 
+        if($('#achievement_content_item').html() == ''){
+            sys.load('user_achievements_menu_sub_6');
+        } else {
+            $('#achievement_content_item').html('');
+        } 
     });
     $("#btn_achieve_menu_eco").click(function(){
-       sys.load('user_achievements_menu_sub_7'); 
+        if($('#achievement_content_eco').html() == ''){
+            sys.load('user_achievements_menu_sub_7');
+        } else {
+            $('#achievement_content_eco').html('');
+        }
     });
 }
\ No newline at end of file
diff --git a/mojotrollz/page/user_achievements_menu_sub/js/user_achievements_menu_sub.js b/mojotrollz/page/user_achievements_menu_sub/js/user_achievements_menu_sub.js
index 1e494d6..0ef8527 100644
--- a/mojotrollz/page/user_achievements_menu_sub/js/user_achievements_menu_sub.js
+++ b/mojotrollz/page/user_achievements_menu_sub/js/user_achievements_menu_sub.js
@@ -10,7 +10,7 @@ function init_user_achievements_menu_sub(){
         alert('info');
         $(".btn_quest_info").click(function(){
             alert('test');
-            $('#achievement_list').load('./?page=user_achievements_content_quest&entry=' + $(this).attr('entry'));
+            $('#achievement_list').load('./api.php?call=quest&entry=' + $(this).attr('entry'));
 //                $('#achievement_list').load('./?page=user_achievements_content_quest&entry=' + $(this).attr('entry'));
         });
     }