Improving skills layout, better translations for classes and races

Leandro Silva [10-22-18 - 17:54]
Improving skills layout, better translations for classes and races
Filename
Lang/de.lua
LeoAltholic.lua
LeoAltholic.txt
LeoAltholic.xml
LeoAltholicInit.lua
LeoAltholicUI.lua
ui/bio.lua
ui/inventory.lua
ui/research.lua
ui/skills.lua
ui/skills2.lua
diff --git a/Lang/de.lua b/Lang/de.lua
index 23b8ffd..a9c6ed2 100644
--- a/Lang/de.lua
+++ b/Lang/de.lua
@@ -1,6 +1,6 @@

-ZO_CreateStringId("LEOALT_FINISHED",      "abgeschlossen")
-ZO_CreateStringId("LEOALT_UNLOCKED",      "freigeschaltet")
+ZO_CreateStringId("LEOALT_FINISHED", "abgeschl.")
+ZO_CreateStringId("LEOALT_UNLOCKED", "freigesch.")
 ZO_CreateStringId("LEOALT_REMOVED_FROM",      "<<1>> wurde von <<2>> entfernt.")
 ZO_CreateStringId("LEOALT_NOT_DONE_TODAY",      "heute  nicht erledigt")
 ZO_CreateStringId("LEOALT_MOUNT_FINISHED",      "<<C:1>> hat das Reittraining beendet.")
@@ -21,7 +21,7 @@ ZO_CreateStringId("LEOALT_CENTERSCREEN_CURRENT_TOOLTIP", "Zeigt eine Bildschirm
 ZO_CreateStringId("LEOALT_PLAYED", "Gespielt")
 ZO_CreateStringId("LEOALT_RIDING", "Reiten")
 ZO_CreateStringId("LEOALT_MAXIMUM", "Maximum")
-ZO_CreateStringId("LEOALT_RECOVERY", "Wiederherstellung")
+ZO_CreateStringId("LEOALT_RECOVERY",  "Wiederherst.")

 ZO_CreateStringId("LEOALT_WRIT", "schrieb")
 ZO_CreateStringId("LEOALT_ALCHEMIST", "Alchemisten")
diff --git a/LeoAltholic.lua b/LeoAltholic.lua
index 9015037..5a6224c 100644
--- a/LeoAltholic.lua
+++ b/LeoAltholic.lua
@@ -927,6 +927,7 @@ local function onAddOnLoaded(event, addonName)

     EVENT_MANAGER:UnregisterForEvent(LeoAltholic.name, EVENT_ADD_ON_LOADED)
     SCENE_MANAGER:RegisterTopLevel(LeoAltholicWindow, false)
+    SCENE_MANAGER:RegisterTopLevel(LeoAltholicInventoryWindow, false)

     if GetDisplayName() == "@LeandroSilva" then
         SLASH_COMMANDS["/rr"] = function(cmd) ReloadUI() end
diff --git a/LeoAltholic.txt b/LeoAltholic.txt
index fa71111..a9c984c 100644
--- a/LeoAltholic.txt
+++ b/LeoAltholic.txt
@@ -1,6 +1,6 @@
 ## Title: Leo's Altholic
 ## APIVersion: 100024 100025
-## Version: 1.3.7
+## Version: 1.3.8
 ## Author: |c39B027@LeandroSilva|r
 ## SavedVariables: LeoAltholicSavedVariables
 ## OptionalDependsOn: LibStub LibFeedback LibAddonMenu-2.0
diff --git a/LeoAltholic.xml b/LeoAltholic.xml
index e5f0a6e..30e671c 100644
--- a/LeoAltholic.xml
+++ b/LeoAltholic.xml
@@ -497,6 +497,90 @@
                                         </Texture>
                                     </Controls>
                                 </Control>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersName" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersName" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersClass1" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersClass1" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersClass2" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersClass2" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersClass3" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersClass3" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersTwoHanded" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersTwoHanded" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersOneHanded" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersOneHanded" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersDualWield" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersDualWield" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersBow" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersBow" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersDestructionStaff" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersDestructionStaff" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersRestorationStaff" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersRestorationStaff" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersArmorLight" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersArmorLight" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersArmorMedium" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersArmorMedium" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersArmorHeavy" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersArmorHeavy" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersRacial" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersRacial" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersCraft1" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersCraft1" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersCraft2" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersCraft2" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersCraft3" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersCraft3" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersCraft4" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersCraft4" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersCraft5" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersCraft5" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersCraft6" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersCraft6" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersCraft7" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersCraft7" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
                                 <Control name="$(parent)List" inherits="ZO_ScrollList">
                                     <Dimensions x="990" y="600" />
                                     <Anchor point="TOPLEFT" relativeTo="$(parent)Headers" relativePoint="BOTTOMLEFT" offsetY="30" />
@@ -642,6 +726,62 @@
                                         </Texture>
                                     </Controls>
                                 </Control>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersName" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersName" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersWorld1" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersWorld1" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersWorld2" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersWorld2" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersWorld3" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersWorld3" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersWorld4" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersWorld4" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersGuild1" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersGuild1" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersGuild2" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersGuild2" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersGuild3" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersGuild3" relativePoint="BOTTOMRIGHT" offsetX="4" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersGuild4" relativePoint="TOPRIGHT" offsetX="8" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersGuild4" relativePoint="BOTTOMRIGHT" offsetX="8" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersGuild5" relativePoint="TOPRIGHT" offsetX="8" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersGuild5" relativePoint="BOTTOMRIGHT" offsetX="8" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersGuild6" relativePoint="TOPRIGHT" offsetX="10" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersGuild6" relativePoint="BOTTOMRIGHT" offsetX="10" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersAssault" relativePoint="TOPRIGHT" offsetX="8" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersAssault" relativePoint="BOTTOMRIGHT" offsetX="8" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersEmperor" relativePoint="TOPRIGHT" offsetX="8" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersEmperor" relativePoint="BOTTOMRIGHT" offsetX="8" offsetY="10"/>
+                                </Line>
+                                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)HeadersSupport" relativePoint="TOPRIGHT" offsetX="8" offsetY="0"/>
+                                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)HeadersSupport" relativePoint="BOTTOMRIGHT" offsetX="8" offsetY="10"/>
+                                </Line>
                                 <Control name="$(parent)List" inherits="ZO_ScrollList">
                                     <Dimensions x="990" y="600" />
                                     <Anchor point="TOPLEFT" relativeTo="$(parent)Headers" relativePoint="BOTTOMLEFT" offsetY="30" />
