diff --git a/mojotrollz/api/database/player_genders.php b/mojotrollz/api/database/player_genders.php
new file mode 100644
index 0000000..ee362b6
--- /dev/null
+++ b/mojotrollz/api/database/player_genders.php
@@ -0,0 +1,32 @@
+<?php
+class player_genders {
+    const FEMALE = 0;
+    const FEMALE_NAME = 'female';
+    
+    const MALE = 1;
+    const MALE_NAME = 'male';
+    
+    const HUNTER = 3;
+    const HUNTER_NAME = 'Hunter';
+    
+    public static function name($gender){
+        switch($gender){
+            case self::FEMALE:
+                return self::FEMALE_NAME;
+            case self::MALE:
+                return self::MALE_NAME;
+            default:
+                return 'default';
+        }
+    }
+    
+    public static function is($gender){
+        switch($gender){
+            case self::FEMALE:
+            case self::MALE:
+                return true;
+            default:
+                return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/mojotrollz/api/database/tooltip/qq/TOOLTIP_CREATURE.php b/mojotrollz/api/database/tooltip/qq/TOOLTIP_CREATURE.php
index 137f80a..6c049b3 100644
--- a/mojotrollz/api/database/tooltip/qq/TOOLTIP_CREATURE.php
+++ b/mojotrollz/api/database/tooltip/qq/TOOLTIP_CREATURE.php
@@ -5,7 +5,10 @@ class TOOLTIP_CREATURE extends \SYSTEM\DB\QP {
     protected static function query(){
         return new \SYSTEM\DB\QQuery(get_class(),
 '',
-'SELECT guid FROM creature WHERE guid = ? LIMIT 1;',
+'SELECT guid,host_mojotrollz.mojotrollz_tags_value.value as map_name, Name, Subname, MinLevel, MaxLevel, position_x, position_y FROM creature'.
+' LEFT JOIN creature_template ON creature.id = creature_template.entry'.
+' LEFT JOIN host_mojotrollz.mojotrollz_tags_value ON host_mojotrollz.mojotrollz_tags_value.id = map'.
+' WHERE guid = ? LIMIT 1;',
 new \DBD\mangos_world()
 );}}
 
diff --git a/mojotrollz/api/database/tooltip/qq/TOOLTIP_PLAYER.php b/mojotrollz/api/database/tooltip/qq/TOOLTIP_PLAYER.php
index 6ea6fb7..a7021c9 100644
--- a/mojotrollz/api/database/tooltip/qq/TOOLTIP_PLAYER.php
+++ b/mojotrollz/api/database/tooltip/qq/TOOLTIP_PLAYER.php
@@ -5,7 +5,9 @@ class TOOLTIP_PLAYER extends \SYSTEM\DB\QP {
     protected static function query(){
         return new \SYSTEM\DB\QQuery(get_class(),
 '',
-'SELECT guid, name, race, class, gender, level FROM characters WHERE guid = ? AND deleteInfos_Account IS NULL LIMIT 1;',
+'SELECT guid, name, race, class, gender, level,host_mojotrollz.mojotrollz_tags_value.value as map_name FROM characters'.
+' LEFT JOIN host_mojotrollz.mojotrollz_tags_value ON id = map'.
+' WHERE guid = ? AND deleteInfos_Account IS NULL LIMIT 1;',
 new \DBD\mangos_chars()
 );}}
 
diff --git a/mojotrollz/api/database/tooltip/tooltip.php b/mojotrollz/api/database/tooltip/tooltip.php
index 956cf77..88a448f 100644
--- a/mojotrollz/api/database/tooltip/tooltip.php
+++ b/mojotrollz/api/database/tooltip/tooltip.php
@@ -13,7 +13,15 @@ class tooltip {
             case database_elements::DB_SPELL:
                 return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'database/tooltip/tpl/tooltip_spell.tpl'), \DBD\TOOLTIP_SPELL::Q1(array($id)));
             case database_elements::DB_PLAYER:
-                return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'database/tooltip/tpl/tooltip_player.tpl'), \DBD\TOOLTIP_PLAYER::Q1(array($id)));
+                $vars = \DBD\TOOLTIP_PLAYER::Q1(array($id));
+                $vars['name'] = utf8_encode($vars['name']);
+                //$vars['map_name'] = utf8_encode($vars['name']);
+                $vars['race_name'] = player_races::name($vars['race']);
+                $vars['class_name'] = player_classes::name($vars['class']);
+                $vars['gender_name'] = player_genders::name($vars['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 PAPI(),'database/tooltip/tpl/tooltip_player.tpl'), $vars);
             default:
                 throw new ERROR('Wrong Type');
         }
diff --git a/mojotrollz/api/database/tooltip/tpl/tooltip_creature.tpl b/mojotrollz/api/database/tooltip/tpl/tooltip_creature.tpl
index bb3d896..9a83800 100644
--- a/mojotrollz/api/database/tooltip/tpl/tooltip_creature.tpl
+++ b/mojotrollz/api/database/tooltip/tpl/tooltip_creature.tpl
@@ -1,5 +1,7 @@
-Player: ${name}(${guid})<br/>
-Race: ${race}<br/>
-Class: ${class}<br/>
-Gender: ${gender}<br/>
-Level: ${level}
\ No newline at end of file
+<div style="background: black; border: 2px solid grey; width: 280px; height: 120px;">
+    ${Name} - ${Subname}<br/>
+    Guid: ${guid}<br/>
+    Level: ${MinLevel}-${MaxLevel}<br/>
+    Pos: ${position_x} : ${position_y}<br/>
+    Map: ${map_name}
+</div>
\ No newline at end of file
diff --git a/mojotrollz/api/database/tooltip/tpl/tooltip_player.tpl b/mojotrollz/api/database/tooltip/tpl/tooltip_player.tpl
index bb3d896..3bf6041 100644
--- a/mojotrollz/api/database/tooltip/tpl/tooltip_player.tpl
+++ b/mojotrollz/api/database/tooltip/tpl/tooltip_player.tpl
@@ -1,5 +1,6 @@
-Player: ${name}(${guid})<br/>
-Race: ${race}<br/>
-Class: ${class}<br/>
-Gender: ${gender}<br/>
-Level: ${level}
\ No newline at end of file
+<div style="background: black; border: 2px solid grey; width: 120px; height: 60px;">
+    ${level} | ${name}<br/>
+    <img width="24" src="${WOW_RACE}${race_name}_${gender_name}.png"/>
+    <img width="24" src="${WOW_CLASS}${class_name}.png" /><br/>
+    ${map_name}
+</div>
\ No newline at end of file
diff --git a/mojotrollz/page/wizard_visuals/tpl/wizard_visuals.tpl b/mojotrollz/page/wizard_visuals/tpl/wizard_visuals.tpl
index feedd42..eb45548 100644
--- a/mojotrollz/page/wizard_visuals/tpl/wizard_visuals.tpl
+++ b/mojotrollz/page/wizard_visuals/tpl/wizard_visuals.tpl
@@ -1,6 +1,6 @@
 ${equipment}
 ${inventory}
-<div style="padding: 5px; float: left;">
+<div style="padding: 5px; float: left; width: 220px;">
     <table>
         ${visual_skin}
         ${visual_hair}
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_player/saimod_mojotrollz_db_player.php b/mojotrollz/sai/saimod_mojotrollz_db_player/saimod_mojotrollz_db_player.php
index 900967d..805ca71 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_player/saimod_mojotrollz_db_player.php
+++ b/mojotrollz/sai/saimod_mojotrollz_db_player/saimod_mojotrollz_db_player.php
@@ -6,6 +6,7 @@ class saimod_mojotrollz_db_player extends \SYSTEM\SAI\SaiModule {
         $vars = array();
         $elements =   '';
         while($row = $res->next()){
+            $row['name'] = utf8_encode($row['name']);
             $elements .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_player/tpl/player.tpl'), $row);}
         $vars['elements'] = $elements;
         $vars['map'] = map::generate(6);
diff --git a/mojotrollz/sai/saimod_mojotrollz_visuals/tpl/saimod_mojotrollz_visuals.tpl b/mojotrollz/sai/saimod_mojotrollz_visuals/tpl/saimod_mojotrollz_visuals.tpl
index c2186f7..e53f308 100644
--- a/mojotrollz/sai/saimod_mojotrollz_visuals/tpl/saimod_mojotrollz_visuals.tpl
+++ b/mojotrollz/sai/saimod_mojotrollz_visuals/tpl/saimod_mojotrollz_visuals.tpl
@@ -7,9 +7,9 @@
         <li><a href="#tab_visual" race="3">Dwarf(3)</a></li>
         <li><a href="#tab_visual" race="4">Nightelf(4)</a></li>
         <li><a href="#tab_visual" race="5">Scourge(5)</a></li>
-        <li><a href="#tab_visual" race="7">Tauren(7)</a></li>
-        <li><a href="#tab_visual" race="8">Gnome(8)</a></li>
-        <li><a href="#tab_visual" race="9">Troll(9)</a></li>
+        <li><a href="#tab_visual" race="6">Tauren(6)</a></li>
+        <li><a href="#tab_visual" race="7">Gnome(7)</a></li>
+        <li><a href="#tab_visual" race="8">Troll(8)</a></li>
         <img id="loader" src="${PICPATH}ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none;  float: left"/>
     </ul>
     <div class="tab-content">