@@ -920,10 +1060,10 @@
                     <Dimensions x="240" y="32" />
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Alliance" relativePoint="TOPRIGHT" offsetX="10"/>
                 </Label>
-                <Texture name="$(parent)Divider" textureFile="EsoUI/Art/Miscellaneous/centerscreen_topDivider.dds">
-                    <Dimensions x="1000" y="2" />
-                    <Anchor point="TOP" relativeTo="$(parent)" relativePoint="TOP" offsetX="-10" offsetY="30" />
-                </Texture>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="BOTTOMLEFT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMRIGHT" relativeTo="$(parent)Riding" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
             </Controls>
         </Control>

@@ -952,10 +1092,10 @@
                     <Dimensions x="200" y="32" />
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Recovery" relativePoint="TOPRIGHT" offsetX="10"/>
                 </Label>
-                <Texture name="$(parent)Divider" textureFile="EsoUI/Art/Miscellaneous/centerscreen_topDivider.dds">
-                    <Dimensions x="900" y="2" />
-                    <Anchor point="TOP" relativeTo="$(parent)" relativePoint="TOP" offsetX="-10" offsetY="30" />
-                </Texture>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="BOTTOMLEFT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMRIGHT" relativeTo="$(parent)WeaponSpellCrit" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
             </Controls>
         </Control>

@@ -1114,6 +1254,11 @@
                     <Dimensions x="70" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Craft4Status" relativePoint="TOPRIGHT" offsetX="12"/>
                 </Label>
+
+                <Line name="$(parent)HorizLine" color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="BOTTOMLEFT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMRIGHT" relativeTo="$(parent)Craft5Status" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="2"/>
+                </Line>
             </Controls>
         </Control>

@@ -1125,91 +1270,215 @@
                     <Dimensions x="180" y="30"/>
                 </Label>

+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Name" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Class1" mouseEnabled="true" font="LeoAltholicLargeFont" color="FF0000" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="14" offsetY="0"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Class1" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Class1" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Class2" mouseEnabled="true" font="LeoAltholicLargeFont" color="FF0000" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Class1" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Class2" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Class2" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Class3" mouseEnabled="true" font="LeoAltholicLargeFont" color="FF0000" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Class2" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Class3" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Class3" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Weapon1" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Class3" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Weapon1" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Weapon1" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Weapon2" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Weapon1" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Weapon2" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Weapon2" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Weapon3" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Weapon2" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Weapon3" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Weapon3" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Weapon4" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Weapon3" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Weapon4" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Weapon4" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Weapon5" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Weapon4" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Weapon5" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Weapon5" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Weapon6" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Weapon5" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Weapon6" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Weapon6" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Armor1" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Weapon6" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Armor1" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Armor1" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Armor2" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Armor1" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Armor2" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Armor2" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Armor3" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Armor2" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Armor3" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Armor3" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Racial" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Armor3" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Racial" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Racial" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Craft1" mouseEnabled="true" font="LeoAltholicLargeFont" color="FF0000" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Racial" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft1" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Craft1" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Craft2" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Craft1" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft2" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Craft2" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Craft3" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Craft2" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft3" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Craft3" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Craft4" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Craft3" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft4" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Craft4" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Craft5" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Craft4" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft5" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Craft5" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Craft6" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Craft5" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft6" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Craft6" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Craft7" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Craft6" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft7" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Craft7" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>

-                <Texture name="$(parent)Divider" textureFile="EsoUI/Art/Miscellaneous/centerscreen_topDivider.dds">
-                    <Dimensions x="1000" y="2" />
-                    <Anchor point="TOP" relativeTo="$(parent)" relativePoint="TOP" offsetX="-10" offsetY="30" />
-                </Texture>
+                <Line name="$(parent)HorizLine" color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="BOTTOMLEFT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMRIGHT" relativeTo="$(parent)Craft7" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="2"/>
+                </Line>
             </Controls>
         </Control>

@@ -1220,64 +1489,143 @@
                     <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="0" offsetY="0"/>
                     <Dimensions x="180" y="30"/>
                 </Label>
-
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Name" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)World1" mouseEnabled="true" font="LeoAltholicLargeFont" color="FF0000" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="14" offsetY="0"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)World1" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)World1" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)World2" mouseEnabled="true" font="LeoAltholicLargeFont" color="FF0000" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)World1" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)World2" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)World2" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)World3" mouseEnabled="true" font="LeoAltholicLargeFont" color="FF0000" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)World2" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)World3" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)World3" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)World4" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)World3" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)World4" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)World4" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Guild1" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)World4" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Guild1" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Guild1" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Guild2" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Guild1" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Guild2" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Guild2" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Guild3" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Guild2" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Guild3" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Guild3" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Guild4" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Guild3" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Guild4" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Guild4" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Guild5" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Guild4" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Guild5" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Guild5" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)Guild6" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Guild5" relativePoint="TOPRIGHT" offsetX="10"/>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Guild6" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)Guild6" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)AvA1" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Guild6" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)AvA1" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)AvA1" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)AvA2" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)AvA1" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)AvA2" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)AvA2" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
                 <Label name="$(parent)AvA3" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
                     <Dimensions x="24" y="28"/>
                     <Anchor point="TOPLEFT" relativeTo="$(parent)AvA2" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipSkill(self, false) </OnMouseExit>
                 </Label>
+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)AvA3" relativePoint="TOPRIGHT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)AvA3" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>

-                <Texture name="$(parent)Divider" textureFile="EsoUI/Art/Miscellaneous/centerscreen_topDivider.dds">
-                    <Dimensions x="800" y="2" />
-                    <Anchor point="BOTTOMLEFT" relativeTo="$(parent)" relativePoint="BOTTOMLEFT" offsetX="-30" offsetY="2" />
-                </Texture>
+                <Line name="$(parent)HorizLine" color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="BOTTOMLEFT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMRIGHT" relativeTo="$(parent)AvA3" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="2"/>
+                </Line>
             </Controls>
         </Control>

@@ -1308,10 +1656,10 @@
                     <OnMouseEnter> LeoAltholicUI.TooltipChampionSkill(self, true) </OnMouseEnter>
                     <OnMouseExit> LeoAltholicUI.TooltipChampionSkill(self, false) </OnMouseExit>
                 </Label>
-                <Texture name="$(parent)Divider" textureFile="EsoUI/Art/Miscellaneous/centerscreen_topDivider.dds">
-                    <Dimensions x="1000" y="2" />
-                    <Anchor point="TOP" relativeTo="$(parent)" relativePoint="TOP" offsetX="-10" offsetY="30" />
-                </Texture>
+                <Line name="$(parent)HorizLine" color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="BOTTOMLEFT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMRIGHT" relativeTo="$(parent)Craft7" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="2"/>
+                </Line>
             </Controls>
         </Control>

@@ -1352,6 +1700,11 @@
                     <Dimensions x="40" y="40"/>
                     <Textures normal="/esoui/art/buttons/large_rightarrow_up.dds" mouseOver="/esoui/art/buttons/large_rightarrow_over.dds" />
                 </Button>
+
+                <Line name="$(parent)HorizLine" color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="BOTTOMLEFT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMRIGHT" relativeTo="$(parent)Writ" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="0"/>
+                </Line>
             </Controls>
         </Control>

@@ -1388,6 +1741,10 @@
                     <OnMouseExit> LeoAltholicUI.TooltipResearch(self, false) </OnMouseExit>
                 </Label>

+                <Line color="444444" thickness="2" pixelRoundingEnabled="true">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="BOTTOMLEFT" offsetX="0" offsetY="0"/>
+                    <Anchor point="BOTTOMRIGHT" relativeTo="$(parent)Craft7" relativePoint="BOTTOMRIGHT" offsetX="0" offsetY="2"/>
+                </Line>
             </Controls>
         </Control>

diff --git a/LeoAltholicInit.lua b/LeoAltholicInit.lua
index 3320dab..f1a4a4d 100644
--- a/LeoAltholicInit.lua
+++ b/LeoAltholicInit.lua
@@ -4,5 +4,5 @@ LeoAltholicUI = LeoAltholicUI or {}

 LeoAltholic.name = "LeoAltholic"
 LeoAltholic.displayName = "Leo's Altholic"
-LeoAltholic.version = "1.3.7"
+LeoAltholic.version = "1.3.8"
 LeoAltholic.chatPrefix = "|c39B027" .. LeoAltholic.name .. "|r: "
diff --git a/LeoAltholicUI.lua b/LeoAltholicUI.lua
index 3f8e7c3..5876926 100644
--- a/LeoAltholicUI.lua
+++ b/LeoAltholicUI.lua
@@ -81,6 +81,7 @@ end

 function LeoAltholic.CloseUI()
     SCENE_MANAGER:HideTopLevel(LeoAltholicWindow)
+    SCENE_MANAGER:HideTopLevel(LeoAltholicInventoryWindow)
 end

 function LeoAltholic.ShowUI()
diff --git a/ui/bio.lua b/ui/bio.lua
index 52b2e3f..a12b372 100644
--- a/ui/bio.lua
+++ b/ui/bio.lua
@@ -41,26 +41,30 @@ function LeoAltholicBioList:SetupEntry(control, data)
     end

     control.race = GetControl(control, "Race")
-    control.race:SetText(data.race)
+    local raceName = GetRaceName(data.gender, data.raceId) or GetString(SI_UNKNOWN_RACE)
+    control.race:SetText(zo_strformat(SI_RACE_NAME, raceName))

     control.class = GetControl(control, "Class")
-    control.class:SetText(data.class)
+    control.class:SetText(zo_strformat(SI_CLASS_NAME, GetClassName(data.gender, data.classId)))

     control.alliance = GetControl(control, "Alliance")
     --local icon = ZO_GetAllianceIcon(data.alliance.id)
-    local color, icon
-    if data.alliance.id == 1 then
+    local color, icon, allianceName
+    if data.alliance.id == ALLIANCE_ALDMERI_DOMINION then
         --color = 'F1FF77'
         icon = 'esoui/art/guild/guildbanner_icon_aldmeri.dds'
-    elseif data.alliance.id == 2 then
+        allianceName = zo_strformat(SI_ALLIANCE_NAME, GetAllianceName(ALLIANCE_ALDMERI_DOMINION))
+    elseif data.alliance.id == ALLIANCE_EBONHEART_PACT then
         --color = 'FF7D77'
         icon = 'esoui/art/guild/guildbanner_icon_ebonheart.dds'
-    elseif data.alliance.id == 3 then
+        allianceName = zo_strformat(SI_ALLIANCE_NAME, GetAllianceName(ALLIANCE_EBONHEART_PACT))
+    elseif data.alliance.id == ALLIANCE_DAGGERFALL_COVENANT then
         --color = '779CFF'
         icon = 'esoui/Art/guild/guildbanner_icon_daggerfall.dds'
+        allianceName = zo_strformat(SI_ALLIANCE_NAME, GetAllianceName(ALLIANCE_DAGGERFALL_COVENANT))
     end
     --control.alliance:SetText("|c"..color.."|t20:30:" .. icon .. "|t|r ".. data.alliance.name)
-    control.alliance:SetText("|t30:30:" .. icon .. "|t ".. data.alliance.name)
+    control.alliance:SetText("|t30:30:" .. icon .. "|t ".. allianceName)

     control.riding = GetControl(control, "Riding")
     local riding = '|t20:20:esoui/art/mounts/ridingskill_speed.dds|t' .. string.format("%02d%%", data.riding.speed) ..
@@ -80,10 +84,12 @@ function LeoAltholicBioList:ColorRow(control, data, mouseIsOver)

     for i = 1, control:GetNumChildren() do
         local child = control:GetChild(i)
-        if data.name == LeoAltholic.CharName then
-            child:SetColor(r, g, b)
-        else
-            child:SetColor(color:UnpackRGBA())
+        if child then
+            if data.name == LeoAltholic.CharName then
+                child:SetColor(r, g, b)
+            else
+                child:SetColor(color:UnpackRGBA())
+            end
         end
     end
 end
@@ -97,8 +103,11 @@ function LeoAltholicBioList:BuildMasterList()
             level = v.bio.level,
             championPoints = v.bio.championPoints,
             isChampion = v.bio.isChampion,
+            gender = v.bio.gender,
             race = v.bio.race,
+            raceId = v.bio.raceId,
             class = v.bio.class,
+            classId = v.bio.classId,
             alliance = v.bio.alliance,
             riding = v.attributes.riding
         }
diff --git a/ui/inventory.lua b/ui/inventory.lua
index 78e2d1f..05272ce 100644
--- a/ui/inventory.lua
+++ b/ui/inventory.lua
@@ -77,10 +77,12 @@ function LeoAltholicStatsList:ColorRow(control, data, mouseIsOver)

     for i = 1, control:GetNumChildren() do
         local child = control:GetChild(i)
-        if data.name == LeoAltholic.CharName then
-            child:SetColor(r, g, b)
-        else
-            child:SetColor(color:UnpackRGBA())
+        if child then
+            if data.name == LeoAltholic.CharName then
+                child:SetColor(r, g, b)
+            else
+                child:SetColor(color:UnpackRGBA())
+            end
         end
     end
 end
diff --git a/ui/research.lua b/ui/research.lua
index 5ee0517..1ec01f2 100644
--- a/ui/research.lua
+++ b/ui/research.lua
@@ -172,19 +172,21 @@ function LeoAltholicUI:updateResearch()
     for i = 1, control:GetNumChildren() do
         for j = 2, 5 do
             local child = control:GetChild(i):GetChild(j)
-            local color = '|c21A121'
-            if child.timerData.researching < child.timerData.max then
-                color = '|cCB110E'
-            end
-            local output = color .. child.timerData.researching .. '/' .. child.timerData.max .. '|r'
-            color = '|cFFFFFF'
-            if child.timerData.lowest <= 3600 then
-                color = '|cFFFF00'
-            end
-            if child.timerData.showLowest then
-                output = output .. " " .. color..LeoAltholic.GetTime(child.timerData.lowestTraitData - GetTimeStamp()) .. '|r'
+            if child and child.timerData then
+                local color = '|c21A121'
+                if child.timerData.researching < child.timerData.max then
+                    color = '|cCB110E'
+                end
+                local output = color .. child.timerData.researching .. '/' .. child.timerData.max .. '|r'
+                color = '|cFFFFFF'
+                if child.timerData.lowest <= 3600 then
+                    color = '|cFFFF00'
+                end
+                if child.timerData.showLowest then
+                    output = output .. " " .. color..LeoAltholic.GetTime(child.timerData.lowestTraitData - GetTimeStamp()) .. '|r'
+                end
+                child:SetText(output)
             end
-            child:SetText(output)
         end
     end
 end
diff --git a/ui/skills.lua b/ui/skills.lua
index 74a9fc9..f43203b 100644
--- a/ui/skills.lua
+++ b/ui/skills.lua
@@ -35,30 +35,65 @@ function LeoAltholicSkillsList:SetupEntry(control, data)
         if data.skills.craft[i] then
             control.craft[i]:SetText(data.skills.craft[i].rank)
             control.craft[i].number = tonumber(data.skills.craft[i].rank)
+            control.craft[i].tooltip = {
+                name = data.skills.craft[i].name,
+                rank = data.skills.craft[i].rank,
+                id = data.skills.craft[i].id,
+                list = {}
+            }
+            for k, skill in ipairs(data.skills.craft[i].list) do
+                if data.skills.craft[i].list[k].level == nil or data.skills.craft[i].list[k].level > 0 then
+                    table.insert(control.craft[i].tooltip.list, data.skills.craft[i].list[k].name)
+                end
+            end
         else
             control.craft[i]:SetText("-")
             control.craft[i].number = tonumber(0)
         end
         control.craft[i].max = tonumber(50)
     end
+
     control.armor = {}
     for i = 1, 3 do
         control.armor[i] = GetControl(control, "Armor"..i)
         if data.skills.armor[i] then
             control.armor[i]:SetText(data.skills.armor[i].rank)
             control.armor[i].number = tonumber(data.skills.armor[i].rank)
+            control.armor[i].tooltip = {
+                name = data.skills.armor[i].name,
+                rank = data.skills.armor[i].rank,
+                id = data.skills.armor[i].id,
+                list = {}
+            }
+            for k, skill in ipairs(data.skills.armor[i].list) do
+                if data.skills.armor[i].list[k].level == nil or data.skills.armor[i].list[k].level > 0 then
+                    table.insert(control.armor[i].tooltip.list, data.skills.armor[i].list[k].name)
+                end
+            end
         else
             control.armor[i]:SetText("-")
             control.armor[i].number = tonumber(0)
         end
         control.armor[i].max = tonumber(50)
     end
+
     control.weapon = {}
     for i = 1, 6 do
         control.weapon[i] = GetControl(control, "Weapon"..i)
         if data.skills.weapon[i] then
             control.weapon[i]:SetText(data.skills.weapon[i].rank)
             control.weapon[i].number = tonumber(data.skills.weapon[i].rank)
+            control.weapon[i].tooltip = {
+                name = data.skills.weapon[i].name,
+                rank = data.skills.weapon[i].rank,
+                id = data.skills.weapon[i].id,
+                list = {}
+            }
+            for k, skill in ipairs(data.skills.weapon[i].list) do
+                if data.skills.weapon[i].list[k].level == nil or data.skills.weapon[i].list[k].level > 0 then
+                    table.insert(control.weapon[i].tooltip.list, data.skills.weapon[i].list[k].name)
+                end
+            end
         else
             control.weapon[i]:SetText("-")
             control.weapon[i].number = tonumber(0)
@@ -72,6 +107,17 @@ function LeoAltholicSkillsList:SetupEntry(control, data)
         if data.skills.class[i] then
             control.class[i]:SetText(data.skills.class[i].rank)
             control.class[i].number = tonumber(data.skills.class[i].rank)
+            control.class[i].tooltip = {
+                name = data.skills.class[i].name,
+                rank = data.skills.class[i].rank,
+                id = data.skills.class[i].id,
+                list = {}
+            }
+            for k, skill in ipairs(data.skills.class[i].list) do
+                if data.skills.class[i].list[k].level == nil or data.skills.class[i].list[k].level > 0 then
+                    table.insert(control.class[i].tooltip.list, data.skills.class[i].list[k].name)
+                end
+            end
         else
             control.class[i]:SetText("-")
             control.class[i].number = tonumber(0)
@@ -83,12 +129,25 @@ function LeoAltholicSkillsList:SetupEntry(control, data)
     if data.skills.racial[1] then
         control.racial:SetText(data.skills.racial[1].rank)
         control.racial.number = tonumber(data.skills.racial[1].rank)
+        control.racial.tooltip = {
+            name = data.skills.racial[1].name,
+            rank = data.skills.racial[1].rank,
+            list = {}
+        }
+        if data.skills.racial[1].list then
+            for k, skill in ipairs(data.skills.racial[1].list) do
+                if data.skills.racial[1].list[k].level == nil or data.skills.racial[1].list[k].level > 0 then
+                    table.insert(control.racial.tooltip.list, data.skills.racial[1].list[k].name)
+                end
+            end
+        end
     else
         control.racial:SetText("-")
         control.racial.number = tonumber(0)
     end
     control.racial.max = tonumber(50)

+
     ZO_SortFilterList.SetupRow(self, control, data)
 end

@@ -99,22 +158,24 @@ function LeoAltholicSkillsList:ColorRow(control, data, mouseIsOver)

     for i = 1, control:GetNumChildren() do
         local child = control:GetChild(i)
-        if child:GetType() == CT_LABEL and string.find(child:GetName(), 'Name$') then
-            if data.name == LeoAltholic.CharName then
-                child:SetColor(r, g, b)
-            else
-                child:SetColor(color:UnpackRGBA())
+        if child then
+            if child:GetType() == CT_LABEL and child:GetName() and string.find(child:GetName(), 'Name$') then
+                if data.name == LeoAltholic.CharName then
+                    child:SetColor(r, g, b)
+                else
+                    child:SetColor(color:UnpackRGBA())
+                end
             end
-        end
-        if not child.nonRecolorable and child.number ~= nil then
-            if child.number == child.max then
-                child:SetColor(0, 1, 0, 1)
-            elseif child.number > child.max * 0.8 then
-                child:SetColor(1, 1, 0, 1)
-            elseif child.number > child.max * 0.1 then
-                child:SetColor(color:UnpackRGBA())
-            else
-                child:SetColor(1, 0, 0, 1)
+            if not child.nonRecolorable and child.number ~= nil then
+                if child.number == child.max then
+                    child:SetColor(0, 1, 0, 1)
+                elseif child.number > child.max * 0.8 then
+                    child:SetColor(1, 1, 0, 1)
+                elseif child.number > child.max * 0.1 then
+                    child:SetColor(color:UnpackRGBA())
+                else
+                    child:SetColor(1, 0, 0, 1)
+                end
             end
         end
     end
@@ -146,3 +207,38 @@ function LeoAltholicSkillsList:FilterScrollList()
         table.insert(scrollData, ZO_ScrollList_CreateDataEntry(1, data))
     end
 end
+
+local function addLine(tooltip, text, color)
+    if not color then color = ZO_SELECTED_TEXT end
+    local r, g, b = color:UnpackRGB()
+    tooltip:AddLine(text, "", r, g, b, CENTER, MODIFY_TEXT_TYPE_NONE, TEXT_ALIGN_LEFT, true)
+end
+
+local function addLineTitle(tooltip, text, color)
+    if not color then color = ZO_TOOLTIP_DEFAULT_COLOR end
+    local r, g, b = color:UnpackRGB()
+    tooltip:AddLine(text, "ZoFontHeader3", r, g, b, CENTER, MODIFY_TEXT_TYPE_NONE, TEXT_ALIGN_CENTER, true)
+end
+
+function LeoAltholicUI.TooltipSkill(control, visible)
+
+    if visible and control.tooltip and control.tooltip.name then
+        if not parent then parent = control end
+
+        InitializeTooltip(InformationTooltip, control, LEFT, 5, 0)
+
+        local title = control.tooltip.name
+        if  control.tooltip.rank then
+            title = title  .." - ".. control.tooltip.rank
+        end
+        addLineTitle(InformationTooltip, title)
+
+        for _, skill in pairs(control.tooltip.list) do
+            addLine(InformationTooltip, skill)
+        end
+        InformationTooltip:SetHidden(false)
+    else
+        ClearTooltip(InformationTooltip)
+        InformationTooltip:SetHidden(true)
+    end
+end
diff --git a/ui/skills2.lua b/ui/skills2.lua
index 7da50fe..4c9d30b 100644
--- a/ui/skills2.lua
+++ b/ui/skills2.lua
@@ -35,6 +35,17 @@ function LeoAltholicSkills2List:SetupEntry(control, data)
         if data.skills.world[i] then
             control.world[i]:SetText(data.skills.world[i].rank)
             control.world[i].number = tonumber(data.skills.world[i].rank)
+            control.world[i].tooltip = {
+                name = data.skills.world[i].name,
+                rank = data.skills.world[i].rank,
+                id = data.skills.world[i].id,
+                list = {}
+            }
+            for k, skill in ipairs(data.skills.world[i].list) do
+                if data.skills.world[i].list[k].level == nil or data.skills.world[i].list[k].level > 0 then
+                    table.insert(control.world[i].tooltip.list, data.skills.world[i].list[k].name)
+                end
+            end
         else
             control.world[i]:SetText("-")
             control.world[i].number = tonumber(0)
@@ -47,6 +58,17 @@ function LeoAltholicSkills2List:SetupEntry(control, data)
         if data.skills.guild[i] then
             control.guild[i]:SetText(data.skills.guild[i].rank)
             control.guild[i].number = tonumber(data.skills.guild[i].rank)
+            control.guild[i].tooltip = {
+                name = data.skills.guild[i].name,
+                rank = data.skills.guild[i].rank,
+                id = data.skills.guild[i].id,
+                list = {}
+            }
+            for k, skill in ipairs(data.skills.guild[i].list) do
+                if data.skills.guild[i].list[k].level == nil or data.skills.guild[i].list[k].level > 0 then
+                    table.insert(control.guild[i].tooltip.list, data.skills.guild[i].list[k].name)
+                end
+            end
         else
             control.guild[i]:SetText("-")
             control.guild[i].number = tonumber(0)
@@ -60,6 +82,17 @@ function LeoAltholicSkills2List:SetupEntry(control, data)
         if data.skills.ava[i] then
             control.ava[i]:SetText(data.skills.ava[i].rank)
             control.ava[i].number = tonumber(data.skills.ava[i].rank)
+            control.ava[i].tooltip = {
+                name = data.skills.ava[i].name,
+                rank = data.skills.ava[i].rank,
+                id = data.skills.ava[i].id,
+                list = {}
+            }
+            for k, skill in ipairs(data.skills.ava[i].list) do
+                if data.skills.ava[i].list[k].level == nil or data.skills.ava[i].list[k].level > 0 then
+                    table.insert(control.ava[i].tooltip.list, data.skills.ava[i].list[k].name)
+                end
+            end
         else
             control.ava[i]:SetText("-")
             control.ava[i].number = tonumber(0)
@@ -77,22 +110,24 @@ function LeoAltholicSkills2List:ColorRow(control, data, mouseIsOver)

     for i = 1, control:GetNumChildren() do
         local child = control:GetChild(i)
-        if child:GetType() == CT_LABEL and string.find(child:GetName(), 'Name$') then
-            if data.name == LeoAltholic.CharName then
-                child:SetColor(r, g, b)
-            else
-                child:SetColor(color:UnpackRGBA())
+        if child then
+            if child:GetType() == CT_LABEL and string.find(child:GetName(), 'Name$') then
+                if data.name == LeoAltholic.CharName then
+                    child:SetColor(r, g, b)
+                else
+                    child:SetColor(color:UnpackRGBA())
+                end
             end
-        end
-        if not child.nonRecolorable and child.number ~= nil then
-            if child.number == child.max then
-                child:SetColor(0, 1, 0, 1)
-            elseif child.number > child.max * 0.8 then
-                child:SetColor(1, 1, 0, 1)
-            elseif child.number > child.max * 0.1 then
-                child:SetColor(color:UnpackRGBA())
-            else
-                child:SetColor(1, 0, 0, 1)
+            if not child.nonRecolorable and child.number ~= nil then
+                if child.number == child.max then
+                    child:SetColor(0, 1, 0, 1)
+                elseif child.number > child.max * 0.8 then
+                    child:SetColor(1, 1, 0, 1)
+                elseif child.number > child.max * 0.1 then
+                    child:SetColor(color:UnpackRGBA())
+                else
+                    child:SetColor(1, 0, 0, 1)
+                end
             end
         end
     end