New layout, de/jp translation

Leandro Silva [10-18-18 - 00:20]
New layout, de/jp translation
Filename
Lang/jp.lua
LeoAltholic.lua
LeoAltholic.txt
LeoAltholic.xml
LeoAltholicInit.lua
LeoAltholicUI.lua
ui/bio.lua
ui/champion.lua
ui/inventory.lua
ui/research.lua
ui/skills.lua
ui/skills2.lua
ui/stats.lua
ui/tracked.lua
ui/writs.lua
diff --git a/Lang/jp.lua b/Lang/jp.lua
index 7a59e4d..51e3602 100644
--- a/Lang/jp.lua
+++ b/Lang/jp.lua
@@ -1,34 +1,34 @@

-ZO_CreateStringId("LEOALT_D",      "d") -- day
-ZO_CreateStringId("LEOALT_H",      "h") -- hour
-ZO_CreateStringId("LEOALT_M",      "m") -- minute
-ZO_CreateStringId("LEOALT_S",      "s") -- second
-ZO_CreateStringId("LEOALT_FINISHED",      "finished")
-ZO_CreateStringId("LEOALT_UNLOCKED",      "unlocked")
-ZO_CreateStringId("LEOALT_REMOVED_FROM",      "Removed <<1>> from <<2>>.")
-ZO_CreateStringId("LEOALT_MINUTES_AGO",      "<<1[%d minute ago/%d minutes ago]>>")
-ZO_CreateStringId("LEOALT_HOURS_AGO",      "<<1[%d hour ago/%d hours ago]>>")
-ZO_CreateStringId("LEOALT_DAYS_AGO",      "<<1[Yesterday/%d days ago]>>")
-ZO_CreateStringId("LEOALT_NOT_DONE_TODAY",      "not done today")
-ZO_CreateStringId("LEOALT_MOUNT_FINISHED",      "<<C:1>> has finished a mount training.")
-ZO_CreateStringId("LEOALT_RESEARCH_FINISHED",      "<<C:1>> has finished a research")
-ZO_CreateStringId("LEOALT_TRACK_ONLY_DAILY",      "Only daily quests can be tracked.")
-ZO_CreateStringId("LEOALT_QUEST_ALREADY_TRACKED", "Quest <<1>> is already being tracked.")
-ZO_CreateStringId("LEOALT_TRACKING", "Tracking")
-ZO_CreateStringId("LEOALT_QUEST_DONE_TODAY", "Quest <<1>> done for today.")
-ZO_CreateStringId("LEOALT_TRACKED_QUESTS", "Tracked Quests")
-ZO_CreateStringId("LEOALT_AUTO_TRACK_WRIT", "Automatically track started daily crafting quests")
-ZO_CreateStringId("LEOALT_AUTO_TRACK_DAILY", "Automatically track started daily quests")
-ZO_CreateStringId("LEOALT_COMPLETED_RESEARCH", "Completed Research")
-ZO_CreateStringId("LEOALT_CHAT_ALL", "Chat message for all characters")
-ZO_CreateStringId("LEOALT_CHAT_ALL_TOOLTIP", "Display a chat message whenever a research is completed for a character")
-ZO_CreateStringId("LEOALT_CENTERSCREEN_CURRENT", "Center Screen message for current character")
-ZO_CreateStringId("LEOALT_CENTERSCREEN_CURRENT_TOOLTIP", "Display a center screen message whenever a research is completed for current character")
+ZO_CreateStringId("LEOALT_D",      "日") -- 日
+ZO_CreateStringId("LEOALT_H",      "時間") -- 時間
+ZO_CreateStringId("LEOALT_M",      "分") -- 分
+ZO_CreateStringId("LEOALT_S",      "秒") -- 秒
+ZO_CreateStringId("LEOALT_FINISHED",      "完了")
+ZO_CreateStringId("LEOALT_UNLOCKED",      "ロックを外す")
+ZO_CreateStringId("LEOALT_REMOVED_FROM",      "削除 <<1>> から <<2>>.")
+ZO_CreateStringId("LEOALT_MINUTES_AGO",      "<<1[%d 分 前/%d 分 前]>>")
+ZO_CreateStringId("LEOALT_HOURS_AGO",      "<<1[%d 時間 前/%d 時間 前]>>")
+ZO_CreateStringId("LEOALT_DAYS_AGO",      "<<1[昨日/%d 日 前]>>")
+ZO_CreateStringId("LEOALT_NOT_DONE_TODAY",      "今日は行ってない")
+ZO_CreateStringId("LEOALT_MOUNT_FINISHED",      "<<C:1>> マウントトレーニングを終了しました")
+ZO_CreateStringId("LEOALT_RESEARCH_FINISHED",      "<<C:1>> 研究を終了しました")
+ZO_CreateStringId("LEOALT_TRACK_ONLY_DAILY",      "デイリークエストのみ追跡")
+ZO_CreateStringId("LEOALT_QUEST_ALREADY_TRACKED", "クエスト <<1>> は既に追跡されています.")
+ZO_CreateStringId("LEOALT_TRACKING", "追跡")
+ZO_CreateStringId("LEOALT_QUEST_DONE_TODAY", "クエスト <<1>> は今日行う.")
+ZO_CreateStringId("LEOALT_TRACKED_QUESTS", "追跡されたクエスト")
+ZO_CreateStringId("LEOALT_AUTO_TRACK_WRIT", "デイリークラフトクエストを自動で追跡を始める")
+ZO_CreateStringId("LEOALT_AUTO_TRACK_DAILY", "デイリークエストを自動で追跡を始める")
+ZO_CreateStringId("LEOALT_COMPLETED_RESEARCH", "検索を完了しました")
+ZO_CreateStringId("LEOALT_CHAT_ALL", "全てのキャラクタをチャットメッセージ")
+ZO_CreateStringId("LEOALT_CHAT_ALL_TOOLTIP", "キャラクターの研究が完了するたびにチャットメッセージを表示する")
+ZO_CreateStringId("LEOALT_CENTERSCREEN_CURRENT", "現在のキャラクタの中央画面にメッセージ")
+ZO_CreateStringId("LEOALT_CENTERSCREEN_CURRENT_TOOLTIP", "現在のキャラクターの研究が終了するたびに中央画面にメッセージを表示する")

-ZO_CreateStringId("LEOALT_PLAYED", "Played")
-ZO_CreateStringId("LEOALT_RIDING", "Riding")
-ZO_CreateStringId("LEOALT_MAXIMUM", "Maximum")
-ZO_CreateStringId("LEOALT_RECOVERY", "Recovery")
+ZO_CreateStringId("LEOALT_PLAYED", "プレイ")
+ZO_CreateStringId("LEOALT_RIDING", "乗る")
+ZO_CreateStringId("LEOALT_MAXIMUM", "最大")
+ZO_CreateStringId("LEOALT_RECOVERY", "回復")

 ZO_CreateStringId("LEOALT_WRIT", "依頼を調べる")
 ZO_CreateStringId("LEOALT_ALCHEMIST", "錬金術")
@@ -39,5 +39,5 @@ ZO_CreateStringId("LEOALT_JEWELRY", "Jewelry")
 ZO_CreateStringId("LEOALT_PROVISIONER", "調理")
 ZO_CreateStringId("LEOALT_WOODWORKER", "木工")

-ZO_CreateStringId('SI_BINDING_NAME_LEOALTHOLIC_TOGGLE_WINDOW', "Show/Hide Main Window")
-ZO_CreateStringId('SI_BINDING_NAME_LEOALTHOLIC_TRACK_QUEST', "Track Daily Quest")
+ZO_CreateStringId('SI_BINDING_NAME_LEOALTHOLIC_TOGGLE_WINDOW', "表示/非表示 メイン 画面")
+ZO_CreateStringId('SI_BINDING_NAME_LEOALTHOLIC_TRACK_QUEST', "デイリークエストを追跡")
diff --git a/LeoAltholic.lua b/LeoAltholic.lua
index 98cd416..390d32e 100644
--- a/LeoAltholic.lua
+++ b/LeoAltholic.lua
@@ -1,10 +1,4 @@

-LeoAltholic = {}
-LeoAltholic.name = "LeoAltholic"
-LeoAltholic.displayName = "Leo's Altholic"
-LeoAltholic.version = "1.2.5"
-LeoAltholic.chatPrefix = "|c39B027" .. LeoAltholic.name .. "|r: "
-
 LeoAltholic.timerQueue = {}
 LeoAltholic.charList = {}
 LeoAltholic.myself = nil
@@ -13,7 +7,7 @@ LeoAltholic.initialized = false

 LeoAltholic.maxTraits = select(3,GetSmithingResearchLineInfo(1,1))
 LeoAltholic.jewelryMaxTraits = select(3,GetSmithingResearchLineInfo(7,1))
-LeoAltholic.panelList = { "Bio", "Stats", "Skills", "Champion", "Tracked", "Daily", "Inventory", "Research" }
+LeoAltholic.panelList = { "Bio", "Stats", "Skills", "Skills2", "Champion", "Tracked", "Writs", "Inventory", "Research" }
 LeoAltholic.craftResearch = {CRAFTING_TYPE_BLACKSMITHING,CRAFTING_TYPE_CLOTHIER,CRAFTING_TYPE_WOODWORKING,CRAFTING_TYPE_JEWELRYCRAFTING}

 local function loadPlayerDataPart(skillType, baseElem)
@@ -87,7 +81,8 @@ local function createQuestEntry(questId)
         instanceDisplayType = instanceDisplayType,
         location = locationInfo,
         repeatType = repeatType,
-        isDaily = repeatType == QUEST_REPEAT_DAILY
+        isDaily = repeatType == QUEST_REPEAT_DAILY,
+        isCrafting = questType == QUEST_TYPE_CRAFTING
     }
     return quest
 end
@@ -121,7 +116,8 @@ local function initCharsList()
         bio = {},
         quests = {
             actives = {},
-            tracked = {}
+            tracked = {},
+            writs = {}
         }
     }

@@ -390,11 +386,13 @@ local function initCharsList()
     if char.quests == nil or char.quests.tracked == nil then
         char.quests = {
             actives = {},
-            tracked = {}
+            tracked = {},
+            writs = {}
         }
     else
         char.quests.actives = {}
     end
+    if char.quests.writs == nil then char.quests.writs = {} end

     local n = 0
     for i = 1, MAX_JOURNAL_QUESTS do
@@ -409,11 +407,44 @@ local function initCharsList()
     LeoAltholic.savedVariables.CharList[LeoAltholic.CharName] = char
 end

+function LeoAltholic.GetCraftFromQuest(questName)
+    if not string.find(zo_strformat("<<z:1>>",questName), zo_strformat("<<z:1>>",GetString(LEOALT_WRIT))) then return nil end
+
+    if string.find(zo_strformat("<<z:1>>",questName), zo_strformat("<<z:1>>",GetString(LEOALT_ALCHEMIST))) then return CRAFTING_TYPE_ALCHEMY end
+    if string.find(zo_strformat("<<z:1>>",questName), zo_strformat("<<z:1>>",GetString(LEOALT_BLACKSMITH))) then return CRAFTING_TYPE_BLACKSMITHING end
+    if string.find(zo_strformat("<<z:1>>",questName), zo_strformat("<<z:1>>",GetString(LEOALT_CLOTHIER))) then return CRAFTING_TYPE_CLOTHIER end
+    if string.find(zo_strformat("<<z:1>>",questName), zo_strformat("<<z:1>>",GetString(LEOALT_ENCHANTER))) then return CRAFTING_TYPE_ENCHANTING end
+    if string.find(zo_strformat("<<z:1>>",questName), zo_strformat("<<z:1>>",GetString(LEOALT_JEWELRY))) then return CRAFTING_TYPE_JEWELRYCRAFTING end
+    if string.find(zo_strformat("<<z:1>>",questName), zo_strformat("<<z:1>>",GetString(LEOALT_PROVISIONER))) then return CRAFTING_TYPE_PROVISIONING end
+    if string.find(zo_strformat("<<z:1>>",questName), zo_strformat("<<z:1>>",GetString(LEOALT_WOODWORKER))) then return CRAFTING_TYPE_WOODWORKING end
+
+    return nil
+end
+
 local function fixTrackedQuest()
     for trackedId, trackedQuest in pairs(LeoAltholic.savedVariables.CharList[LeoAltholic.CharName].quests.tracked) do
         if trackedQuest.questType == nil then
             LeoAltholic.savedVariables.CharList[LeoAltholic.CharName].quests.tracked[trackedId] = nil
         end
+        if trackedQuest.questType == QUEST_TYPE_CRAFTING then
+            local craft = LeoAltholic.GetCraftFromQuest(trackedQuest.name)
+            if craft ~= nil then
+                LeoAltholic.savedVariables.CharList[LeoAltholic.CharName].quests.writs[craft] = trackedQuest
+            end
+            LeoAltholic.savedVariables.CharList[LeoAltholic.CharName].quests.tracked[trackedId] = nil
+        end
+    end
+    for _, char in pairs(LeoAltholic.GetCharacters()) do
+        for trackedId, trackedQuest in pairs(char.quests.tracked) do
+            if trackedQuest.questType == QUEST_TYPE_CRAFTING then
+                local craft = LeoAltholic.GetCraftFromQuest(trackedQuest.name)
+                if craft ~= nil then
+                    if char.quests.writs == nil then char.quests.writs = {} end
+                    char.quests.writs[craft] = trackedQuest
+                end
+                char.quests.tracked[trackedId] = nil
+            end
+        end
     end
 end

@@ -546,6 +577,22 @@ function LeoAltholic.GetCharacters()
     return LeoAltholic.charList
 end

+function LeoAltholic.ExportCharacters()
+    if #LeoAltholic.charList == 0 then
+        LeoAltholic.GetCharacters()
+    end
+    local chars = copy(LeoAltholic.charList)
+    return chars
+end
+
+function LeoAltholic.GetCharByName(name)
+    local chars = LeoAltholic.ExportCharacters()
+    for k, v in pairs(chars) do
+        if v.bio.name == name then return v end
+    end
+    return nil
+end
+
 function LeoAltholic.GetItems(char, bagId)
     local itemLines =  {}
     local i = 1
@@ -710,8 +757,14 @@ local function trackQuest(questId, automatically)
         end
         return
     end
+    local lookInto
     local quest = createQuestEntry(questId)
-    for _,trackedQuest in pairs(LeoAltholic.savedVariables.CharList[LeoAltholic.CharName].quests.tracked) do
+    if quest.isCrafting then
+        lookInto = LeoAltholic.savedVariables.CharList[LeoAltholic.CharName].quests.writs
+    else
+        lookInto = LeoAltholic.savedVariables.CharList[LeoAltholic.CharName].quests.tracked
+    end
+    for _,trackedQuest in pairs(lookInto) do
         if (trackedQuest.name == quest.name) then
             if automatically ~= true then
                 LeoAltholic.log(zo_strformat(GetString(LEOALT_QUEST_ALREADY_TRACKED), quest.name))
@@ -720,7 +773,7 @@ local function trackQuest(questId, automatically)
         end
     end
     quest.lastDone = nil
-    table.insert(LeoAltholic.savedVariables.CharList[LeoAltholic.CharName].quests.tracked, quest)
+    table.insert(lookInto, quest)
     LeoAltholic.log(GetString(LEOALT_TRACKING) .. " " .. quest.name .. "...")
 end

@@ -733,6 +786,13 @@ local function onQuestAdded(eventCode, journalIndex, questName, objectiveName)
 end

 local function onQuestComplete(eventCode, questName, level, previousExperience, currentExperience, rank, previousPoints, currentPoints)
+    for _,trackedQuest in pairs(LeoAltholic.savedVariables.CharList[LeoAltholic.CharName].quests.writs) do
+        if (trackedQuest.name == questName) then
+            trackedQuest.lastDone = GetTimeStamp()
+            LeoAltholic.log(zo_strformat(GetString(LEOALT_QUEST_DONE_TODAY), questName))
+            return
+        end
+    end
     for _,trackedQuest in pairs(LeoAltholic.savedVariables.CharList[LeoAltholic.CharName].quests.tracked) do
         if (trackedQuest.name == questName) then
             trackedQuest.lastDone = GetTimeStamp()
@@ -780,8 +840,9 @@ local function initialize()

     initCharsList()
     fixTrackedQuest()
-    LeoAltholic.InitializeCharacterFrames()
-    LeoAltholic.DisplayCharacterFrames()
+    LeoAltholicUI.InitPanels()
+    --LeoAltholic.InitializeCharacterFrames()
+    --LeoAltholic.DisplayCharacterFrames()
     createMessageQueue()

     local keybindStripDescriptor = {
@@ -879,7 +940,7 @@ local function onAddOnLoaded(event, addonName)
     EVENT_MANAGER:RegisterForEvent(LeoAltholic.name, EVENT_PLAYER_DEACTIVATED, onPlayerDeactivated)
     EVENT_MANAGER:RegisterForEvent(LeoAltholic.name, EVENT_QUEST_COMPLETE, onQuestComplete)
     EVENT_MANAGER:RegisterForEvent(LeoAltholic.name, EVENT_QUEST_ADDED, onQuestAdded)
-    EVENT_MANAGER:RegisterForUpdate(LeoAltholic.name, 5000, onUpdate)
+    --EVENT_MANAGER:RegisterForUpdate(LeoAltholic.name, 5000, onUpdate)
     EVENT_MANAGER:RegisterForEvent(LeoAltholic.name, EVENT_NEW_MOVEMENT_IN_UI_MODE, onNewMovementInUIMode)
     CHAMPION_PERKS_SCENE:RegisterCallback('StateChange', onChampionPerksSceneStateChange)

diff --git a/LeoAltholic.txt b/LeoAltholic.txt
index 08398da..298c99a 100644
--- a/LeoAltholic.txt
+++ b/LeoAltholic.txt
@@ -1,6 +1,6 @@
 ## Title: Leo's Altholic
 ## APIVersion: 100024 100025
-## Version: 1.2.5
+## Version: 1.3.0
 ## Author: |c39B027@LeandroSilva|r
 ## SavedVariables: LeoAltholicSavedVariables
 ## OptionalDependsOn: LibStub LibFeedback LibAddonMenu-2.0
@@ -27,6 +27,16 @@ Lang\en.lua
 Lang\$(language).lua

 LeoAltholic.xml
+LeoAltholicInit.lua
+ui/bio.lua
+ui/stats.lua
+ui/champion.lua
+ui/skills.lua
+ui/skills2.lua
+ui/tracked.lua
+ui/writs.lua
+ui/inventory.lua
+ui/research.lua
 LeoAltholic.lua
 LeoAltholicUI.lua
 Settings.lua
diff --git a/LeoAltholic.xml b/LeoAltholic.xml
index 11ef5b8..96b758a 100644
--- a/LeoAltholic.xml
+++ b/LeoAltholic.xml
@@ -1,8 +1,12 @@
 <GuiXml>
+    <Font name="LeoAltholicLargeFont" font="$(MEDIUM_FONT)|18|soft-shadow-thin"/>
+    <Font name="LeoAltholicNormalFont" font="$(MEDIUM_FONT)|16|soft-shadow-thin"/>
+    <Font name="LeoAltholicSmallFont" font="$(MEDIUM_FONT)|14|soft-shadow-thin"/>
+    <Font name="LeoAltholicExtraSmallFont" font="$(MEDIUM_FONT)|12|soft-shadow-thin"/>
     <Controls>

         <TopLevelControl name="LeoAltholicWindow" mouseEnabled="true" movable="true" hidden="true" clampedToScreen="true">
-            <Dimensions x="900" y="700" />
+            <Dimensions x="1000" y="700" />
             <Anchor point="TOP" relativeTo="GuiRoot" relativePoint="CENTER" offsetY="100" />

             <OnMoveStop> LeoAltholic:OnWindowMoveStop() </OnMoveStop>
@@ -10,255 +14,673 @@
             <Controls>
                 <Backdrop name="$(parent)BG" centerColor="000000" edgeColor="222222">
                     <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="$(parent)"/>
-                    <Dimensions x="900" y="50"/>
-                    <Edge edgeSize="1"/>
-                </Backdrop>
-                <Backdrop name="$(parent)HeaderBG" centerColor="111111" edgeColor="222222">
-                    <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="$(parent)" offsetX="8" offsetY="5"/>
-                    <Dimensions x="390" y="40"/>
+                    <Dimensions x="1000" y="50"/>
                     <Edge edgeSize="1"/>
                 </Backdrop>
                 <Label name="$(parent)Title" color="39B027" font="ZoFontWinH3" wrapMode="ELLIPSIS"
                        verticalAlignment="CENTER" mouseEnabled="true">
                     <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="16" offsetY="10"/>
                 </Label>
-
-                <Button name="$(parent)BioButton" clickSound="Click">
-                    <Anchor point="TOPRIGHT" relativePoint="TOPRIGHT" relativeTo="$(parent)HeaderBG" offsetX="47" />
+                <Button name="$(parent)Close" clickSound="Click">
+                    <Anchor point="TOPRIGHT" relativePoint="TOPRIGHT" relativeTo="$(parent)" offsetX="-5" offsetY="4"/>
                     <Dimensions x="40" y="40"/>
-                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Bio')</OnMouseEnter>
-                    <OnMouseExit>ZO_Tooltips_HideTextTooltip()</OnMouseExit>
-                    <OnClicked>LeoAltholic.ShowTab("Bio")</OnClicked>
+                    <OnClicked>LeoAltholic:HideUI()</OnClicked>
                     <Controls>
                         <Backdrop name="$(parent)BG" centerColor="101010" edgeColor="202020">
                             <AnchorFill/>
                             <Edge edgeSize="1"/>
                         </Backdrop>
-                        <Texture name="$(parent)Texture" textureFile="esoui/art/mainmenu/menubar_character_up.dds">
-                            <Dimensions y="35" x="35"/>
+                        <Texture name="$(parent)Texture" textureFile="esoui/art/buttons/decline_up.dds">
+                            <Dimensions y="25" x="25"/>
                             <Anchor point="128"/>
                         </Texture>
                     </Controls>
                 </Button>
-                <Button name="$(parent)StatsButton" clickSound="Click">
-                    <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="$(parent)BioButton" offsetX="45"/>
+                <Button name="$(parent)FeedbackButton" clickSound="Click">
+                    <Anchor point="TOPRIGHT" relativePoint="TOPLEFT" relativeTo="$(parent)Close" offsetX="-5"/>
                     <Dimensions x="40" y="40"/>
-                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Stats')</OnMouseEnter>
+                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Research')</OnMouseEnter>
                     <OnMouseExit>ZO_Tooltips_HideTextTooltip()</OnMouseExit>
-                    <OnClicked>LeoAltholic.ShowTab("Stats")</OnClicked>
                     <Controls>
                         <Backdrop name="$(parent)BG" centerColor="101010" edgeColor="202020">
                             <AnchorFill/>
                             <Edge edgeSize="1"/>
                         </Backdrop>
-                        <Texture name="$(parent)Texture" textureFile="esoui/art/characterwindow/charsheet_statstab_icon_inactive.dds">
+                    </Controls>
+                </Button>
+                <Button name="$(parent)SettingsButton" clickSound="Click">
+                    <Anchor point="TOPRIGHT" relativePoint="TOPLEFT" relativeTo="$(parent)FeedbackButton" offsetX="-5"/>
+                    <Dimensions x="40" y="40"/>
+                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Settings')</OnMouseEnter>
+                    <OnMouseExit>ZO_Tooltips_HideTextTooltip()</OnMouseExit>
+                    <OnClicked>
+                        SCENE_MANAGER:HideTopLevel(LeoAltholicInventoryWindow)
+                        SCENE_MANAGER:HideTopLevel(LeoAltholicWindow)
+                        DoCommand("/leoaltoptions")
+                    </OnClicked>
+                    <Controls>
+                        <Backdrop name="$(parent)BG" centerColor="101010" edgeColor="202020">
+                            <AnchorFill/>
+                            <Edge edgeSize="1"/>
+                        </Backdrop>
+                        <Texture name="$(parent)Texture" textureFile="esoui/art/chatwindow/chat_options_up.dds">
                             <Dimensions y="35" x="35"/>
                             <Anchor point="128"/>
                         </Texture>
                     </Controls>
                 </Button>
-                <Button name="$(parent)SkillsButton" clickSound="Click">
-                    <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="$(parent)StatsButton" offsetX="45"/>
+                <Button name="$(parent)ResearchButton" clickSound="Click">
+                    <Anchor point="TOPRIGHT" relativePoint="TOPLEFT" relativeTo="$(parent)SettingsButton" offsetX="-5"/>
                     <Dimensions x="40" y="40"/>
-                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Skills')</OnMouseEnter>
+                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Research')</OnMouseEnter>
                     <OnMouseExit>ZO_Tooltips_HideTextTooltip()</OnMouseExit>
-                    <OnClicked>LeoAltholic.ShowTab("Skills")</OnClicked>
+                    <OnClicked>LeoAltholic.ShowTab("Research")</OnClicked>
                     <Controls>
                         <Backdrop name="$(parent)BG" centerColor="101010" edgeColor="202020">
                             <AnchorFill/>
                             <Edge edgeSize="1"/>
                         </Backdrop>
-                        <Texture name="$(parent)Texture" textureFile="esoui/art/mainmenu/menubar_skills_up.dds">
+                        <Texture name="$(parent)Texture" textureFile="esoui/art/crafting/smithing_tabicon_research_up.dds">
                             <Dimensions y="35" x="35"/>
                             <Anchor point="128"/>
                         </Texture>
                     </Controls>
                 </Button>
-                <Button name="$(parent)ChampionButton" clickSound="Click">
-                    <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="$(parent)SkillsButton" offsetX="45"/>
+                <Button name="$(parent)InventoryButton" clickSound="Click">
+                    <Anchor point="TOPRIGHT" relativePoint="TOPLEFT" relativeTo="$(parent)ResearchButton" offsetX="-5"/>
                     <Dimensions x="40" y="40"/>
-                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Champion')</OnMouseEnter>
+                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Inventory')</OnMouseEnter>
                     <OnMouseExit>ZO_Tooltips_HideTextTooltip()</OnMouseExit>
-                    <OnClicked>LeoAltholic.ShowTab("Champion")</OnClicked>
+                    <OnClicked>LeoAltholic.ShowTab("Inventory")</OnClicked>
                     <Controls>
                         <Backdrop name="$(parent)BG" centerColor="101010" edgeColor="202020">
                             <AnchorFill/>
                             <Edge edgeSize="1"/>
                         </Backdrop>
-                        <Texture name="$(parent)Texture" textureFile="esoui/art/mainmenu/menubar_champion_up.dds">
+                        <Texture name="$(parent)Texture" textureFile="esoui/art/mainmenu/menubar_inventory_up.dds">
                             <Dimensions y="35" x="35"/>
                             <Anchor point="128"/>
                         </Texture>
                     </Controls>
                 </Button>
-                <Button name="$(parent)TrackedButton" clickSound="Click">
-                    <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="$(parent)ChampionButton" offsetX="45"/>
+                <Button name="$(parent)WritsButton" clickSound="Click">
+                    <Anchor point="TOPRIGHT" relativePoint="TOPLEFT" relativeTo="$(parent)InventoryButton" offsetX="-5"/>
                     <Dimensions x="40" y="40"/>
-                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Tracked Quests')</OnMouseEnter>
+                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Writs')</OnMouseEnter>
                     <OnMouseExit>ZO_Tooltips_HideTextTooltip()</OnMouseExit>
-                    <OnClicked>LeoAltholic.ShowTab("Tracked")</OnClicked>
+                    <OnClicked>LeoAltholic.ShowTab("Writs")</OnClicked>
                     <Controls>
                         <Backdrop name="$(parent)BG" centerColor="101010" edgeColor="202020">
                             <AnchorFill/>
                             <Edge edgeSize="1"/>
                         </Backdrop>
-                        <Texture name="$(parent)Texture" textureFile="esoui/art/quest/tracked_pin.dds">
+                        <Texture name="$(parent)Texture" textureFile="esoui/art/icons/achievements_indexicon_crafting_up.dds">
                             <Dimensions y="30" x="30"/>
                             <Anchor point="128"/>
                         </Texture>
                     </Controls>
                 </Button>
-                <Button name="$(parent)WritsButton" clickSound="Click">
-                    <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="$(parent)TrackedButton" offsetX="45"/>
+                <Button name="$(parent)TrackedButton" clickSound="Click">
+                    <Anchor point="TOPRIGHT" relativePoint="TOPLEFT" relativeTo="$(parent)WritsButton" offsetX="-5"/>
                     <Dimensions x="40" y="40"/>
-                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Daily')</OnMouseEnter>
+                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Tracked Quests')</OnMouseEnter>
                     <OnMouseExit>ZO_Tooltips_HideTextTooltip()</OnMouseExit>
-                    <OnClicked>LeoAltholic.ShowTab("Daily")</OnClicked>
+                    <OnClicked>LeoAltholic.ShowTab("Tracked")</OnClicked>
                     <Controls>
                         <Backdrop name="$(parent)BG" centerColor="101010" edgeColor="202020">
                             <AnchorFill/>
                             <Edge edgeSize="1"/>
                         </Backdrop>
-                        <Texture name="$(parent)Texture" textureFile="esoui/art/icons/achievements_indexicon_crafting_up.dds">
+                        <Texture name="$(parent)Texture" textureFile="esoui/art/quest/tracked_pin.dds">
                             <Dimensions y="30" x="30"/>
                             <Anchor point="128"/>
                         </Texture>
                     </Controls>
                 </Button>
-                <Button name="$(parent)InventoryButton" clickSound="Click">
-                    <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="$(parent)WritsButton" offsetX="45"/>
+                <Button name="$(parent)ChampionButton" clickSound="Click">
+                    <Anchor point="TOPRIGHT" relativePoint="TOPLEFT" relativeTo="$(parent)TrackedButton" offsetX="-5"/>
                     <Dimensions x="40" y="40"/>
-                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Inventory')</OnMouseEnter>
+                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Champion')</OnMouseEnter>
                     <OnMouseExit>ZO_Tooltips_HideTextTooltip()</OnMouseExit>
-                    <OnClicked>LeoAltholic.ShowTab("Inventory")</OnClicked>
+                    <OnClicked>LeoAltholic.ShowTab("Champion")</OnClicked>
                     <Controls>
                         <Backdrop name="$(parent)BG" centerColor="101010" edgeColor="202020">
                             <AnchorFill/>
                             <Edge edgeSize="1"/>
                         </Backdrop>
-                        <Texture name="$(parent)Texture" textureFile="esoui/art/mainmenu/menubar_inventory_up.dds">
+                        <Texture name="$(parent)Texture" textureFile="esoui/art/mainmenu/menubar_champion_up.dds">
                             <Dimensions y="35" x="35"/>
                             <Anchor point="128"/>
                         </Texture>
                     </Controls>
                 </Button>
-                <Button name="$(parent)ResearchButton" clickSound="Click">
-                    <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="$(parent)InventoryButton" offsetX="45"/>
+                <Button name="$(parent)Skills2Button" clickSound="Click">
+                    <Anchor point="TOPRIGHT" relativePoint="TOPLEFT" relativeTo="$(parent)ChampionButton" offsetX="-5"/>
                     <Dimensions x="40" y="40"/>
-                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Research')</OnMouseEnter>
+                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Skills 2')</OnMouseEnter>
                     <OnMouseExit>ZO_Tooltips_HideTextTooltip()</OnMouseExit>
-                    <OnClicked>LeoAltholic.ShowTab("Research")</OnClicked>
+                    <OnClicked>LeoAltholic.ShowTab("Skills2")</OnClicked>
                     <Controls>
                         <Backdrop name="$(parent)BG" centerColor="101010" edgeColor="202020">
                             <AnchorFill/>
                             <Edge edgeSize="1"/>
                         </Backdrop>
-                        <Texture name="$(parent)Texture" textureFile="esoui/art/crafting/smithing_tabicon_research_up.dds">
+                        <Texture name="$(parent)Texture" textureFile="esoui/art/mainmenu/menubar_skills_up.dds">
                             <Dimensions y="35" x="35"/>
                             <Anchor point="128"/>
                         </Texture>
                     </Controls>
                 </Button>
-                <Button name="$(parent)SettingsButton" clickSound="Click">
-                    <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="$(parent)ResearchButton" offsetX="45"/>
+                <Button name="$(parent)SkillsButton" clickSound="Click">
+                    <Anchor point="TOPRIGHT" relativePoint="TOPLEFT" relativeTo="$(parent)Skills2Button" offsetX="-5"/>
                     <Dimensions x="40" y="40"/>
-                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Settings')</OnMouseEnter>
+                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Skills')</OnMouseEnter>
                     <OnMouseExit>ZO_Tooltips_HideTextTooltip()</OnMouseExit>
-                    <OnClicked>
-                        SCENE_MANAGER:HideTopLevel(LeoAltholicInventoryWindow)
-                        SCENE_MANAGER:HideTopLevel(LeoAltholicWindow)
-                        DoCommand("/leoaltoptions")
-                    </OnClicked>
+                    <OnClicked>LeoAltholic.ShowTab("Skills")</OnClicked>
                     <Controls>
                         <Backdrop name="$(parent)BG" centerColor="101010" edgeColor="202020">
                             <AnchorFill/>
                             <Edge edgeSize="1"/>
                         </Backdrop>
-                        <Texture name="$(parent)Texture" textureFile="esoui/art/chatwindow/chat_options_up.dds">
+                        <Texture name="$(parent)Texture" textureFile="esoui/art/mainmenu/menubar_skills_up.dds">
                             <Dimensions y="35" x="35"/>
                             <Anchor point="128"/>
                         </Texture>
                     </Controls>
                 </Button>
-                <Button name="$(parent)FeedbackButton" clickSound="Click">
-                    <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="$(parent)SettingsButton" offsetX="45"/>
+                <Button name="$(parent)StatsButton" clickSound="Click">
+                    <Anchor point="TOPRIGHT" relativePoint="TOPLEFT" relativeTo="$(parent)SkillsButton" offsetX="-5"/>
                     <Dimensions x="40" y="40"/>
-                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Research')</OnMouseEnter>
+                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Stats')</OnMouseEnter>
                     <OnMouseExit>ZO_Tooltips_HideTextTooltip()</OnMouseExit>
+                    <OnClicked>LeoAltholic.ShowTab("Stats")</OnClicked>
                     <Controls>
                         <Backdrop name="$(parent)BG" centerColor="101010" edgeColor="202020">
                             <AnchorFill/>
                             <Edge edgeSize="1"/>
                         </Backdrop>
+                        <Texture name="$(parent)Texture" textureFile="esoui/art/characterwindow/charsheet_statstab_icon_inactive.dds">
+                            <Dimensions y="35" x="35"/>
+                            <Anchor point="128"/>
+                        </Texture>
                     </Controls>
                 </Button>
-                <Button name="$(parent)Close" clickSound="Click">
-                    <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="$(parent)FeedbackButton" offsetX="45"/>
+                <Button name="$(parent)BioButton" clickSound="Click">
+                    <Anchor point="TOPRIGHT" relativePoint="TOPLEFT" relativeTo="$(parent)StatsButton" offsetX="-5" />
                     <Dimensions x="40" y="40"/>
-                    <OnClicked>LeoAltholic:HideUI()</OnClicked>
+                    <OnMouseEnter>ZO_Tooltips_ShowTextTooltip(self, TOP, 'Bio')</OnMouseEnter>
+                    <OnMouseExit>ZO_Tooltips_HideTextTooltip()</OnMouseExit>
+                    <OnClicked>LeoAltholic.ShowTab("Bio")</OnClicked>
                     <Controls>
                         <Backdrop name="$(parent)BG" centerColor="101010" edgeColor="202020">
                             <AnchorFill/>
                             <Edge edgeSize="1"/>
                         </Backdrop>
-                        <Texture name="$(parent)Texture" textureFile="esoui/art/buttons/decline_up.dds">
-                            <Dimensions y="25" x="25"/>
+                        <Texture name="$(parent)Texture" textureFile="esoui/art/mainmenu/menubar_character_up.dds">
+                            <Dimensions y="35" x="35"/>
                             <Anchor point="128"/>
                         </Texture>
                     </Controls>
                 </Button>

-                <Backdrop name="LeoAltholicWindowBioPanel" tier="1" centerColor="000000" edgeColor="202020" hidden="true" clampedToScreen="true" movable="false" mouseEnabled="true" inherits="ZO_ScrollContainerBase">
+                <Backdrop name="$(parent)HeaderBG" centerColor="111111" edgeColor="222222">
+                    <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="$(parent)" offsetX="5" offsetY="2"/>
+                    <Anchor point="TOPRIGHT" relativePoint="TOPLEFT" relativeTo="$(parent)BioButton" offsetX="-5" offsetY="0"/>
+                    <Dimensions x="390" y="40"/>
+                    <Edge edgeSize="1"/>
+                </Backdrop>
+
+                <Backdrop name="LeoAltholicWindowBioPanel" tier="1" centerColor="000000" edgeColor="202020" hidden="true" clampedToScreen="true" movable="false" mouseEnabled="true">
                     <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="LeoAltholicWindow" offsetX="0" offsetY="52"/>
-                    <Dimensions x="900" y="648"/>
+                    <Dimensions x="1000" y="648"/>
                     <Edge edgeSize="1"/>
-                    <OnInitialized>ZO_Scroll_Initialize(self)</OnInitialized>
                     <Controls>
-                        <Control name="$(parent)ScrollChild">
-                            <OnInitialized>self:SetParent(self:GetParent():GetNamedChild("Scroll"));self:SetAnchor(3,nil,3,0,0)</OnInitialized>
+                        <Control name="$(parent)ListScroll" inheritAlpha="true">
+                            <AnchorFill/>
+                            <Controls>
+                                <Control name="$(parent)Headers">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="20" offsetY="20" />
+                                    <Controls>
+                                        <Control name="$(parent)Name" inherits="ZO_SortHeader">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" />
+                                            <Dimensions x="180" y="20" />
+                                            <OnInitialized>
+                                                ZO_SortHeader_Initialize(self, GetString(SI_ADDON_MANAGER_NAME), "name", ZO_SORT_ORDER_DOWN, TEXT_ALIGN_LEFT, "ZoFontGameLargeBold")
+                                            </OnInitialized>
+                                        </Control>
+                                        <Control name="$(parent)Level" inherits="ZO_SortHeader">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="10" />
+                                            <Dimensions x="60" y="20" />
+                                            <OnInitialized>
+                                                ZO_SortHeader_Initialize(self, GetString(SI_ITEM_FORMAT_STR_LEVEL), "level", ZO_SORT_ORDER_DOWN, TEXT_ALIGN_RIGHT, "ZoFontGameLargeBold")
+                                            </OnInitialized>
+                                        </Control>
+                                        <Control name="$(parent)Race" inherits="ZO_SortHeader">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Level" relativePoint="TOPRIGHT" offsetX="10" />
+                                            <Dimensions x="120" y="20" />
+                                            <OnInitialized>
+                                                ZO_SortHeader_Initialize(self, GetString(SI_COLLECTIBLERESTRICTIONTYPE1), "race", ZO_SORT_ORDER_DOWN, TEXT_ALIGN_LEFT, "ZoFontGameLargeBold")
+                                            </OnInitialized>
+                                        </Control>
+                                        <Control name="$(parent)Class" inherits="ZO_SortHeader">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Race" relativePoint="TOPRIGHT" offsetX="10" />
+                                            <Dimensions x="120" y="20" />
+                                            <OnInitialized>
+                                                ZO_SortHeader_Initialize(self, GetString(SI_COLLECTIBLERESTRICTIONTYPE3), "class", ZO_SORT_ORDER_DOWN, TEXT_ALIGN_LEFT, "ZoFontGameLargeBold")
+                                            </OnInitialized>
+                                        </Control>
+                                        <Control name="$(parent)Alliance" inherits="ZO_SortHeader">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Class" relativePoint="TOPRIGHT" offsetX="10" />
+                                            <Dimensions x="200" y="20" />
+                                            <OnInitialized>
+                                                ZO_SortHeader_Initialize(self, GetString(SI_COLLECTIBLERESTRICTIONTYPE2), "alliance", ZO_SORT_ORDER_DOWN, TEXT_ALIGN_LEFT, "ZoFontGameLargeBold")
+                                            </OnInitialized>
+                                        </Control>
+                                        <Control name="$(parent)Riding" inherits="ZO_SortHeader">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Alliance" relativePoint="TOPRIGHT" offsetX="10" />
+                                            <Dimensions x="240" y="20" />
+                                            <OnInitialized>
+                                                ZO_SortHeader_Initialize(self, GetString(SI_COLLECTIBLECATEGORYTYPE2), "riding", ZO_SORT_ORDER_DOWN, TEXT_ALIGN_LEFT, "ZoFontGameLargeBold")
+                                            </OnInitialized>
+                                        </Control>
+                                    </Controls>
+                                </Control>
+                                <Control name="$(parent)List" inherits="ZO_ScrollList">
+                                    <Dimensions x="990" y="600" />
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)Headers" relativePoint="BOTTOMLEFT" offsetY="30" />
+                                </Control>
+                            </Controls>
                         </Control>
                     </Controls>
                 </Backdrop>

-                <Backdrop name="LeoAltholicWindowStatsPanel" tier="1" centerColor="000000" edgeColor="202020" hidden="true" clampedToScreen="true" movable="false" mouseEnabled="true" inherits="ZO_ScrollContainerBase">
+                <Backdrop name="LeoAltholicWindowStatsPanel" tier="1" centerColor="000000" edgeColor="202020" hidden="true" clampedToScreen="true" movable="false" mouseEnabled="true">
                     <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="LeoAltholicWindow" offsetX="0" offsetY="52"/>
-                    <Dimensions x="900" y="648"/>
+                    <Dimensions x="1000" y="648"/>
                     <Edge edgeSize="1"/>
-                    <OnInitialized>ZO_Scroll_Initialize(self)</OnInitialized>
                     <Controls>
-                        <Control name="$(parent)ScrollChild">
-                            <OnInitialized>self:SetParent(self:GetParent():GetNamedChild("Scroll"));self:SetAnchor(3,nil,3,0,0)</OnInitialized>
+                        <Control name="$(parent)ListScroll" inheritAlpha="true">
+                            <AnchorFill/>
+                            <Controls>
+                                <Control name="$(parent)Headers">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="20" offsetY="20" />
+                                    <Controls>
+                                        <Control name="$(parent)Name" inherits="ZO_SortHeader">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" />
+                                            <Dimensions x="180" y="20" />
+                                            <OnInitialized>
+                                                ZO_SortHeader_Initialize(self, GetString(SI_ADDON_MANAGER_NAME), "name", ZO_SORT_ORDER_DOWN, TEXT_ALIGN_LEFT, "ZoFontGameLargeBold")
+                                            </OnInitialized>
+                                        </Control>
+                                        <Label name="$(parent)Points" font="ZoFontGameLargeBold" color="C4C4A0">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="10" />
+                                            <Dimensions x="100" y="20" />
+                                            <OnInitialized>
+                                                self:SetText(GetString(SI_LEADERBOARDS_HEADER_POINTS))
+                                                self:SetModifyTextType(MODIFY_TEXT_TYPE_UPPERCASE)
+                                            </OnInitialized>
+                                        </Label>
+                                        <Label name="$(parent)Maximum" font="ZoFontGameLargeBold" color="C4C4A0">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Points" relativePoint="TOPRIGHT" offsetX="10" />
+                                            <Dimensions x="200" y="20" />
+                                            <OnInitialized>
+                                                self:SetText(GetString(LEOALT_MAXIMUM))
+                                                self:SetModifyTextType(MODIFY_TEXT_TYPE_UPPERCASE)
+                                            </OnInitialized>
+                                        </Label>
+                                        <Label name="$(parent)Recovery" font="ZoFontGameLargeBold" color="C4C4A0">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Maximum" relativePoint="TOPRIGHT" offsetX="10" />
+                                            <Dimensions x="120" y="20" />
+                                            <OnInitialized>
+                                                self:SetText(GetString(LEOALT_RECOVERY))
+                                                self:SetModifyTextType(MODIFY_TEXT_TYPE_UPPERCASE)
+                                            </OnInitialized>
+                                        </Label>
+                                        <Label name="$(parent)WeaponSpellCrit" font="ZoFontGameLargeBold" color="C4C4A0">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Recovery" relativePoint="TOPRIGHT" offsetX="10" />
+                                            <Dimensions x="200" y="20" />
+                                            <OnInitialized>
+                                                self:SetText(GetString(SI_ITEMTYPE1).."/"..GetString(SI_DERIVEDSTATS23))
+                                                self:SetModifyTextType(MODIFY_TEXT_TYPE_UPPERCASE)
+                                            </OnInitialized>
+                                        </Label>
+                                    </Controls>
+                                </Control>
+                                <Control name="$(parent)List" inherits="ZO_ScrollList">
+                                    <Dimensions x="990" y="600" />
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)Headers" relativePoint="BOTTOMLEFT" offsetY="30" />
+                                </Control>
+                            </Controls>
                         </Control>
                     </Controls>
                 </Backdrop>

                 <Backdrop name="LeoAltholicWindowSkillsPanel" tier="1" centerColor="000000" edgeColor="202020" hidden="true" clampedToScreen="true" movable="false" mouseEnabled="true" inherits="ZO_ScrollContainerBase">
                     <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="LeoAltholicWindow" offsetX="0" offsetY="52"/>
-                    <Dimensions x="900" y="648"/>
+                    <Dimensions x="1000" y="648"/>
                     <Edge edgeSize="1"/>
-                    <OnInitialized>ZO_Scroll_Initialize(self)</OnInitialized>
                     <Controls>
-                        <Control name="$(parent)ScrollChild">
-                            <OnInitialized>self:SetParent(self:GetParent():GetNamedChild("Scroll"));self:SetAnchor(3,nil,3,0,0)</OnInitialized>
+                        <Control name="$(parent)ListScroll" inheritAlpha="true">
+                            <AnchorFill/>
+                            <Controls>
+                                <Control name="$(parent)Headers">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="20" offsetY="20" />
+                                    <Controls>
+                                        <Control name="$(parent)Name" inherits="ZO_SortHeader">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" />
+                                            <Dimensions x="180" y="20" />
+                                            <OnInitialized>
+                                                ZO_SortHeader_Initialize(self, GetString(SI_ADDON_MANAGER_NAME), "name", ZO_SORT_ORDER_DOWN, TEXT_ALIGN_LEFT, "LeoAltholicSmallFont")
+                                            </OnInitialized>
+                                        </Control>
+                                        <Texture name="$(parent)Class1" mouseEnabled="true" textureFile="/esoui/art/tutorial/menubar_skills_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_SKILLTYPE1).." 1") </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Class2" mouseEnabled="true" textureFile="/esoui/art/tutorial/menubar_skills_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Class1" relativePoint="TOPRIGHT" offsetX="6"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_SKILLTYPE1).." 2") </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Class3" mouseEnabled="true" textureFile="/esoui/art/tutorial/menubar_skills_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Class2" relativePoint="TOPRIGHT" offsetX="6"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_SKILLTYPE1).." 3") </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)TwoHanded" mouseEnabled="true" textureFile="/esoui/art/icons/progression_tabicon_2handed_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Class3" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_GAMEPADWEAPONCATEGORY2)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)OneHanded" mouseEnabled="true" textureFile="/esoui/art/icons/progression_tabicon_1handed_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)TwoHanded" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_GAMEPADWEAPONCATEGORY1)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)DualWield" mouseEnabled="true" textureFile="/esoui/art/icons/progression_tabicon_dualwield_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)OneHanded" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_WEAPONCONFIGTYPE2)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Bow" mouseEnabled="true" textureFile="/esoui/art/icons/progression_tabicon_bow_inactive.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)DualWield" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_GAMEPADWEAPONCATEGORY3)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)DestructionStaff" mouseEnabled="true" textureFile="/esoui/art/icons/progression_tabicon_damagestaff_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Bow" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_GAMEPADWEAPONCATEGORY4)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)RestorationStaff" mouseEnabled="true" textureFile="/esoui/art/icons/progression_tabicon_healstaff_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)DestructionStaff" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_GAMEPADWEAPONCATEGORY5)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)ArmorLight" mouseEnabled="true" textureFile="/esoui/art/icons/progression_tabicon_armorlight_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)RestorationStaff" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_GAMEPADITEMCATEGORY37)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)ArmorMedium" mouseEnabled="true" textureFile="/esoui/art/icons/progression_tabicon_armormedium_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)ArmorLight" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_GAMEPADITEMCATEGORY36)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)ArmorHeavy" mouseEnabled="true" textureFile="/esoui/art/icons/progression_tabicon_armorheavy_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)ArmorMedium" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_GAMEPADITEMCATEGORY35)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Racial" mouseEnabled="true" textureFile="/esoui/art/mainmenu/menubar_character_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)ArmorHeavy" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_SKILLTYPE7)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Craft1" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_blacksmithing_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Racial" relativePoint="TOPRIGHT" offsetX="6"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE13)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Craft2" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_clothing_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Craft1" relativePoint="TOPRIGHT" offsetX="6"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE14)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Craft6" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_woodworking_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Craft2" relativePoint="TOPRIGHT" offsetX="6"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE15)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Craft7" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_jewelrycrafting_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Craft6" relativePoint="TOPRIGHT" offsetX="6"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE24)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Craft3" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_enchanting_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Craft7" relativePoint="TOPRIGHT" offsetX="6"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE17)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Craft4" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_alchemy_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Craft3" relativePoint="TOPRIGHT" offsetX="6"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE16)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Craft5" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_provisioning_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Craft4" relativePoint="TOPRIGHT" offsetX="6"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE18)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                    </Controls>
+                                </Control>
+                                <Control name="$(parent)List" inherits="ZO_ScrollList">
+                                    <Dimensions x="990" y="600" />
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)Headers" relativePoint="BOTTOMLEFT" offsetY="30" />
+                                </Control>
+                            </Controls>
+                        </Control>
+                    </Controls>
+                </Backdrop>
+                <Backdrop name="LeoAltholicWindowSkills2Panel" tier="1" centerColor="000000" edgeColor="202020" hidden="true" clampedToScreen="true" movable="false" mouseEnabled="true" inherits="ZO_ScrollContainerBase">
+                    <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="LeoAltholicWindow" offsetX="0" offsetY="52"/>
+                    <Dimensions x="1000" y="648"/>
+                    <Edge edgeSize="1"/>
+                    <Controls>
+                        <Control name="$(parent)ListScroll" inheritAlpha="true">
+                            <AnchorFill/>
+                            <Controls>
+                                <Control name="$(parent)Headers">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="20" offsetY="20" />
+                                    <Controls>
+                                        <Control name="$(parent)Name" inherits="ZO_SortHeader">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" />
+                                            <Dimensions x="180" y="20" />
+                                            <OnInitialized>
+                                                ZO_SortHeader_Initialize(self, GetString(SI_ADDON_MANAGER_NAME), "name", ZO_SORT_ORDER_DOWN, TEXT_ALIGN_LEFT, "LeoAltholicSmallFont")
+                                            </OnInitialized>
+                                        </Control>
+                                        <Texture name="$(parent)World1" mouseEnabled="true" textureFile="/esoui/art/progression/progression_indexicon_world_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter>
+                                                local name = GetSkillLineInfo(SKILL_TYPE_WORLD,1)
+                                                ZO_Tooltips_ShowTextTooltip(self, TOP, name)
+                                            </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)World2" mouseEnabled="true" textureFile="/esoui/art/progression/progression_indexicon_world_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)World1" relativePoint="TOPRIGHT" offsetX="6"/>
+                                            <OnMouseEnter>
+                                                local name = GetSkillLineInfo(SKILL_TYPE_WORLD,2)
+                                                ZO_Tooltips_ShowTextTooltip(self, TOP, name)
+                                            </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)World3" mouseEnabled="true" textureFile="/esoui/art/progression/progression_indexicon_world_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)World2" relativePoint="TOPRIGHT" offsetX="6"/>
+                                            <OnMouseEnter>
+                                                local name = GetSkillLineInfo(SKILL_TYPE_WORLD,3)
+                                                ZO_Tooltips_ShowTextTooltip(self, TOP, name)
+                                            </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)World4" mouseEnabled="true" textureFile="/esoui/art/progression/progression_indexicon_world_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)World3" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter>
+                                                local name = GetSkillLineInfo(SKILL_TYPE_WORLD,4)
+                                                ZO_Tooltips_ShowTextTooltip(self, TOP, name)
+                                            </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Guild1" mouseEnabled="true" textureFile="/esoui/art/treeicons/tutorial_idexicon_darkbrotherhood_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)World4" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter>
+                                                local name = GetSkillLineInfo(SKILL_TYPE_GUILD,1)
+                                                ZO_Tooltips_ShowTextTooltip(self, TOP, name)
+                                            </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Guild2" mouseEnabled="true" textureFile="/esoui/art/icons/progression_tabicon_fightersguild_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Guild1" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter>
+                                                local name = GetSkillLineInfo(SKILL_TYPE_GUILD,2)
+                                                ZO_Tooltips_ShowTextTooltip(self, TOP, name)
+                                            </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Guild3" mouseEnabled="true" textureFile="/esoui/art/tutorial/progression_tabicon_magesguild_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Guild2" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter>
+                                                local name = GetSkillLineInfo(SKILL_TYPE_GUILD,3)
+                                                ZO_Tooltips_ShowTextTooltip(self, TOP, name)
+                                            </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Guild4" mouseEnabled="true" textureFile="/esoui/art/icons/store_psijic_upgrade.dds">
+                                            <Dimensions x="24" y="24"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Guild3" relativePoint="TOPRIGHT" offsetX="6" offsetY="2"/>
+                                            <OnMouseEnter>
+                                                local name = GetSkillLineInfo(SKILL_TYPE_GUILD,4)
+                                                ZO_Tooltips_ShowTextTooltip(self, TOP, name)
+                                            </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Guild5" mouseEnabled="true" textureFile="/esoui/art/treeicons/tutorial_idexicon_thievesguild_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Guild4" relativePoint="TOPRIGHT" offsetX="6" offsetY="-2"/>
+                                            <OnMouseEnter>
+                                                local name = GetSkillLineInfo(SKILL_TYPE_GUILD,5)
+                                                ZO_Tooltips_ShowTextTooltip(self, TOP, name)
+                                            </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Guild6" mouseEnabled="true" textureFile="/esoui/art/icons/undaunted_bronze_key_01.dds">
+                                            <Dimensions x="26" y="26"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Guild5" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter>
+                                                local name = GetSkillLineInfo(SKILL_TYPE_GUILD,6)
+                                                ZO_Tooltips_ShowTextTooltip(self, TOP, name)
+                                            </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Assault" mouseEnabled="true" textureFile="/esoui/art/icons/progression_tabicon_avasiege_up.dds">
+                                            <Dimensions x="30" y="30"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Guild6" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter>
+                                                local name = GetSkillLineInfo(SKILL_TYPE_AVA,1)
+                                                ZO_Tooltips_ShowTextTooltip(self, TOP, name)
+                                            </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Emperor" mouseEnabled="true" textureFile="/esoui/art/icons/progression_tabicon_avaleadership_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Assault" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter>
+                                                local name = GetSkillLineInfo(SKILL_TYPE_AVA,2)
+                                                ZO_Tooltips_ShowTextTooltip(self, TOP, name)
+                                            </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)Support" mouseEnabled="true" textureFile="/esoui/art/icons/progression_tabicon_avadefender_up.dds">
+                                            <Dimensions x="28" y="28"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Emperor" relativePoint="TOPRIGHT" offsetX="6" offsetY="0"/>
+                                            <OnMouseEnter>
+                                                local name = GetSkillLineInfo(SKILL_TYPE_AVA,3)
+                                                ZO_Tooltips_ShowTextTooltip(self, TOP, name)
+                                            </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                    </Controls>
+                                </Control>
+                                <Control name="$(parent)List" inherits="ZO_ScrollList">
+                                    <Dimensions x="990" y="600" />
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)Headers" relativePoint="BOTTOMLEFT" offsetY="30" />
+                                </Control>
+                            </Controls>
                         </Control>
                     </Controls>
                 </Backdrop>

-                <Backdrop name="LeoAltholicWindowChampionPanel" tier="1" centerColor="000000" edgeColor="202020" hidden="true" clampedToScreen="true" movable="false" mouseEnabled="true" inherits="ZO_ScrollContainerBase">
+                <Backdrop name="LeoAltholicWindowChampionPanel" tier="1" centerColor="000000" edgeColor="202020" hidden="true" clampedToScreen="true" movable="false" mouseEnabled="true">
                     <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="LeoAltholicWindow" offsetX="0" offsetY="52"/>
-                    <Dimensions x="900" y="648"/>
+                    <Dimensions x="1000" y="648"/>
                     <Edge edgeSize="1"/>
-                    <OnInitialized>ZO_Scroll_Initialize(self)</OnInitialized>
                     <Controls>
-                        <Control name="$(parent)ScrollChild">
-                            <OnInitialized>self:SetParent(self:GetParent():GetNamedChild("Scroll"));self:SetAnchor(3,nil,3,0,0)</OnInitialized>
+                        <Control name="$(parent)ListScroll" inheritAlpha="true">
+                            <AnchorFill/>
+                            <Controls>
+                                <Control name="$(parent)Headers">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="20" offsetY="20" />
+                                    <Controls>
+                                        <Control name="$(parent)Name" inherits="ZO_SortHeader">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" />
+                                            <Dimensions x="180" y="20" />
+                                            <OnInitialized>
+                                                ZO_SortHeader_Initialize(self, GetString(SI_ADDON_MANAGER_NAME), "name", ZO_SORT_ORDER_DOWN, TEXT_ALIGN_LEFT, "LeoAltholicSmallFont")
+                                            </OnInitialized>
+                                        </Control>
+                                    </Controls>
+                                </Control>
+                                <Control name="$(parent)List" inherits="ZO_ScrollList">
+                                    <Dimensions x="990" y="600" />
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)Headers" relativePoint="BOTTOMLEFT" offsetY="30" />
+                                </Control>
+                            </Controls>
                         </Control>
                     </Controls>
                 </Backdrop>

                 <Backdrop name="LeoAltholicWindowTrackedPanel" tier="1" centerColor="000000" edgeColor="202020" hidden="true" clampedToScreen="true" movable="false" mouseEnabled="true" inherits="ZO_ScrollContainerBase">
                     <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="LeoAltholicWindow" offsetX="0" offsetY="52"/>
-                    <Dimensions x="900" y="648"/>
+                    <Dimensions x="1000" y="648"/>
                     <Edge edgeSize="1"/>
                     <OnInitialized>ZO_Scroll_Initialize(self)</OnInitialized>
                     <Controls>
@@ -270,295 +692,277 @@

                 <Backdrop name="LeoAltholicWindowInventoryPanel" tier="1" centerColor="000000" edgeColor="202020" hidden="true" clampedToScreen="true" movable="false" mouseEnabled="true" inherits="ZO_ScrollContainerBase">
                     <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="LeoAltholicWindow" offsetX="0" offsetY="52"/>
-                    <Dimensions x="900" y="648"/>
+                    <Dimensions x="1000" y="648"/>
                     <Edge edgeSize="1"/>
-                    <OnInitialized>ZO_Scroll_Initialize(self)</OnInitialized>
                     <Controls>
-                        <Control name="$(parent)ScrollChild">
-                            <OnInitialized>self:SetParent(self:GetParent():GetNamedChild("Scroll"));self:SetAnchor(3,nil,3,0,0)</OnInitialized>
+                        <Control name="$(parent)ListScroll" inheritAlpha="true">
+                            <AnchorFill/>
+                            <Controls>
+                                <Control name="$(parent)Headers">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="20" offsetY="20" />
+                                    <Controls>
+                                        <Control name="$(parent)Name" inherits="ZO_SortHeader">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" />
+                                            <Dimensions x="180" y="20" />
+                                            <OnInitialized>
+                                                ZO_SortHeader_Initialize(self, GetString(SI_ADDON_MANAGER_NAME), "name", ZO_SORT_ORDER_DOWN, TEXT_ALIGN_LEFT, "ZoFontGameLargeBold")
+                                            </OnInitialized>
+                                        </Control>
+                                        <Texture name="$(parent)BagIcon" textureFile="esoui/art/mainmenu/menubar_inventory_up.dds" mouseEnabled="true">
+                                            <Dimensions y="30" x="30"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="14" offsetY="-4"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_GAMEPAD_INVENTORY_AVAILABLE_FUNDS)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)GoldIcon" textureFile="esoui/art/currency/currency_gold.dds" mouseEnabled="true">
+                                            <Dimensions y="20" x="20"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)BagIcon" relativePoint="TOPRIGHT" offsetX="70" offsetY="4"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_GAMEPAD_INVENTORY_AVAILABLE_FUNDS)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)SoulGemsIcon" textureFile="esoui/art/currency/currency_seedcrystal_16.dds" mouseEnabled="true">
+                                            <Dimensions y="20" x="20"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)GoldIcon" relativePoint="TOPRIGHT" offsetX="130" offsetY="0"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMTYPE19)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)APIcon" textureFile="esoui/art/currency/alliancepoints.dds" mouseEnabled="true">
+                                            <Dimensions y="20" x="20"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)SoulGemsIcon" relativePoint="TOPRIGHT" offsetX="80" offsetY="0"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_GAMEPAD_INVENTORY_ALLIANCE_POINTS)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)TelVarIcon" textureFile="esoui/art/currency/currency_telvar.dds" mouseEnabled="true">
+                                            <Dimensions y="25" x="25"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)APIcon" relativePoint="TOPRIGHT" offsetX="80" offsetY="0"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_GAMEPAD_INVENTORY_TELVAR_STONES)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                        <Texture name="$(parent)WritIcon" textureFile="esoui/art/currency/currency_writvoucher.dds" mouseEnabled="true">
+                                            <Dimensions y="25" x="25"/>
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)TelVarIcon" relativePoint="TOPRIGHT" offsetX="80" offsetY="0"/>
+                                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_QUEST_REWARD_WRIT_VOUCHERS_NAME)) </OnMouseEnter>
+                                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                        </Texture>
+                                    </Controls>
+                                </Control>
+                                <Control name="$(parent)List" inherits="ZO_ScrollList">
+                                    <Dimensions x="990" y="600" />
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)Headers" relativePoint="BOTTOMLEFT" offsetY="30" />
+                                </Control>
+                            </Controls>
                         </Control>
                     </Controls>
                 </Backdrop>

-                <Backdrop name="LeoAltholicWindowResearchPanel" tier="1" centerColor="000000" edgeColor="202020" hidden="true" clampedToScreen="true" movable="false" mouseEnabled="true" inherits="ZO_ScrollContainerBase">
+                <Backdrop name="LeoAltholicWindowResearchPanel" tier="1" centerColor="000000" edgeColor="202020" hidden="true" clampedToScreen="true" movable="false" mouseEnabled="true">
                     <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="LeoAltholicWindow" offsetX="0" offsetY="52"/>
-                    <Dimensions x="900" y="648"/>
+                    <Dimensions x="1000" y="648"/>
                     <Edge edgeSize="1"/>
-                    <OnInitialized>ZO_Scroll_Initialize(self)</OnInitialized>
                     <Controls>
-                        <Control name="$(parent)ScrollChild">
-                            <OnInitialized>self:SetParent(self:GetParent():GetNamedChild("Scroll"));self:SetAnchor(3,nil,3,0,0)</OnInitialized>
+                        <Control name="$(parent)ListScroll" inheritAlpha="true">
+                            <AnchorFill/>
+                            <Controls>
+                                <Control name="$(parent)Headers">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="20" offsetY="20" />
+                                    <Controls>
+                                        <Control name="$(parent)Name" inherits="ZO_SortHeader">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" />
+                                            <Dimensions x="180" y="20" />
+                                            <OnInitialized>
+                                                ZO_SortHeader_Initialize(self, GetString(SI_ADDON_MANAGER_NAME), "name", ZO_SORT_ORDER_DOWN, TEXT_ALIGN_LEFT, "ZoFontGameLargeBold")
+                                            </OnInitialized>
+                                        </Control>
+                                        <Label name="$(parent)Craft1" font="ZoFontGameLargeBold" color="C4C4A0">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="10" />
+                                            <Dimensions x="200" y="20" />
+                                            <OnInitialized>
+                                                self:SetText(GetString(SI_ITEMFILTERTYPE13))
+                                                self:SetModifyTextType(MODIFY_TEXT_TYPE_UPPERCASE)
+                                            </OnInitialized>
+                                        </Label>
+                                        <Label name="$(parent)Craft2" font="ZoFontGameLargeBold" color="C4C4A0">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Craft1" relativePoint="TOPRIGHT" offsetX="10" />
+                                            <Dimensions x="200" y="20" />
+                                            <OnInitialized>
+                                                self:SetText(GetString(SI_ITEMFILTERTYPE14))
+                                                self:SetModifyTextType(MODIFY_TEXT_TYPE_UPPERCASE)
+                                            </OnInitialized>
+                                        </Label>
+                                        <Label name="$(parent)Craft6" font="ZoFontGameLargeBold" color="C4C4A0">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Craft2" relativePoint="TOPRIGHT" offsetX="10" />
+                                            <Dimensions x="200" y="20" />
+                                            <OnInitialized>
+                                                self:SetText(GetString(SI_ITEMFILTERTYPE15))
+                                                self:SetModifyTextType(MODIFY_TEXT_TYPE_UPPERCASE)
+                                            </OnInitialized>
+                                        </Label>
+                                        <Label name="$(parent)Craft7" font="ZoFontGameLargeBold" color="C4C4A0">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Craft6" relativePoint="TOPRIGHT" offsetX="10" />
+                                            <Dimensions x="100" y="20" />
+                                            <OnInitialized>
+                                                self:SetText(GetString(SI_ITEMFILTERTYPE25))
+                                                self:SetModifyTextType(MODIFY_TEXT_TYPE_UPPERCASE)
+                                            </OnInitialized>
+                                        </Label>
+                                    </Controls>
+                                </Control>
+                                <Control name="$(parent)List" inherits="ZO_ScrollList">
+                                    <Dimensions x="990" y="600" />
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)Headers" relativePoint="BOTTOMLEFT" offsetY="30" />
+                                </Control>
+                            </Controls>
                         </Control>
                     </Controls>
                 </Backdrop>

-                <Backdrop name="LeoAltholicWindowDailyPanel" tier="1" centerColor="000000" edgeColor="202020" hidden="true" clampedToScreen="true" movable="false" mouseEnabled="true">
+                <Backdrop name="LeoAltholicWindowWritsPanel" tier="1" centerColor="000000" edgeColor="202020" hidden="true" clampedToScreen="true" movable="false" mouseEnabled="true">
                     <Anchor point="TOPLEFT" relativePoint="TOPLEFT" relativeTo="LeoAltholicWindow" offsetX="0" offsetY="52"/>
-                    <Dimensions x="900" y="648"/>
+                    <Dimensions x="1000" y="648"/>
                     <Edge edgeSize="1"/>
                     <Controls>
-                        <Texture name="$(parent)1Label" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_blacksmithing_up.dds">
-                            <Dimensions x="38" y="38"/>
-                            <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="240" offsetY="4"/>
-                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE13)) </OnMouseEnter>
-                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                        </Texture>
-                        <Texture name="$(parent)2Label" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_clothing_up.dds">
-                            <Dimensions x="38" y="38"/>
-                            <Anchor point="TOPLEFT" relativeTo="$(parent)1Label" relativePoint="TOPLEFT" offsetX="40"/>
-                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE14)) </OnMouseEnter>
-                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                        </Texture>
-                        <Texture name="$(parent)6Label" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_woodworking_up.dds">
-                            <Dimensions x="38" y="38"/>
-                            <Anchor point="TOPLEFT" relativeTo="$(parent)2Label" relativePoint="TOPLEFT" offsetX="40"/>
-                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE15)) </OnMouseEnter>
-                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                        </Texture>
-                        <Texture name="$(parent)7Label" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_jewelrycrafting_up.dds">
-                            <Dimensions x="38" y="38"/>
-                            <Anchor point="TOPLEFT" relativeTo="$(parent)6Label" relativePoint="TOPLEFT" offsetX="40"/>
-                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE24)) </OnMouseEnter>
-                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                        </Texture>
-                        <Texture name="$(parent)3Label" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_enchanting_up.dds">
-                            <Dimensions x="38" y="38"/>
-                            <Anchor point="TOPLEFT" relativeTo="$(parent)7Label" relativePoint="TOPLEFT" offsetX="40"/>
-                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE17)) </OnMouseEnter>
-                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                        </Texture>
-                        <Texture name="$(parent)4Label" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_alchemy_up.dds">
-                            <Dimensions x="38" y="38"/>
-                            <Anchor point="TOPLEFT" relativeTo="$(parent)3Label" relativePoint="TOPLEFT" offsetX="40"/>
-                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE16)) </OnMouseEnter>
-                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                        </Texture>
-                        <Texture name="$(parent)5Label" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_provisioning_up.dds">
-                            <Dimensions x="38" y="38"/>
-                            <Anchor point="TOPLEFT" relativeTo="$(parent)4Label" relativePoint="TOPLEFT" offsetX="40"/>
-                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE18)) </OnMouseEnter>
-                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                        </Texture>
-                        <!--<Texture name="$(parent)Undaunted1Label" mouseEnabled="true" textureFile="/esoui/art/icons/undaunted_bronze_key_01.dds">
-                            <Dimensions x="26" y="26"/>
-                            <Anchor point="TOPLEFT" relativeTo="$(parent)5Label" relativePoint="TOPLEFT" offsetX="40" offsetY="4"/>
-                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, GetString(LEOALT_PROVISIONING)) </OnMouseEnter>
-                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                        </Texture>
-                        <Texture name="$(parent)Undaunted2Label" mouseEnabled="true" textureFile="/esoui/art/icons/undaunted_silver_key_01.dds">
-                            <Dimensions x="26" y="26"/>
-                            <Anchor point="TOPLEFT" relativeTo="$(parent)Undaunted1Label" relativePoint="TOPLEFT" offsetX="40"/>
-                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, GetString(LEOALT_PROVISIONING)) </OnMouseEnter>
-                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                        </Texture>
-                        <Texture name="$(parent)Undaunted3Label" mouseEnabled="true" textureFile="/esoui/art/icons/undaunted_gold_key_01.dds">
-                            <Dimensions x="26" y="26"/>
-                            <Anchor point="TOPLEFT" relativeTo="$(parent)Undaunted2Label" relativePoint="TOPLEFT" offsetX="40"/>
-                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, GetString(LEOALT_PROVISIONING)) </OnMouseEnter>
-                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                        </Texture>
-                        <Texture name="$(parent)FighterLabel" mouseEnabled="true" textureFile="/esoui/art/icons/progression_tabicon_fightersguild_up.dds">
-                            <Dimensions x="38" y="38"/>
-                            <Anchor point="TOPLEFT" relativeTo="$(parent)Undaunted3Label" relativePoint="TOPLEFT" offsetX="40" offsetY="-4"/>
-                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, GetString(LEOALT_PROVISIONING)) </OnMouseEnter>
-                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                        </Texture>
-                        <Texture name="$(parent)MagesLabel" mouseEnabled="true" textureFile="/esoui/art/icons/progression_tabicon_magesguild_up.dds">
-                            <Dimensions x="38" y="38"/>
-                            <Anchor point="TOPLEFT" relativeTo="$(parent)FighterLabel" relativePoint="TOPLEFT" offsetX="40"/>
-                            <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, GetString(LEOALT_PROVISIONING)) </OnMouseEnter>
-                            <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                        </Texture>-->
+                        <Control name="$(parent)ListScroll" inheritAlpha="true">
+                            <AnchorFill/>
+                            <Controls>
+                                <Control name="$(parent)Headers">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="20" offsetY="20" />
+                                        <Controls>
+                                            <Control name="$(parent)Name" inherits="ZO_SortHeader">
+                                                <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" />
+                                                <Dimensions x="180" y="20" />
+                                                <OnInitialized>
+                                                    ZO_SortHeader_Initialize(self, GetString(SI_ADDON_MANAGER_NAME), "name", ZO_SORT_ORDER_DOWN, TEXT_ALIGN_LEFT, "ZoFontGameLargeBold")
+                                                </OnInitialized>
+                                            </Control>
+                                            <Texture name="$(parent)1Label" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_blacksmithing_up.dds">
+                                                <Dimensions x="38" y="38"/>
+                                                <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="10" offsetY="-8"/>
+                                                <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE13)) </OnMouseEnter>
+                                                <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                            </Texture>
+                                            <Texture name="$(parent)2Label" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_clothing_up.dds">
+                                                <Dimensions x="38" y="38"/>
+                                                <Anchor point="TOPLEFT" relativeTo="$(parent)1Label" relativePoint="TOPLEFT" offsetX="40"/>
+                                                <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE14)) </OnMouseEnter>
+                                                <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                            </Texture>
+                                            <Texture name="$(parent)6Label" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_woodworking_up.dds">
+                                                <Dimensions x="38" y="38"/>
+                                                <Anchor point="TOPLEFT" relativeTo="$(parent)2Label" relativePoint="TOPLEFT" offsetX="40"/>
+                                                <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE15)) </OnMouseEnter>
+                                                <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                            </Texture>
+                                            <Texture name="$(parent)7Label" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_jewelrycrafting_up.dds">
+                                                <Dimensions x="38" y="38"/>
+                                                <Anchor point="TOPLEFT" relativeTo="$(parent)6Label" relativePoint="TOPLEFT" offsetX="40"/>
+                                                <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE24)) </OnMouseEnter>
+                                                <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                            </Texture>
+                                            <Texture name="$(parent)3Label" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_enchanting_up.dds">
+                                                <Dimensions x="38" y="38"/>
+                                                <Anchor point="TOPLEFT" relativeTo="$(parent)7Label" relativePoint="TOPLEFT" offsetX="40"/>
+                                                <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE17)) </OnMouseEnter>
+                                                <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                            </Texture>
+                                            <Texture name="$(parent)4Label" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_alchemy_up.dds">
+                                                <Dimensions x="38" y="38"/>
+                                                <Anchor point="TOPLEFT" relativeTo="$(parent)3Label" relativePoint="TOPLEFT" offsetX="40"/>
+                                                <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE16)) </OnMouseEnter>
+                                                <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                            </Texture>
+                                            <Texture name="$(parent)5Label" mouseEnabled="true" textureFile="/esoui/art/inventory/inventory_tabicon_craftbag_provisioning_up.dds">
+                                                <Dimensions x="38" y="38"/>
+                                                <Anchor point="TOPLEFT" relativeTo="$(parent)4Label" relativePoint="TOPLEFT" offsetX="40"/>
+                                                <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, TOP, GetString(SI_ITEMFILTERTYPE18)) </OnMouseEnter>
+                                                <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                                            </Texture>
+                                        </Controls>
+                                </Control>
+                                <Control name="$(parent)List" inherits="ZO_ScrollList">
+                                    <Dimensions x="990" y="600" />
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)Headers" relativePoint="BOTTOMLEFT" offsetY="30" />
+                                </Control>
+                            </Controls>
+                        </Control>
                     </Controls>
                 </Backdrop>
-
             </Controls>
         </TopLevelControl>

-        <Control name="LeoAltholicBioRowTemplate" virtual="true" horizontalAlignment="LEFT" verticalAlignment="CENTER">
-            <Dimensions x="880" y="105"/>
+        <Control name="LeoAltholicBioListTemplate" virtual="true" mouseEnabled="true">
+            <Dimensions x="1000" y="30" />
             <Controls>
-                <Backdrop name="$(parent)BG" centerColor="222222" edgeColor="444444" tier="LOW">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="2" offsetY="2"/>
-                    <Dimensions x="880" y="105"/>
-                    <Edge edgeSize="1"/>
-                </Backdrop>
-
-                <Label name="$(parent)Alliance" mouseEnabled="true" font="ZoFontWinH3" normalColor="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="CENTER" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="10" offsetY="10"/>
-                    <Dimensions x="60" y="75"/>
-                    <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, self.data) </OnMouseEnter>
-                    <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                </Label>
-
-                <Label name="$(parent)Name" mouseEnabled="true" font="ZoFontWinH3" normalColor="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="80" offsetY="20"/>
-                    <Dimensions x="180" y="30"/>
-                </Label>
-
-                <Label name="$(parent)RaceClass" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="80" offsetY="50"/>
-                    <Dimensions x="450" y="30"/>
-                </Label>
-
-                <Label name="$(parent)LevelLabel" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="4"/>
-                    <Dimensions x="80" y="35"/>
-                    <OnInitialized>self:SetText(GetString(SI_ITEM_FORMAT_STR_LEVEL))</OnInitialized>
-                </Label>
-
-                <Label name="$(parent)Level" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="340" offsetY="4"/>
-                    <Dimensions x="80" y="35"/>
-                </Label>
-
-                <Label name="$(parent)AllianceRankLabel" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="34"/>
-                    <Dimensions x="80" y="35"/>
-                    <OnInitialized>self:SetText(GetString(SI_GUILD_TOOLTIP_RANK))</OnInitialized>
-                </Label>
-
-                <Label name="$(parent)AllianceRank" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="340" offsetY="34"/>
-                    <Dimensions x="150" y="35"/>
-                </Label>
-
-                <Label name="$(parent)BountyLabel" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="64"/>
-                    <Dimensions x="80" y="35"/>
-                    <OnInitialized>self:SetText(GetString(SI_STATS_BOUNTY_LABEL))</OnInitialized>
-                </Label>
-
-                <Label name="$(parent)Bounty" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="340" offsetY="64"/>
-                    <Dimensions x="150" y="35"/>
-                </Label>
+                <Texture name="$(parent)BG" inherits="ZO_ThinListBgStrip" />

-                <Label name="$(parent)AttributePointsLabel" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="460" offsetY="4"/>
-                    <Dimensions x="150" y="35"/>
-                    <OnInitialized>self:SetText(GetString(SI_LEVEL_UP_REWARDS_ATTRIBUTE_POINT_TOOLTIP_HEADER))</OnInitialized>
+                <Label name="$(parent)Name" font="LeoAltholicLargeFont" color="ffffff" verticalAlignment="CENTER" mouseEnabled="true">
+                    <Dimensions x="180" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)BG" relativePoint="TOPLEFT"/>
                 </Label>
-
-                <Label name="$(parent)AttributePoints" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="620" offsetY="4"/>
-                    <Dimensions x="50" y="35"/>
+                <Label name="$(parent)Level" font="LeoAltholicLargeFont" verticalAlignment="CENTER"  horizontalAlignment="RIGHT">
+                    <Dimensions x="60" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="10"/>
                 </Label>
-
-                <Label name="$(parent)PlayedLabel" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="460" offsetY="34"/>
-                    <Dimensions x="150" y="35"/>
-                    <OnInitialized>self:SetText(GetString(LEOALT_PLAYED))</OnInitialized>
+                <Label name="$(parent)Race" font="LeoAltholicLargeFont" verticalAlignment="CENTER">
+                    <Dimensions x="120" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Level" relativePoint="TOPRIGHT" offsetX="10"/>
                 </Label>
-
-                <Label name="$(parent)Played" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="620" offsetY="34"/>
-                    <Dimensions x="100" y="35"/>
+                <Label name="$(parent)Class" font="LeoAltholicLargeFont" verticalAlignment="CENTER" mouseEnabled="true">
+                    <Dimensions x="120" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Race" relativePoint="TOPRIGHT" offsetX="10"/>
                 </Label>
-
-                <Label name="$(parent)RidingLabel" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="460" offsetY="64"/>
-                    <Dimensions x="150" y="35"/>
-                    <OnInitialized>self:SetText(GetString(LEOALT_RIDING))</OnInitialized>
+                <Label name="$(parent)Alliance" font="LeoAltholicLargeFont" verticalAlignment="CENTER" mouseEnabled="true">
+                    <Dimensions x="200" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Class" relativePoint="TOPRIGHT" offsetX="10"/>
                 </Label>
-
-                <Label name="$(parent)Riding" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="620" offsetY="64"/>
-                    <Dimensions x="400" y="35"/>
+                <Label name="$(parent)Riding" font="LeoAltholicLargeFont" verticalAlignment="CENTER" mouseEnabled="true">
+                    <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>
             </Controls>
         </Control>

-        <Control name="LeoAltholicStatsRowTemplate" virtual="true" horizontalAlignment="LEFT" verticalAlignment="CENTER">
-            <Dimensions x="880" y="105"/>
+        <Control name="LeoAltholicStatsListTemplate" virtual="true" mouseEnabled="true">
+            <Dimensions x="1000" y="30" />
             <Controls>
-                <Backdrop name="$(parent)BG" centerColor="222222" edgeColor="444444" tier="LOW">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="2" offsetY="2"/>
-                    <Dimensions x="880" y="105"/>
-                    <Edge edgeSize="1"/>
-                </Backdrop>
-
-                <Label name="$(parent)Alliance" mouseEnabled="true" font="ZoFontWinH3" normalColor="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="CENTER" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="10" offsetY="10"/>
-                    <Dimensions x="60" y="75"/>
-                    <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, self.data) </OnMouseEnter>
-                    <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                </Label>
-
-                <Label name="$(parent)Name" mouseEnabled="true" font="ZoFontWinH3" normalColor="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="80" offsetY="20"/>
-                    <Dimensions x="180" y="30"/>
-                </Label>
-
-                <Label name="$(parent)RaceClass" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="80" offsetY="50"/>
-                    <Dimensions x="450" y="30"/>
-                </Label>
-
-                <Label name="$(parent)AttributePointsLabel" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="280" offsetY="4"/>
-                    <Dimensions x="80" y="35"/>
-                    <OnInitialized>self:SetText(GetString(SI_LEADERBOARDS_HEADER_POINTS))</OnInitialized>
-                </Label>
-
-                <Label name="$(parent)AttributePoints" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="370" offsetY="4"/>
-                    <Dimensions x="100" y="35"/>
-                </Label>
+                <Texture name="$(parent)BG" inherits="ZO_ThinListBgStrip" />

-                <Label name="$(parent)MaxAttributesLabel" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="280" offsetY="34"/>
-                    <Dimensions x="80" y="35"/>
-                    <OnInitialized>self:SetText(GetString(LEOALT_MAXIMUM))</OnInitialized>
+                <Label name="$(parent)Name" font="LeoAltholicLargeFont" color="ffffff" verticalAlignment="CENTER" mouseEnabled="true">
+                    <Dimensions x="180" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)BG" relativePoint="TOPLEFT"/>
                 </Label>
-
-                <Label name="$(parent)MaxAttributes" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="370" offsetY="34"/>
-                    <Dimensions x="150" y="35"/>
+                <Label name="$(parent)Points" font="LeoAltholicLargeFont" verticalAlignment="CENTER"  horizontalAlignment="LEFT">
+                    <Dimensions x="100" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="10"/>
                 </Label>
-
-                <Label name="$(parent)RecoveryAttributesLabel" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="280" offsetY="64"/>
-                    <Dimensions x="80" y="35"/>
-                    <OnInitialized>self:SetText(GetString(LEOALT_RECOVERY))</OnInitialized>
+                <Label name="$(parent)Maximum" font="LeoAltholicLargeFont" verticalAlignment="CENTER">
+                    <Dimensions x="200" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Points" relativePoint="TOPRIGHT" offsetX="10"/>
                 </Label>
-
-                <Label name="$(parent)RecoveryAttributes" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="370" offsetY="64"/>
-                    <Dimensions x="150" y="35"/>
+                <Label name="$(parent)Recovery" font="LeoAltholicLargeFont" verticalAlignment="CENTER" mouseEnabled="true">
+                    <Dimensions x="120" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Maximum" relativePoint="TOPRIGHT" offsetX="10"/>
                 </Label>
-
-                <Label name="$(parent)SpellPointsLabel" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="520" offsetY="4"/>
-                    <Dimensions x="150" y="35"/>
-                    <OnInitialized>self:SetText(GetString(SI_DERIVEDSTATS23))</OnInitialized>
+                <Label name="$(parent)WeaponSpellCrit" font="LeoAltholicLargeFont" verticalAlignment="CENTER" mouseEnabled="true">
+                    <Dimensions x="200" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Recovery" relativePoint="TOPRIGHT" offsetX="10"/>
                 </Label>
-
-                <Label name="$(parent)SpellPoints" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="680" offsetY="4"/>
-                    <Dimensions x="50" y="35"/>
-                </Label>
-
-                <Label name="$(parent)WeaponPointsLabel" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="520" offsetY="34"/>
-                    <Dimensions x="150" y="35"/>
-                    <OnInitialized>self:SetText(GetString(SI_DERIVEDSTATS16))</OnInitialized>
-                </Label>
-
-                <Label name="$(parent)WeaponPoints" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="680" offsetY="34"/>
-                    <Dimensions x="100" y="35"/>
-                </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>
             </Controls>
         </Control>

         <Control name="LeoAltholicTrackedRowTemplate" virtual="true" horizontalAlignment="LEFT" verticalAlignment="CENTER">
-            <Dimensions x="880" y="165"/>
+            <Dimensions x="990" y="110"/>
             <Controls>
-                <Backdrop name="$(parent)BG" centerColor="222222" edgeColor="444444" tier="LOW">
+                <Backdrop name="$(parent)BG" centerColor="010101" edgeColor="222222" tier="LOW">
                     <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="2" offsetY="2"/>
-                    <Dimensions x="880" y="165"/>
+                    <Dimensions x="990" y="110"/>
                     <Edge edgeSize="1"/>
                 </Backdrop>

@@ -672,72 +1076,229 @@
             </Controls>
         </Control>

-        <Control name="LeoAltholicDailyRowTemplate" virtual="true" horizontalAlignment="LEFT" verticalAlignment="CENTER">
-            <Dimensions x="880" y="34"/>
+        <Control name="LeoAltholicWritsListTemplate" virtual="true" horizontalAlignment="LEFT" verticalAlignment="CENTER">
+            <Dimensions x="990" y="30"/>
             <Controls>
-                <Backdrop name="$(parent)BG" centerColor="222222" edgeColor="444444" tier="LOW">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="2" offsetY="2"/>
-                    <Dimensions x="880" y="34"/>
-                    <Edge edgeSize="1"/>
-                </Backdrop>
-
-                <Label name="$(parent)Name" mouseEnabled="true" font="ZoFontGame" normalColor="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="50" offsetY="20"/>
+                <Label name="$(parent)Name" mouseEnabled="true" font="ZoFontGame" normalColor="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="2" offsetY="0"/>
                     <Dimensions x="180" y="30"/>
                 </Label>

                 <Texture name="$(parent)Craft1Status" mouseEnabled="true">
                     <Dimensions x="28" y="28"/>
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="244" offsetY="20"/>
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="10" offsetY="0"/>
                     <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, self.data) </OnMouseEnter>
                     <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
                 </Texture>
                 <Texture name="$(parent)Craft2Status" mouseEnabled="true">
                     <Dimensions x="28" y="28"/>
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft1Status" relativePoint="TOPLEFT" offsetX="40"/>
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft1Status" relativePoint="TOPRIGHT" offsetX="12"/>
                     <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, self.data) </OnMouseEnter>
                     <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
                 </Texture>
                 <Texture name="$(parent)Craft6Status" mouseEnabled="true">
                     <Dimensions x="28" y="28"/>
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft2Status" relativePoint="TOPLEFT" offsetX="40"/>
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft2Status" relativePoint="TOPRIGHT" offsetX="12"/>
                     <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, self.data) </OnMouseEnter>
                     <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
                 </Texture>
                 <Texture name="$(parent)Craft7Status" mouseEnabled="true">
                     <Dimensions x="28" y="28"/>
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft6Status" relativePoint="TOPLEFT" offsetX="40"/>
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft6Status" relativePoint="TOPRIGHT" offsetX="12"/>
                     <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, self.data) </OnMouseEnter>
                     <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
                 </Texture>
                 <Texture name="$(parent)Craft3Status" mouseEnabled="true">
                     <Dimensions x="28" y="28"/>
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft7Status" relativePoint="TOPLEFT" offsetX="40"/>
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft7Status" relativePoint="TOPRIGHT" offsetX="12"/>
                     <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, self.data) </OnMouseEnter>
                     <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
                 </Texture>
                 <Texture name="$(parent)Craft4Status" mouseEnabled="true">
                     <Dimensions x="28" y="28"/>
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft3Status" relativePoint="TOPLEFT" offsetX="40"/>
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft3Status" relativePoint="TOPRIGHT" offsetX="12"/>
                     <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, self.data) </OnMouseEnter>
                     <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
                 </Texture>
                 <Texture name="$(parent)Craft5Status" mouseEnabled="true">
                     <Dimensions x="28" y="28"/>
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft4Status" relativePoint="TOPLEFT" offsetX="40"/>
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft4Status" relativePoint="TOPRIGHT" offsetX="12"/>
                     <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, self.data) </OnMouseEnter>
                     <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
                 </Texture>
+            </Controls>
+        </Control>
+
+        <Control name="LeoAltholicSkillsListTemplate" virtual="true" horizontalAlignment="LEFT" verticalAlignment="CENTER">
+            <Dimensions x="990" y="30"/>
+            <Controls>
+                <Label name="$(parent)Name" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="0" offsetY="0"/>
+                    <Dimensions x="180" y="30"/>
+                </Label>
+
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <Label name="$(parent)Craft6" 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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <Label name="$(parent)Craft3" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
+                    <Dimensions x="24" y="28"/>
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft7" relativePoint="TOPRIGHT" offsetX="10"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </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>
+            </Controls>
+        </Control>
+
+        <Control name="LeoAltholicSkills2ListTemplate" virtual="true" horizontalAlignment="LEFT" verticalAlignment="CENTER">
+            <Dimensions x="990" y="30"/>
+            <Controls>
+                <Label name="$(parent)Name" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="0" offsetY="0"/>
+                    <Dimensions x="180" y="30"/>
+                </Label>
+
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>
+                <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"/>
+                </Label>

+                <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>
             </Controls>
         </Control>

         <Control name="LeoAltholicSkillsRowTemplate" virtual="true" horizontalAlignment="LEFT" verticalAlignment="CENTER">
-            <Dimensions x="880" y="520"/>
+            <Dimensions x="990" y="520"/>
             <Controls>
-                <Backdrop name="$(parent)BG" centerColor="222222" edgeColor="444444" tier="LOW">
+                <Backdrop name="$(parent)BG" centerColor="010101" edgeColor="222222" tier="LOW">
                     <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="2" offsetY="2"/>
-                    <Dimensions x="880" y="520"/>
+                    <Dimensions x="990" y="520"/>
                     <Edge edgeSize="1"/>
                 </Backdrop>

@@ -1073,434 +1634,111 @@
             </Controls>
         </Control>

-        <Control name="LeoAltholicChampionRowTemplate" virtual="true" horizontalAlignment="LEFT" verticalAlignment="CENTER">
-            <Dimensions x="880" y="135"/>
+        <Control name="LeoAltholicChampionListTemplate" virtual="true" horizontalAlignment="LEFT" verticalAlignment="CENTER">
+            <Dimensions x="1000" y="30" />
             <Controls>
-                <Backdrop name="$(parent)BG" centerColor="222222" edgeColor="444444" tier="LOW">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="2" offsetY="2"/>
-                    <Dimensions x="880" y="135"/>
-                    <Edge edgeSize="1"/>
-                </Backdrop>
-
-                <Label name="$(parent)Alliance" mouseEnabled="true" font="ZoFontWinH3" normalColor="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="CENTER" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="10" offsetY="10"/>
-                    <Dimensions x="60" y="75"/>
-                    <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, self.data) </OnMouseEnter>
-                    <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                </Label>
-
-                <Label name="$(parent)Name" mouseEnabled="true" font="ZoFontWinH3" normalColor="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="80" offsetY="20"/>
-                    <Dimensions x="180" y="30"/>
-                </Label>
-
-                <Label name="$(parent)RaceClass" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="80" offsetY="50"/>
-                    <Dimensions x="450" y="30"/>
-                </Label>
-
-                <Button name="$(parent)HealthIcon" mouseEnabled="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="375" offsetY="10"/>
-                    <Dimensions x="25" y="25"/>
-                    <Controls>
-                        <Texture name="$(parent)Texture" textureFile="esoui/art/tutorial/champion_points_health_icon.dds">
-                            <Dimensions y="25" x="25"/>
-                            <Anchor point="128"/>
-                        </Texture>
-                    </Controls>
-                </Button>
-                <Label name="$(parent)Attribute1" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="4"/>
-                    <Dimensions x="100" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc2Label" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="300" offsetY="34"/>
-                    <Dimensions x="100" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc2" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="34"/>
-                    <Dimensions x="100" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc3Label" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="300" offsetY="64"/>
-                    <Dimensions x="100" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc3" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="64"/>
-                    <Dimensions x="100" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc4Label" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="300" offsetY="94"/>
-                    <Dimensions x="100" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc4" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="94"/>
-                    <Dimensions x="100" y="35"/>
-                </Label>
-
-                <Button name="$(parent)MagickaIcon" mouseEnabled="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="575" offsetY="10"/>
-                    <Dimensions x="25" y="25"/>
-                    <Controls>
-                        <Texture name="$(parent)Texture" textureFile="esoui/art/tutorial/champion_points_magicka_icon.dds">
-                            <Dimensions y="25" x="25"/>
-                            <Anchor point="128"/>
-                        </Texture>
-                    </Controls>
-                </Button>
-                <Label name="$(parent)Attribute2" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="610" offsetY="4"/>
-                    <Dimensions x="120" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc5Label" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="34"/>
-                    <Dimensions x="120" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc5" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="610" offsetY="34"/>
-                    <Dimensions x="120" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc6Label" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="64"/>
-                    <Dimensions x="120" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc6" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="610" offsetY="64"/>
-                    <Dimensions x="120" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc7Label" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="94"/>
-                    <Dimensions x="120" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc7" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="610" offsetY="94"/>
-                    <Dimensions x="120" y="35"/>
-                </Label>
-
-                <Button name="$(parent)StaminaIcon" mouseEnabled="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="775" offsetY="10"/>
-                    <Dimensions x="25" y="25"/>
-                    <Controls>
-                        <Texture name="$(parent)Texture" textureFile="esoui/art/tutorial/champion_points_stamina_icon.dds">
-                            <Dimensions y="25" x="25"/>
-                            <Anchor point="128"/>
-                        </Texture>
-                    </Controls>
-                </Button>
-                <Label name="$(parent)Attribute3" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="810" offsetY="4"/>
-                    <Dimensions x="100" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc1Label" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="700" offsetY="34"/>
-                    <Dimensions x="100" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc1" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="810" offsetY="34"/>
-                    <Dimensions x="100" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc8Label" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="700" offsetY="64"/>
-                    <Dimensions x="100" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc8" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="810" offsetY="64"/>
-                    <Dimensions x="100" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc9Label" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="700" offsetY="94"/>
-                    <Dimensions x="100" y="35"/>
-                </Label>
-                <Label name="$(parent)Disc9" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="810" offsetY="94"/>
-                    <Dimensions x="100" y="35"/>
-                </Label>
+                <Texture name="$(parent)BG" inherits="ZO_ThinListBgStrip" />

+                <Label name="$(parent)Name" font="LeoAltholicLargeFont" color="ffffff" verticalAlignment="CENTER" mouseEnabled="true">
+                    <Dimensions x="180" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)BG" relativePoint="TOPLEFT"/>
+                </Label>
+                <Label name="$(parent)Disc234" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" mouseEnabled="true">
+                    <Dimensions x="250" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipChampionSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipChampionSkill(self, false) </OnMouseExit>
+                </Label>
+                <Label name="$(parent)Disc567" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" mouseEnabled="true">
+                    <Dimensions x="250" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Disc234" relativePoint="TOPRIGHT" offsetX="10"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipChampionSkill(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipChampionSkill(self, false) </OnMouseExit>
+                </Label>
+                <Label name="$(parent)Disc891" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" mouseEnabled="true">
+                    <Dimensions x="250" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Disc567" relativePoint="TOPRIGHT" offsetX="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>
             </Controls>
         </Control>

-        <Control name="LeoAltholicInventoryRowTemplate" virtual="true" horizontalAlignment="LEFT" verticalAlignment="CENTER">
-            <Dimensions x="880" y="105"/>
+        <Control name="LeoAltholicInventoryListTemplate" virtual="true" horizontalAlignment="LEFT" verticalAlignment="CENTER">
+            <Dimensions x="990" y="105"/>
             <Controls>
-                <Backdrop name="$(parent)BG" centerColor="222222" edgeColor="444444" tier="LOW">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="2" offsetY="2"/>
-                    <Dimensions x="880" y="105"/>
-                    <Edge edgeSize="1"/>
-                </Backdrop>
-
-                <Label name="$(parent)Alliance" mouseEnabled="true" font="ZoFontWinH3" normalColor="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="CENTER" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="10" offsetY="10"/>
-                    <Dimensions x="60" y="75"/>
-                    <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, self.data) </OnMouseEnter>
-                    <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                </Label>
-
-                <Label name="$(parent)Name" mouseEnabled="true" font="ZoFontWinH3" normalColor="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="80" offsetY="20"/>
-                    <Dimensions x="180" y="30"/>
-                </Label>
-
-                <Label name="$(parent)RaceClass" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="80" offsetY="50"/>
-                    <Dimensions x="450" y="30"/>
+                <Label name="$(parent)Name" font="LeoAltholicLargeFont" color="ffffff" verticalAlignment="CENTER" mouseEnabled="true">
+                    <Dimensions x="180" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT"/>
                 </Label>
-
-                <Texture name="$(parent)BagIcon" textureFile="esoui/art/mainmenu/menubar_inventory_up.dds">
-                    <Dimensions y="30" x="30"/>
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="305" offsetY="4"/>
-                </Texture>
-                <Label name="$(parent)Bag" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="340" offsetY="4"/>
-                    <Dimensions x="100" y="35"/>
-                    <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, "Bag space") </OnMouseEnter>
-                    <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                <Label name="$(parent)Bag" font="LeoAltholicLargeFont" color="ffffff" verticalAlignment="CENTER" mouseEnabled="true">
+                    <Dimensions x="100" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
                 </Label>
-
-                <Texture name="$(parent)SoulGemsIcon" textureFile="esoui/art/currency/currency_seedcrystal_16.dds">
-                    <Dimensions y="20" x="20"/>
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="310" offsetY="40"/>
-                </Texture>
-
-                <Label name="$(parent)SoulGems" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="340" offsetY="34"/>
-                    <Dimensions x="100" y="35"/>
-                    <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, "Soul Gems") </OnMouseEnter>
-                    <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                <Label name="$(parent)Gold" font="LeoAltholicLargeFont" color="ffffff" verticalAlignment="CENTER" mouseEnabled="true">
+                    <Dimensions x="150" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Bag" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
                 </Label>
-
-                <Texture name="$(parent)GoldIcon" textureFile="esoui/art/currency/currency_gold.dds">
-                    <Dimensions y="20" x="20"/>
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="310" offsetY="70"/>
-                </Texture>
-                <Label name="$(parent)Gold" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="340" offsetY="64"/>
-                    <Dimensions x="100" y="35"/>
-                    <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, "Gold") </OnMouseEnter>
-                    <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                <Label name="$(parent)SoulGems" font="LeoAltholicLargeFont" color="ffffff" verticalAlignment="CENTER" mouseEnabled="true">
+                    <Dimensions x="100" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Gold" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
                 </Label>
-
-                <Texture name="$(parent)APIcon" textureFile="esoui/art/currency/alliancepoints.dds">
-                    <Dimensions y="20" x="20"/>
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="450" offsetY="10"/>
-                </Texture>
-                <Label name="$(parent)AP" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="4"/>
-                    <Dimensions x="100" y="35"/>
-                    <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, "Alliance Points") </OnMouseEnter>
-                    <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                <Label name="$(parent)AP" font="LeoAltholicLargeFont" color="ffffff" verticalAlignment="CENTER" mouseEnabled="true">
+                    <Dimensions x="100" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)SoulGems" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
                 </Label>
-
-                <Texture name="$(parent)TelVarIcon" textureFile="esoui/art/currency/currency_telvar.dds">
-                    <Dimensions y="25" x="25"/>
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="450" offsetY="36"/>
-                </Texture>
-                <Label name="$(parent)TelVar" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="34"/>
-                    <Dimensions x="100" y="35"/>
-                    <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, "Tel Var") </OnMouseEnter>
-                    <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                <Label name="$(parent)TelVar" font="LeoAltholicLargeFont" color="ffffff" verticalAlignment="CENTER" mouseEnabled="true">
+                    <Dimensions x="100" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)AP" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
                 </Label>
-
-                <Texture name="$(parent)WritIcon" textureFile="esoui/art/currency/currency_writvoucher.dds">
-                    <Dimensions y="25" x="25"/>
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="450" offsetY="66"/>
-                </Texture>
-                <Label name="$(parent)Writ" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="480" offsetY="64"/>
-                    <Dimensions x="100" y="35"/>
-                    <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, "Writ Vouchers") </OnMouseEnter>
-                    <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
+                <Label name="$(parent)Writ" font="LeoAltholicLargeFont" color="ffffff" verticalAlignment="CENTER" mouseEnabled="true">
+                    <Dimensions x="100" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)TelVar" relativePoint="TOPRIGHT" offsetX="4" offsetY="0"/>
                 </Label>

                 <Button name="$(parent)ListButton" clickSound="Click">
-                    <Anchor point="TOPRIGHT" relativeTo="$(parent)" relativePoint="TOPRIGHT" offsetX="-10" offsetY="35"/>
+                    <Anchor point="TOPRIGHT" relativeTo="$(parent)Writ" relativePoint="TOPRIGHT" offsetX="20" offsetY="-4"/>
                     <Dimensions x="40" y="40"/>
-                    <!--<OnClicked> LeoAltholic.ShowInventoryUI() </OnClicked>-->
                     <Textures normal="/esoui/art/buttons/large_rightarrow_up.dds" mouseOver="/esoui/art/buttons/large_rightarrow_over.dds" />
                 </Button>
             </Controls>
         </Control>

-        <Control name="LeoAltholicResearchRowTemplate" virtual="true" horizontalAlignment="LEFT" verticalAlignment="CENTER">
+        <Control name="LeoAltholicResearchListTemplate" virtual="true" horizontalAlignment="LEFT" verticalAlignment="CENTER">
             <Dimensions x="880" y="260"/>
             <Controls>
-                <Backdrop name="$(parent)BG" centerColor="222222" edgeColor="444444" tier="LOW">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="2" offsetY="2"/>
-                    <Dimensions x="880" y="260"/>
-                    <Edge edgeSize="1"/>
-                </Backdrop>
-
-                <Label name="$(parent)Alliance" mouseEnabled="true" font="ZoFontWinH3" normalColor="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="CENTER" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="10" offsetY="10"/>
-                    <Dimensions x="60" y="75"/>
-                    <OnMouseEnter> ZO_Tooltips_ShowTextTooltip(self, RIGHT, self.data) </OnMouseEnter>
-                    <OnMouseExit> ZO_Tooltips_HideTextTooltip() </OnMouseExit>
-                </Label>
-
-                <Label name="$(parent)Name" mouseEnabled="true" font="ZoFontWinH3" normalColor="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="80" offsetY="20"/>
-                    <Dimensions x="180" y="30"/>
-                </Label>
-
-                <Label name="$(parent)RaceClass" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="80" offsetY="50"/>
-                    <Dimensions x="450" y="30"/>
-                </Label>
-
-                <Backdrop name="$(parent)Craft1BG" centerColor="000000" edgeColor="222222">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="252" offsetY="4"/>
-                    <Dimensions x="260" y="122"/>
-                    <Edge edgeSize="1"/>
-                </Backdrop>
-                <Label name="$(parent)Craft1Label" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="4"/>
-                    <Dimensions x="150" y="35"/>
-                    <OnInitialized>self:SetText(GetString(SI_ITEM_FORMAT_STR_LEVEL))</OnInitialized>
-                </Label>
-                <Label name="$(parent)Craft1Label1" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="34"/>
-                    <Dimensions x="150" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft1Label2" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="64"/>
-                    <Dimensions x="150" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft1Label3" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="94"/>
-                    <Dimensions x="150" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft1" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="4"/>
-                    <Dimensions x="50" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft1Timer1" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="34"/>
-                    <Dimensions x="75" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft1Timer2" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="64"/>
-                    <Dimensions x="75" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft1Timer3" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="94"/>
-                    <Dimensions x="75" y="35"/>
-                </Label>
-
-                <Backdrop name="$(parent)Craft2BG" centerColor="000000" edgeColor="222222">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="252" offsetY="128"/>
-                    <Dimensions x="260" y="122"/>
-                    <Edge edgeSize="1"/>
-                </Backdrop>
-                <Label name="$(parent)Craft2Label" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="124"/>
-                    <Dimensions x="150" y="35"/>
-                    <OnInitialized>self:SetText(GetString(SI_ITEM_FORMAT_STR_LEVEL))</OnInitialized>
-                </Label>
-                <Label name="$(parent)Craft2Label1" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="154"/>
-                    <Dimensions x="150" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft2Label2" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="184"/>
-                    <Dimensions x="150" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft2Label3" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="250" offsetY="214"/>
-                    <Dimensions x="150" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft2" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="124"/>
-                    <Dimensions x="50" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft2Timer1" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="154"/>
-                    <Dimensions x="75" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft2Timer2" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="184"/>
-                    <Dimensions x="75" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft2Timer3" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="410" offsetY="214"/>
-                    <Dimensions x="75" y="35"/>
-                </Label>
-
-                <Backdrop name="$(parent)Craft6BG" centerColor="000000" edgeColor="222222">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="582" offsetY="4"/>
-                    <Dimensions x="260" y="122"/>
-                    <Edge edgeSize="1"/>
-                </Backdrop>
-                <Label name="$(parent)Craft6Label" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="590" offsetY="4"/>
-                    <Dimensions x="150" y="35"/>
-                    <OnInitialized>self:SetText(GetString(SI_ITEM_FORMAT_STR_LEVEL))</OnInitialized>
-                </Label>
-                <Label name="$(parent)Craft6Label1" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="590" offsetY="34"/>
-                    <Dimensions x="150" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft6Label2" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="590" offsetY="64"/>
-                    <Dimensions x="150" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft6Label3" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="590" offsetY="94"/>
-                    <Dimensions x="150" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft6" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="750" offsetY="4"/>
-                    <Dimensions x="75" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft6Timer1" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="750" offsetY="34"/>
-                    <Dimensions x="75" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft6Timer2" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="750" offsetY="64"/>
-                    <Dimensions x="75" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft6Timer3" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="750" offsetY="94"/>
-                    <Dimensions x="75" y="35"/>
-                </Label>
-
-                <Backdrop name="$(parent)Craft7BG" centerColor="000000" edgeColor="222222">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="582" offsetY="128"/>
-                    <Dimensions x="260" y="122"/>
-                    <Edge edgeSize="1"/>
-                </Backdrop>
-                <Label name="$(parent)Craft7Label" mouseEnabled="true" font="ZoFontGame" color="E8DFAF" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="590" offsetY="124"/>
-                    <Dimensions x="150" y="35"/>
-                    <OnInitialized>self:SetText(GetString(SI_ITEM_FORMAT_STR_LEVEL))</OnInitialized>
-                </Label>
-                <Label name="$(parent)Craft7Label1" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="590" offsetY="154"/>
-                    <Dimensions x="150" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft7Label2" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="590" offsetY="184"/>
-                    <Dimensions x="150" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft7Label3" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="RIGHT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="590" offsetY="214"/>
-                    <Dimensions x="150" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft7" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="750" offsetY="124"/>
-                    <Dimensions x="75" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft7Timer1" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="750" offsetY="154"/>
-                    <Dimensions x="75" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft7Timer2" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="750" offsetY="184"/>
-                    <Dimensions x="75" y="35"/>
-                </Label>
-                <Label name="$(parent)Craft7Timer3" mouseEnabled="true" font="ZoFontWinH4" color="ffffff" inheritAlpha="true" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
-                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="750" offsetY="214"/>
-                    <Dimensions x="75" y="35"/>
+                <Label name="$(parent)Name" font="LeoAltholicLargeFont" color="ffffff" verticalAlignment="CENTER" mouseEnabled="true">
+                    <Dimensions x="180" y="32" />
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT"/>
+                </Label>
+
+                <Label name="$(parent)Craft1" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Name" relativePoint="TOPRIGHT" offsetX="10" offsetY="0"/>
+                    <Dimensions x="200" y="35"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipResearch(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipResearch(self, false) </OnMouseExit>
+                </Label>
+                <Label name="$(parent)Craft2" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft1" relativePoint="TOPRIGHT" offsetX="10" offsetY="0"/>
+                    <Dimensions x="200" y="35"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipResearch(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipResearch(self, false) </OnMouseExit>
+                </Label>
+                <Label name="$(parent)Craft6" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft2" relativePoint="TOPRIGHT" offsetX="10" offsetY="0"/>
+                    <Dimensions x="200" y="35"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipResearch(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipResearch(self, false) </OnMouseExit>
+                </Label>
+                <Label name="$(parent)Craft7" mouseEnabled="true" font="LeoAltholicLargeFont" verticalAlignment="CENTER" horizontalAlignment="LEFT" resizeToFitDescendents="false">
+                    <Anchor point="TOPLEFT" relativeTo="$(parent)Craft6" relativePoint="TOPRIGHT" offsetX="10" offsetY="0"/>
+                    <Dimensions x="200" y="35"/>
+                    <OnMouseEnter> LeoAltholicUI.TooltipResearch(self, true) </OnMouseEnter>
+                    <OnMouseExit> LeoAltholicUI.TooltipResearch(self, false) </OnMouseExit>
                 </Label>

             </Controls>
diff --git a/LeoAltholicInit.lua b/LeoAltholicInit.lua
new file mode 100644
index 0000000..89e76bf
--- /dev/null
+++ b/LeoAltholicInit.lua
@@ -0,0 +1,8 @@
+
+LeoAltholic = LeoAltholic or {}
+LeoAltholicUI = LeoAltholicUI or {}
+
+LeoAltholic.name = "LeoAltholic"
+LeoAltholic.displayName = "Leo's Altholic"
+LeoAltholic.version = "1.2.5"
+LeoAltholic.chatPrefix = "|c39B027" .. LeoAltholic.name .. "|r: "
diff --git a/LeoAltholicUI.lua b/LeoAltholicUI.lua
index 3a3378c..b1de69b 100644
--- a/LeoAltholicUI.lua
+++ b/LeoAltholicUI.lua
@@ -26,11 +26,11 @@ function LeoAltholic.ChangeInventoryUI(bagId)
     LeoAltholic.ShowInventoryUI(LeoAltholic.listingInventoryFor, bagId)
 end

-function LeoAltholic.ShowInventoryUI(charId, bagId)
-    LeoAltholic.listingInventoryFor = charId
+function LeoAltholic.ShowInventoryUI(charName, bagId)
+    LeoAltholic.listingInventoryFor = charName
     SCENE_MANAGER:ShowTopLevel(LeoAltholicInventoryWindow)
     LeoAltholicInventoryWindow:SetHidden(false)
-    local char = LeoAltholic.GetCharacters()[charId]
+    local char = LeoAltholic.GetCharByName(charName)
     local sc = WINDOW_MANAGER:GetControlByName("LeoAltholicInventoryWindowListScrollChild")
     sc:SetHidden(false)

@@ -115,8 +115,8 @@ function LeoAltholic.InitializeCharacterFrames()
             local bg
             local row
             local control
-            if panel == "Daily" then
-                local sc = WINDOW_MANAGER:GetControlByName("LeoAltholicWindowDailyPanel")
+            if panel == "Writs" then
+                local sc = WINDOW_MANAGER:GetControlByName("LeoAltholicWindowWritsPanel")
                 row = CreateControlFromVirtual("LeoAltholic"..panel.."Row" .. x, sc, "LeoAltholic"..panel.."RowTemplate")
                 row:SetAnchor(TOPLEFT,sc,TOPLEFT,0,22 + ((x - 1) * 40))
                 bg = row:GetNamedChild("BG")
@@ -252,29 +252,29 @@ function LeoAltholic.InitializeCharacterFrames()
                     control = row:GetNamedChild("Racial1Rank")
                     control:SetText(char.skills.racial[1].rank)
                 end
-            elseif panel == "Daily" then
-                if char.quests ~= nil and char.quests.tracked ~= nil then
+            elseif panel == "Writs" then
+                if char.quests ~= nil and char.quests.writs ~= nil then
                     for _, craft in pairs({CRAFTING_TYPE_ALCHEMY,CRAFTING_TYPE_BLACKSMITHING,CRAFTING_TYPE_CLOTHIER,CRAFTING_TYPE_ENCHANTING,CRAFTING_TYPE_JEWELRYCRAFTING,CRAFTING_TYPE_PROVISIONING,CRAFTING_TYPE_WOODWORKING}) do
                         control = row:GetNamedChild("Craft"..craft.."Status")
                         local shown = false
                         for i = 1, 10 do
-                            if shown == false and char.quests.tracked[i] ~= nil and char.quests.tracked[i].questType == QUEST_TYPE_CRAFTING then
+                            if shown == false and char.quests.writs[i] ~= nil then
                                 local color = {1,0,0,1}
                                 if
-                                (craft == CRAFTING_TYPE_ALCHEMY and string.find(zo_strformat("<<z:1>>",char.quests.tracked[i].name), zo_strformat("<<z:1>>",GetString(LEOALT_ALCHEMIST)))) or
-                                (craft == CRAFTING_TYPE_BLACKSMITHING and string.find(zo_strformat("<<z:1>>",char.quests.tracked[i].name), zo_strformat("<<z:1>>",GetString(LEOALT_BLACKSMITH)))) or
-                                (craft == CRAFTING_TYPE_CLOTHIER and string.find(zo_strformat("<<z:1>>",char.quests.tracked[i].name), zo_strformat("<<z:1>>",GetString(LEOALT_CLOTHIER)))) or
-                                (craft == CRAFTING_TYPE_ENCHANTING and string.find(zo_strformat("<<z:1>>",char.quests.tracked[i].name), zo_strformat("<<z:1>>",GetString(LEOALT_ENCHANTER)))) or
-                                (craft == CRAFTING_TYPE_JEWELRYCRAFTING and string.find(zo_strformat("<<z:1>>",char.quests.tracked[i].name), zo_strformat("<<z:1>>",GetString(LEOALT_JEWELRY)))) or
-                                (craft == CRAFTING_TYPE_PROVISIONING and string.find(zo_strformat("<<z:1>>",char.quests.tracked[i].name), zo_strformat("<<z:1>>",GetString(LEOALT_PROVISIONER)))) or
-                                (craft == CRAFTING_TYPE_WOODWORKING and string.find(zo_strformat("<<z:1>>",char.quests.tracked[i].name), zo_strformat("<<z:1>>",GetString(LEOALT_WOODWORKER)))) then
-                                    if char.quests.tracked[i].lastDone ~= nil and char.quests.tracked[i].lastDone > LeoAltholic.TodayReset() then
+                                (craft == CRAFTING_TYPE_ALCHEMY and string.find(zo_strformat("<<z:1>>",char.quests.writs[i].name), zo_strformat("<<z:1>>",GetString(LEOALT_ALCHEMIST)))) or
+                                (craft == CRAFTING_TYPE_BLACKSMITHING and string.find(zo_strformat("<<z:1>>",char.quests.writs[i].name), zo_strformat("<<z:1>>",GetString(LEOALT_BLACKSMITH)))) or
+                                (craft == CRAFTING_TYPE_CLOTHIER and string.find(zo_strformat("<<z:1>>",char.quests.writs[i].name), zo_strformat("<<z:1>>",GetString(LEOALT_CLOTHIER)))) or
+                                (craft == CRAFTING_TYPE_ENCHANTING and string.find(zo_strformat("<<z:1>>",char.quests.writs[i].name), zo_strformat("<<z:1>>",GetString(LEOALT_ENCHANTER)))) or
+                                (craft == CRAFTING_TYPE_JEWELRYCRAFTING and string.find(zo_strformat("<<z:1>>",char.quests.writs[i].name), zo_strformat("<<z:1>>",GetString(LEOALT_JEWELRY)))) or
+                                (craft == CRAFTING_TYPE_PROVISIONING and string.find(zo_strformat("<<z:1>>",char.quests.writs[i].name), zo_strformat("<<z:1>>",GetString(LEOALT_PROVISIONER)))) or
+                                (craft == CRAFTING_TYPE_WOODWORKING and string.find(zo_strformat("<<z:1>>",char.quests.writs[i].name), zo_strformat("<<z:1>>",GetString(LEOALT_WOODWORKER)))) then
+                                    if char.quests.writs[i].lastDone ~= nil and char.quests.writs[i].lastDone > LeoAltholic.TodayReset() then
                                         color = {0,1,0,1}
                                     end
                                     control:SetTexture("esoui/art/buttons/accept_up.dds")
                                     control:SetColor(unpack(color))
-                                    if char.quests.tracked[i].lastDone ~= nil then
-                                        local diff = GetTimeStamp() - char.quests.tracked[i].lastDone
+                                    if char.quests.writs[i].lastDone ~= nil then
+                                        local diff = GetTimeStamp() - char.quests.writs[i].lastDone
                                         if diff < 3600 then
                                             control.data = zo_strformat(GetString(LEOALT_MINUTES_AGO),  math.floor(diff / 60))
                                         elseif diff < 86400 then
@@ -317,39 +317,6 @@ function LeoAltholic.GetTime(seconds)
     else return '|cFF4020'..GetString(LEOALT_FINISHED)..'|r' end
 end

-function LeoAltholic.TooltipChampionSkill(control, visible, charId, attribute, discipline)
-
-    if visible then
-        if not parent then parent = control end
-
-        control.text = InformationTooltip
-        InitializeTooltip(control.text,control,2,1,0,8)
-
-        local char = LeoAltholic.GetCharacters()[charId]
-        local added = false
-        for j = 1, GetNumChampionDisciplineSkills(discipline) do
-            local skillName = GetChampionSkillName(discipline, j)
-            local points = char.champion[attribute].disciplines[discipline].skills[j]
-            if type(points) == 'number' and points > 0 then
-                control.text:AddLine("|cE8DFAF" .. skillName .. "|r " .. points)
-                added = true
-            elseif points == true then
-                control.text:AddLine("|cE8DFAF" .. skillName .. "|r |c21A121"..GetString(LEOALT_UNLOCKED).."|r")
-                added = true
-            end
-        end
-        if added then
-            control.text:SetHidden(false)
-        else
-            control.text:SetHidden(true)
-        end
-    else
-        ClearTooltip(control.text)
-        control.text:SetHidden(true)
-        control.text = nil
-    end
-end
-
 function LeoAltholic.TooltipSkill(control, visible, charId, line, lineId)

     if visible then
@@ -386,16 +353,42 @@ local function formatNumber(amount)
     return FormatIntegerWithDigitGrouping( amount, GetString( SI_DIGIT_GROUP_SEPARATOR ) )
 end

+function LeoAltholicUI.InitPanels()
+    LeoAltholicUI.bioList = LeoAltholicBioList:New(LeoAltholicWindowBioPanelListScroll)
+    LeoAltholicUI.bioList:RefreshData()
+
+    LeoAltholicUI.statsList = LeoAltholicStatsList:New(LeoAltholicWindowStatsPanelListScroll)
+    LeoAltholicUI.statsList:RefreshData()
+
+    LeoAltholicUI.championList = LeoAltholicChampionList:New(LeoAltholicWindowChampionPanelListScroll)
+    LeoAltholicUI.championList:RefreshData()
+
+    LeoAltholicUI.skillsList = LeoAltholicSkillsList:New(LeoAltholicWindowSkillsPanelListScroll)
+    LeoAltholicUI.skillsList:RefreshData()
+
+    LeoAltholicUI.skills2List = LeoAltholicSkills2List:New(LeoAltholicWindowSkills2PanelListScroll)
+    LeoAltholicUI.skills2List:RefreshData()
+
+    LeoAltholicUI.writsList = LeoAltholicWritsList:New(LeoAltholicWindowWritsPanelListScroll)
+    LeoAltholicUI.writsList:RefreshData()
+
+    LeoAltholicUI.invList = LeoAltholicInventoryList:New(LeoAltholicWindowInventoryPanelListScroll)
+    LeoAltholicUI.invList:RefreshData()
+
+    LeoAltholicUI.researchList = LeoAltholicResearchList:New(LeoAltholicWindowResearchPanelListScroll)
+    LeoAltholicUI.researchList:RefreshData()
+
+    LeoAltholicUI.InitTrackedPanel()
+end
+
 function LeoAltholic.DisplayCharacterFrames()
     local control
     for _,panel in ipairs(LeoAltholic.panelList) do
-        if panel ~= "Daily" then
+        if panel ~= "Writs" then
             control = WINDOW_MANAGER:GetControlByName('LeoAltholicWindow' .. panel .. 'PanelScrollChild')
             control:SetHeight(#LeoAltholic.GetCharacters() * 109)
         end
     end
-    control = WINDOW_MANAGER:GetControlByName('LeoAltholicWindowChampionPanelScrollChild')
-    control:SetHeight(#LeoAltholic.GetCharacters() * 139)
     control = WINDOW_MANAGER:GetControlByName('LeoAltholicWindowTrackedPanelScrollChild')
     control:SetHeight(#LeoAltholic.GetCharacters() * 169)
     control = WINDOW_MANAGER:GetControlByName('LeoAltholicWindowResearchPanelScrollChild')
@@ -411,7 +404,7 @@ function LeoAltholic.DisplayCharacterFrames()
             control = row:GetNamedChild("Name")
             control:SetText(char.bio.name)

-            if panel ~= "Daily" then
+            if panel ~= "Writs" then
                 control = row:GetNamedChild("Alliance")
                 local icon = ZO_GetAllianceIcon(char.bio.alliance.id)
                 control:SetText("|cF1FF77|t50:90:" .. icon .. "|t|r ")
@@ -422,70 +415,10 @@ function LeoAltholic.DisplayCharacterFrames()
             end
         end

-        local row = WINDOW_MANAGER:GetControlByName('LeoAltholicBioRow'..x)
-
-        control = row:GetNamedChild("Level")
-        if char.bio.isChampion then
-            control:SetText("|t24:24:esoui/art/champion/champion_icon.dds|t" .. char.bio.championPoints)
-        else
-            control:SetText(char.bio.level)
-        end
-
-        control = row:GetNamedChild("AllianceRank")
-        control:SetText(GetAvARankName(char.bio.gender, char.bio.alliance.rank))
-        control = row:GetNamedChild("AttributePoints")
-        control:SetText(char.attributes.unspent)
-        control = row:GetNamedChild("Played")
-        control:SetText(LeoAltholic.GetTime(char.secondsPlayed))
-        control = row:GetNamedChild("Bounty")
-        control:SetText(char.bounty .. " |t14:14:esoui/art/currency/currency_gold.dds|t")
-
-        local riding = '|t20:20:esoui/art/mounts/ridingskill_speed.dds|t ' .. char.attributes.riding.speed .. '%' ..
-                ' |t20:20:esoui/art/mounts/ridingskill_stamina.dds|t ' .. char.attributes.riding.stamina ..
-                ' |t20:20:esoui/art/mounts/ridingskill_capacity.dds|t ' .. char.attributes.riding.capacity ..
-                ' |t22:22:esoui/art/miscellaneous/timer_32.dds|t ' .. LeoAltholic.GetTime(char.attributes.riding.time - GetTimeStamp())
-        control = row:GetNamedChild("Riding")
-        control:SetText(riding)
-
-
-        row = WINDOW_MANAGER:GetControlByName('LeoAltholicStatsRow'..x)
-
-        control = row:GetNamedChild("AttributePoints")
-        control:SetText("|c596cfd" .. char.attributes.magicka.points .. "|r / |cCB110E" .. char.attributes.health.points .. "|r / |c21A121" .. char.attributes.stamina.points .. "|r")
-
-        control = row:GetNamedChild("MaxAttributes")
-        control:SetText("|c596cfd" .. char.attributes.magicka.max .. "|r / |cCB110E" .. char.attributes.health.max .. "|r / |c21A121" .. char.attributes.stamina.max .. "|r")
-
-        control = row:GetNamedChild("RecoveryAttributes")
-        control:SetText("|c596cfd" .. char.attributes.magicka.recovery .. "|r / |cCB110E" .. char.attributes.health.recovery .. "|r / |c21A121" .. char.attributes.stamina.recovery .. "|r")
-
-        control = row:GetNamedChild("SpellPoints")
-        control:SetText(string.format("%.1f%%", char.attributes.spell.criticalChance))
-
-        control = row:GetNamedChild("WeaponPoints")
-        control:SetText(string.format("%.1f%%", char.attributes.weapon.criticalChance))
-
-        row = WINDOW_MANAGER:GetControlByName('LeoAltholicChampionRow'..x)
-        for _, attribute in ipairs({ATTRIBUTE_MAGICKA, ATTRIBUTE_HEALTH, ATTRIBUTE_STAMINA}) do
-            control = row:GetNamedChild("Attribute" .. attribute)
-            local total = char.champion[attribute].spent + char.champion[attribute].unspent
-            local color = '|c21A121'
-            if char.champion[attribute].unspent > 0 then
-                color = '|cCB110E'
-            end
-            control:SetText(color .. char.champion[attribute].spent .. '/' .. total .. '|r')
-        end
-
-        for i = 1, GetNumChampionDisciplines() do
-            local dAttribute = GetChampionDisciplineAttribute(i)
-            control = row:GetNamedChild("Disc" .. i)
-            control:SetText(char.champion[dAttribute].disciplines[i].spent)
-        end
-
         if char.quests ~= nil and char.quests.tracked ~= nil then
             row = WINDOW_MANAGER:GetControlByName('LeoAltholicTrackedRow'..x)
             for i = 1, 10 do
-                if char.quests.tracked[i] ~= nil and char.quests.tracked[i].questType ~= QUEST_TYPE_CRAFTING then
+                if char.quests.tracked[i] ~= nil then
                     local label = row:GetNamedChild("Quest" .. i .. "Label")
                     local done = row:GetNamedChild("Quest" .. i .. "Done")
                     label:SetText(char.quests.tracked[i].name)
diff --git a/ui/bio.lua b/ui/bio.lua
new file mode 100644
index 0000000..ca5aa4d
--- /dev/null
+++ b/ui/bio.lua
@@ -0,0 +1,141 @@
+
+LeoAltholicBioList = ZO_SortFilterList:Subclass()
+function LeoAltholicBioList:New(control)
+
+    ZO_SortFilterList.InitializeSortFilterList(self, control)
+
+    local sorterKeys =
+    {
+        ["name"] = {},
+        ["level"] = { tiebreaker = "name"},
+        ["race"] = { tiebreaker = "level"},
+        ["class"] = { tiebreaker = "race"},
+        ["alliance"] = { tiebreaker = "class"},
+        ["riding"] = { tiebreaker = "alliance"},
+    }
+
+    self.masterList = {}
+    self.currentSortKey = "name"
+    self.currentSortOrder = ZO_SORT_ORDER_UP
+    ZO_ScrollList_AddDataType(self.list, 1, "LeoAltholicBioListTemplate", 32, function(control, data) self:SetupEntry(control, data) end)
+
+    self.sortFunction = function(listEntry1, listEntry2)
+        return ZO_TableOrderingFunction(listEntry1.data, listEntry2.data, self.currentSortKey, sorterKeys, self.currentSortOrder)
+    end
+
+    return self
+end
+
+function LeoAltholicBioList:SetupEntry(control, data)
+
+    control.data = data
+
+    control.name = GetControl(control, "Name")
+    control.name:SetText(data.name)
+
+    control.level = GetControl(control, "Level")
+    if data.isChampion then
+        control.level:SetText("|t24:24:esoui/art/champion/champion_icon.dds|t" .. data.championPoints)
+    else
+        control.level:SetText(data.level)
+    end
+
+    control.race = GetControl(control, "Race")
+    control.race:SetText(data.race)
+
+    control.class = GetControl(control, "Class")
+    control.class:SetText(data.class)
+
+    control.alliance = GetControl(control, "Alliance")
+    --local icon = ZO_GetAllianceIcon(data.alliance.id)
+    local color, icon
+    if data.alliance.id == 1 then
+        --color = 'F1FF77'
+        icon = 'esoui/art/guild/guildbanner_icon_aldmeri.dds'
+    elseif data.alliance.id == 2 then
+        --color = 'FF7D77'
+        icon = 'esoui/art/guild/guildbanner_icon_ebonheart.dds'
+    elseif data.alliance.id == 3 then
+        --color = '779CFF'
+        icon = 'esoui/Art/guild/guildbanner_icon_daggerfall.dds'
+    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.riding = GetControl(control, "Riding")
+    local riding = '|t20:20:esoui/art/mounts/ridingskill_speed.dds|t ' .. data.riding.speed .. '%' ..
+            ' |t20:20:esoui/art/mounts/ridingskill_stamina.dds|t ' .. data.riding.stamina ..
+            ' |t20:20:esoui/art/mounts/ridingskill_capacity.dds|t ' .. data.riding.capacity ..
+            ' |t22:22:esoui/art/miscellaneous/timer_32.dds|t ' .. LeoAltholic.GetTime(data.riding.time - GetTimeStamp())
+    control.riding:SetText(riding)
+
+    ZO_SortFilterList.SetupRow(self, control, data)
+end
+
+function LeoAltholicBioList:ColorRow(control, data, mouseIsOver)
+
+    local color = ZO_SECOND_CONTRAST_TEXT
+    local r, g, b = GetInterfaceColor(INTERFACE_COLOR_TYPE_ITEM_QUALITY_COLORS, ITEM_QUALITY_MAGIC)
+
+    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())
+        end
+    end
+end
+
+function LeoAltholicBioList:BuildMasterList()
+    self.masterList = {}
+    local list = LeoAltholic.ExportCharacters()
+    for k, v in ipairs(list) do
+        local data = {
+            name = v.bio.name,
+            level = v.bio.level,
+            championPoints = v.bio.championPoints,
+            isChampion = v.bio.isChampion,
+            race = v.bio.race,
+            class = v.bio.class,
+            alliance = v.bio.alliance,
+            riding = v.attributes.riding
+        }
+        data.queueIndex = k
+        table.insert(self.masterList, data)
+    end
+end
+
+function LeoAltholicBioList:SortScrollList()
+    local scrollData = ZO_ScrollList_GetDataList(self.list)
+    if self.currentSortKey == "alliance" then
+        table.sort(scrollData, function(listEntry1, listEntry2)
+            if self.currentSortOrder == ZO_SORT_ORDER_UP then
+                return listEntry1.data.alliance.name < listEntry2.data.alliance.name
+            else
+                return listEntry1.data.alliance.name > listEntry2.data.alliance.name
+            end
+        end)
+    elseif self.currentSortKey == "riding" then
+        table.sort(scrollData, function(listEntry1, listEntry2)
+            local sum1 = listEntry1.data.riding.speed + listEntry1.data.riding.stamina + listEntry1.data.riding.capacity
+            local sum2 = listEntry2.data.riding.speed + listEntry2.data.riding.stamina + listEntry2.data.riding.capacity
+            if self.currentSortOrder == ZO_SORT_ORDER_UP then
+                return sum1 < sum2
+            else
+                return sum1 > sum2
+            end
+        end)
+    else
+        table.sort(scrollData, self.sortFunction)
+    end
+end
+
+function LeoAltholicBioList:FilterScrollList()
+    local scrollData = ZO_ScrollList_GetDataList(self.list)
+    ZO_ClearNumericallyIndexedTable(scrollData)
+    for i = 1, #self.masterList do
+        local data = self.masterList[i]
+        table.insert(scrollData, ZO_ScrollList_CreateDataEntry(1, data))
+    end
+end
diff --git a/ui/champion.lua b/ui/champion.lua
new file mode 100644
index 0000000..7785da3
--- /dev/null
+++ b/ui/champion.lua
@@ -0,0 +1,131 @@
+
+LeoAltholicChampionList = ZO_SortFilterList:Subclass()
+function LeoAltholicChampionList:New(control)
+
+    ZO_SortFilterList.InitializeSortFilterList(self, control)
+
+    local sorterKeys =
+    {
+        ["name"] = {},
+    }
+
+    self.masterList = {}
+    self.currentSortKey = "name"
+    self.currentSortOrder = ZO_SORT_ORDER_UP
+    ZO_ScrollList_AddDataType(self.list, 1, "LeoAltholicChampionListTemplate", 32, function(control, data) self:SetupEntry(control, data) end)
+
+    self.sortFunction = function(listEntry1, listEntry2)
+        return ZO_TableOrderingFunction(listEntry1.data, listEntry2.data, self.currentSortKey, sorterKeys, self.currentSortOrder)
+    end
+
+    return self
+end
+
+function LeoAltholicChampionList:SetupEntry(control, data)
+
+    control.data = data
+
+    control.name = GetControl(control, "Name")
+    control.name:SetText(data.name)
+
+    local total, color
+
+    control.disc234 = GetControl(control, "Disc234")
+    total = data.champion[ATTRIBUTE_HEALTH].spent + data.champion[ATTRIBUTE_HEALTH].unspent
+    color = '|c21A121'
+    if data.champion[ATTRIBUTE_HEALTH].unspent > 0 then
+        color = '|cCB110E'
+    end
+    control.disc234:SetText("|t24:24:esoui/art/tutorial/champion_points_health_icon.dds|t "..color .. data.champion[ATTRIBUTE_HEALTH].spent .. '/' .. total .. '|r    ' .. data.champion[ATTRIBUTE_HEALTH].disciplines[2].spent .." / ".. data.champion[ATTRIBUTE_HEALTH].disciplines[3].spent .." / ".. data.champion[ATTRIBUTE_HEALTH].disciplines[4].spent)
+    control.disc234.champion = data.champion
+    control.disc234.attribute = ATTRIBUTE_HEALTH
+
+    control.disc567 = GetControl(control, "Disc567")
+    total = data.champion[ATTRIBUTE_MAGICKA].spent + data.champion[ATTRIBUTE_MAGICKA].unspent
+    color = '|c21A121'
+    if data.champion[ATTRIBUTE_MAGICKA].unspent > 0 then
+        color = '|cCB110E'
+    end
+    control.disc567:SetText("|t24:24:esoui/art/tutorial/champion_points_magicka_icon.dds|t "..color .. data.champion[ATTRIBUTE_MAGICKA].spent .. '/' .. total .. '|r    ' .. data.champion[ATTRIBUTE_MAGICKA].disciplines[5].spent .." / ".. data.champion[ATTRIBUTE_MAGICKA].disciplines[6].spent .." / ".. data.champion[ATTRIBUTE_MAGICKA].disciplines[7].spent)
+    control.disc567.champion = data.champion
+    control.disc567.attribute = ATTRIBUTE_MAGICKA
+
+    control.disc891 = GetControl(control, "Disc891")
+    total = data.champion[ATTRIBUTE_STAMINA].spent + data.champion[ATTRIBUTE_STAMINA].unspent
+    color = '|c21A121'
+    if data.champion[ATTRIBUTE_STAMINA].unspent > 0 then
+        color = '|cCB110E'
+    end
+    control.disc891:SetText("|t24:24:esoui/art/tutorial/champion_points_stamina_icon.dds|t "..color .. data.champion[ATTRIBUTE_STAMINA].spent .. '/' .. total .. '|r    ' .. data.champion[ATTRIBUTE_STAMINA].disciplines[8].spent .." / ".. data.champion[ATTRIBUTE_STAMINA].disciplines[9].spent .." / ".. data.champion[ATTRIBUTE_STAMINA].disciplines[1].spent)
+    control.disc891.champion = data.champion
+    control.disc891.attribute = ATTRIBUTE_STAMINA
+
+    ZO_SortFilterList.SetupRow(self, control, data)
+end
+
+function LeoAltholicChampionList:BuildMasterList()
+    self.masterList = {}
+    local list = LeoAltholic.ExportCharacters()
+    for k, v in ipairs(list) do
+        local data = {
+            name = v.bio.name,
+            champion = v.champion
+        }
+        data.queueIndex = k
+        table.insert(self.masterList, data)
+    end
+end
+
+function LeoAltholicChampionList:SortScrollList()
+    local scrollData = ZO_ScrollList_GetDataList(self.list)
+    table.sort(scrollData, self.sortFunction)
+end
+
+function LeoAltholicChampionList:FilterScrollList()
+    local scrollData = ZO_ScrollList_GetDataList(self.list)
+    ZO_ClearNumericallyIndexedTable(scrollData)
+    for i = 1, #self.masterList do
+        local data = self.masterList[i]
+        table.insert(scrollData, ZO_ScrollList_CreateDataEntry(1, data))
+    end
+end
+
+local function addLine(tooltip, text, color)
+    if not color then color = ZO_TOOLTIP_DEFAULT_COLOR 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_SELECTED_TEXT 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.TooltipChampionSkill(control, visible)
+
+    if visible then
+        if not parent then parent = control end
+
+        InitializeTooltip(InformationTooltip, control, LEFT, 5, 0)
+
+        local start = 2+(control.attribute-1)*3
+        for i=start, start+2 do
+            if i == 10 then i = 1 end -- the lord exception
+            addLineTitle(InformationTooltip, GetChampionDisciplineName(i).." "..control.champion[control.attribute].disciplines[i].spent)
+            for j = 1, GetNumChampionDisciplineSkills(i) do
+                local skillName = GetChampionSkillName(i, j)
+                local points = control.champion[control.attribute].disciplines[i].skills[j]
+                if type(points) == 'number' and points > 0 then
+                    addLine(InformationTooltip, "|cE8DFAF" .. skillName .. "|r " .. points)
+                elseif points == true then
+                    addLine(InformationTooltip, "|cE8DFAF" .. skillName .. "|r |c21A121"..GetString(LEOALT_UNLOCKED).."|r")
+                end
+            end
+        end
+        InformationTooltip:SetHidden(false)
+    else
+        ClearTooltip(InformationTooltip)
+        InformationTooltip:SetHidden(true)
+    end
+end
diff --git a/ui/inventory.lua b/ui/inventory.lua
new file mode 100644
index 0000000..e4afd1f
--- /dev/null
+++ b/ui/inventory.lua
@@ -0,0 +1,141 @@
+
+
+LeoAltholicInventoryList = ZO_SortFilterList:Subclass()
+function LeoAltholicInventoryList:New(control)
+
+    ZO_SortFilterList.InitializeSortFilterList(self, control)
+
+    local sorterKeys =
+    {
+        ["name"] = {},
+        ["bag"] = { tiebreaker = "name" },
+        ["gold"] = { tiebreaker = "name" },
+        ["soulgems"] = { tiebreaker = "name" },
+        ["ap"] = { tiebreaker = "name" },
+        ["telvar"] = { tiebreaker = "name" },
+        ["writvouchers"] = { tiebreaker = "name" },
+    }
+
+    self.masterList = {}
+    self.currentSortKey = "name"
+    self.currentSortOrder = ZO_SORT_ORDER_UP
+    ZO_ScrollList_AddDataType(self.list, 1, "LeoAltholicInventoryListTemplate", 32, function(control, data) self:SetupEntry(control, data) end)
+
+    self.sortFunction = function(listEntry1, listEntry2)
+        return ZO_TableOrderingFunction(listEntry1.data, listEntry2.data, self.currentSortKey, sorterKeys, self.currentSortOrder)
+    end
+
+    return self
+end
+
+local function formatNumber(amount)
+    if amount == nil then return nil; end
+    if type(amount) == "string" then amount = tonumber( amount ) end
+    if type(amount) ~= "number" then return amount; end
+    if amount < 1000 then return amount; end
+    return FormatIntegerWithDigitGrouping( amount, GetString( SI_DIGIT_GROUP_SEPARATOR ) )
+end
+
+function LeoAltholicInventoryList:SetupEntry(control, data)
+
+    control.data = data
+
+    control.name = GetControl(control, "Name")
+    control.name:SetText(data.name)
+
+    local color = '|c21A121'
+    if data.inventory.free <= 25 then color = '|c596cfd' end
+    if data.inventory.free <= 10 then color = '|cCB110E' end
+    control.bag = GetControl(control, "Bag")
+    control.bag:SetText(color .. data.inventory.used .. "|r / " .. data.inventory.size)
+
+    control.soulgems = GetControl(control, "SoulGems")
+    control.soulgems:SetText("|c21A121" .. data.inventory.soulGemFilled .. '|r / ' .. data.inventory.soulGemEmpty)
+
+    control.gold = GetControl(control, "Gold")
+    control.gold:SetText(formatNumber(data.inventory.gold))
+
+    control.ap = GetControl(control, "AP")
+    control.ap:SetText(formatNumber(data.inventory.ap))
+
+    control.telvar = GetControl(control, "TelVar")
+    control.telvar:SetText(formatNumber(data.inventory.telvar))
+
+    control.writVouchers = GetControl(control, "Writ")
+    control.writVouchers:SetText(formatNumber(data.inventory.writVoucher))
+
+    control.listButton = GetControl(control, "ListButton")
+    control.listButton:SetHandler('OnClicked', function() LeoAltholic.ShowInventoryUI(data.name, BAG_BACKPACK) end)
+
+    ZO_SortFilterList.SetupRow(self, control, data)
+end
+
+function LeoAltholicStatsList:ColorRow(control, data, mouseIsOver)
+
+    local color = ZO_SECOND_CONTRAST_TEXT
+    local r, g, b = GetInterfaceColor(INTERFACE_COLOR_TYPE_ITEM_QUALITY_COLORS, ITEM_QUALITY_MAGIC)
+
+    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())
+        end
+    end
+end
+
+function LeoAltholicInventoryList:ColorRow(control, data, mouseIsOver)
+
+    local color = ZO_SECOND_CONTRAST_TEXT
+    local r, g, b = GetInterfaceColor(INTERFACE_COLOR_TYPE_ITEM_QUALITY_COLORS, ITEM_QUALITY_MAGIC)
+
+    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())
+            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)
+            end
+        end
+    end
+end
+
+function LeoAltholicInventoryList:BuildMasterList()
+    self.masterList = {}
+    local list = LeoAltholic.ExportCharacters()
+    for k, v in ipairs(list) do
+        local data = {
+            name = v.bio.name,
+            inventory = v.inventory
+        }
+        data.queueIndex = k
+        table.insert(self.masterList, data)
+    end
+end
+
+function LeoAltholicInventoryList:SortScrollList()
+    local scrollData = ZO_ScrollList_GetDataList(self.list)
+    table.sort(scrollData, self.sortFunction)
+end
+
+function LeoAltholicInventoryList:FilterScrollList()
+    local scrollData = ZO_ScrollList_GetDataList(self.list)
+    ZO_ClearNumericallyIndexedTable(scrollData)
+    for i = 1, #self.masterList do
+        local data = self.masterList[i]
+        table.insert(scrollData, ZO_ScrollList_CreateDataEntry(1, data))
+    end
+end
diff --git a/ui/research.lua b/ui/research.lua
new file mode 100644
index 0000000..9793bfd
--- /dev/null
+++ b/ui/research.lua
@@ -0,0 +1,166 @@
+
+LeoAltholicResearchList = ZO_SortFilterList:Subclass()
+function LeoAltholicResearchList:New(control)
+
+    ZO_SortFilterList.InitializeSortFilterList(self, control)
+
+    local sorterKeys =
+    {
+        ["name"] = {}
+    }
+
+    self.masterList = {}
+    self.currentSortKey = "name"
+    self.currentSortOrder = ZO_SORT_ORDER_UP
+    ZO_ScrollList_AddDataType(self.list, 1, "LeoAltholicResearchListTemplate", 32, function(control, data) self:SetupEntry(control, data) end)
+
+    self.sortFunction = function(listEntry1, listEntry2)
+        return ZO_TableOrderingFunction(listEntry1.data, listEntry2.data, self.currentSortKey, sorterKeys, self.currentSortOrder)
+    end
+
+    return self
+end
+
+function LeoAltholicResearchList:SetupEntry(control, data)
+
+    control.data = data
+
+    control.name = GetControl(control, "Name")
+    control.name:SetText(data.name)
+
+    local color
+    control.craft = {}
+    for _,craft in pairs(LeoAltholic.craftResearch) do
+        local i = 1
+        local researching = 0
+        control.craft[craft] = GetControl(control, "Craft" .. craft)
+        local lowest = -1
+        local list = {}
+        for line = 1, GetNumSmithingResearchLines(craft) do
+            local lineName, lineIcon = GetSmithingResearchLineInfo(craft, line)
+            for trait = 1, LeoAltholic.maxTraits do
+                local traitType = GetSmithingResearchLineTraitInfo(craft, line, trait)
+                local traitName = GetString('SI_ITEMTRAITTYPE',traitType)
+                local traitData = data.research[craft][line][trait]
+                if type(traitData) == 'number' then
+                    local diff = traitData - GetTimeStamp()
+                    if lowest == -1 or diff < lowest then
+                        lowest = diff
+                    end
+                    table.insert(list, {
+                        craft = craft,
+                        line = line,
+                        trait = trait,
+                        lineName = lineName,
+                        lineIcon = lineIcon,
+                        traitName = traitName,
+                        timer = LeoAltholic.GetTime(diff)
+                    })
+                    i = i + 1
+                    if traitData - GetTimeStamp() > 0 then
+                        researching = researching + 1
+                    end
+                end
+            end
+        end
+        color = '|c21A121'
+        if researching < data.research[craft].max then
+            color = '|cCB110E'
+        end
+        local output = color .. researching .. '/' .. data.research[craft].max .. '|r'
+        color = '|cFFFFFF'
+        if lowest <= 3600 then
+            color = '|cFFFF00'
+        end
+        if #list > 0 then
+            output = output .. " " .. color..LeoAltholic.GetTime(lowest) .. '|r'
+        end
+        control.craft[craft]:SetText(output)
+        control.craft[craft].list = list
+    end
+
+    ZO_SortFilterList.SetupRow(self, control, data)
+end
+
+
+function LeoAltholicResearchList:ColorRow(control, data, mouseIsOver)
+
+    local color = ZO_SECOND_CONTRAST_TEXT
+    local r, g, b = GetInterfaceColor(INTERFACE_COLOR_TYPE_ITEM_QUALITY_COLORS, ITEM_QUALITY_MAGIC)
+
+    local child = GetControl(control, "Name")
+    if data.name == LeoAltholic.CharName then
+        child:SetColor(r, g, b)
+    else
+        child:SetColor(color:UnpackRGBA())
+    end
+end
+
+function LeoAltholicResearchList:BuildMasterList()
+    self.masterList = {}
+    local list = LeoAltholic.ExportCharacters()
+    for k, v in ipairs(list) do
+        local data = {
+            name = v.bio.name,
+            research = v.research
+        }
+        data.queueIndex = k
+        table.insert(self.masterList, data)
+    end
+end
+
+function LeoAltholicResearchList:SortScrollList()
+    local scrollData = ZO_ScrollList_GetDataList(self.list)
+    table.sort(scrollData, self.sortFunction)
+end
+
+function LeoAltholicResearchList:FilterScrollList()
+    local scrollData = ZO_ScrollList_GetDataList(self.list)
+    ZO_ClearNumericallyIndexedTable(scrollData)
+    for i = 1, #self.masterList do
+        local data = self.masterList[i]
+        table.insert(scrollData, ZO_ScrollList_CreateDataEntry(1, data))
+    end
+end
+
+local function addLine(tooltip, text, color)
+    if not color then color = ZO_TOOLTIP_DEFAULT_COLOR 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_SELECTED_TEXT 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.TooltipResearch(control, visible)
+
+    if visible then
+        if #control.list == 0 then return end
+        if not parent then parent = control end
+
+        InitializeTooltip(InformationTooltip, control, LEFT, 5, 0)
+
+        addLineTitle(InformationTooltip, GetCraftingSkillName(control.list[1].craft))
+        --[[
+        {
+            craft = craft,
+            line = line,
+            trait = trait,
+            lineName = lineName,
+            lineIcon = lineIcon,
+            traitName = traitName,
+            timer = LeoAltholic.GetTime(lowest)
+        }
+        ]]
+        for _, trait in pairs(control.list) do
+            addLine(InformationTooltip, "|t30:30:"..trait.lineIcon.."|t "..trait.lineName.." "..trait.traitName.." "..trait.timer)
+        end
+        InformationTooltip:SetHidden(false)
+    else
+        ClearTooltip(InformationTooltip)
+        InformationTooltip:SetHidden(true)
+    end
+end
diff --git a/ui/skills.lua b/ui/skills.lua
new file mode 100644
index 0000000..c46b020
--- /dev/null
+++ b/ui/skills.lua
@@ -0,0 +1,148 @@
+
+
+LeoAltholicSkillsList = ZO_SortFilterList:Subclass()
+function LeoAltholicSkillsList:New(control)
+
+    ZO_SortFilterList.InitializeSortFilterList(self, control)
+
+    local sorterKeys =
+    {
+        ["name"] = {},
+    }
+
+    self.masterList = {}
+    self.currentSortKey = "name"
+    self.currentSortOrder = ZO_SORT_ORDER_UP
+    ZO_ScrollList_AddDataType(self.list, 1, "LeoAltholicSkillsListTemplate", 32, function(control, data) self:SetupEntry(control, data) end)
+
+    self.sortFunction = function(listEntry1, listEntry2)
+        return ZO_TableOrderingFunction(listEntry1.data, listEntry2.data, self.currentSortKey, sorterKeys, self.currentSortOrder)
+    end
+
+    return self
+end
+
+function LeoAltholicSkillsList:SetupEntry(control, data)
+
+    control.data = data
+
+    control.name = GetControl(control, "Name")
+    control.name:SetText(data.name)
+
+    control.craft = {}
+    for i = 1, 7 do
+        control.craft[i] = GetControl(control, "Craft"..i)
+        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)
+        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)
+        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)
+        else
+            control.weapon[i]:SetText("-")
+            control.weapon[i].number = tonumber(0)
+        end
+        control.weapon[i].max = tonumber(50)
+    end
+
+    control.class = {}
+    for i = 1, 3 do
+        control.class[i] = GetControl(control, "Class"..i)
+        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)
+        else
+            control.class[i]:SetText("-")
+            control.class[i].number = tonumber(0)
+        end
+        control.class[i].max = tonumber(50)
+    end
+
+    control.racial = GetControl(control, "Racial")
+    if data.skills.racial[1] then
+        control.racial:SetText(data.skills.racial[1].rank)
+        control.racial.number = tonumber(data.skills.racial[1].rank)
+    else
+        control.racial:SetText("-")
+        control.racial.number = tonumber(0)
+    end
+    control.racial.max = tonumber(50)
+
+    ZO_SortFilterList.SetupRow(self, control, data)
+end
+
+function LeoAltholicSkillsList:ColorRow(control, data, mouseIsOver)
+
+    local color = ZO_SECOND_CONTRAST_TEXT
+    local r, g, b = GetInterfaceColor(INTERFACE_COLOR_TYPE_ITEM_QUALITY_COLORS, ITEM_QUALITY_MAGIC)
+
+    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())
+            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)
+            end
+        end
+    end
+end
+
+function LeoAltholicSkillsList:BuildMasterList()
+    self.masterList = {}
+    local list = LeoAltholic.ExportCharacters()
+    for k, v in ipairs(list) do
+        local data = {
+            name = v.bio.name,
+            skills = v.skills
+        }
+        data.queueIndex = k
+        table.insert(self.masterList, data)
+    end
+end
+
+function LeoAltholicSkillsList:SortScrollList()
+    local scrollData = ZO_ScrollList_GetDataList(self.list)
+    table.sort(scrollData, self.sortFunction)
+end
+
+function LeoAltholicSkillsList:FilterScrollList()
+    local scrollData = ZO_ScrollList_GetDataList(self.list)
+    ZO_ClearNumericallyIndexedTable(scrollData)
+    for i = 1, #self.masterList do
+        local data = self.masterList[i]
+        table.insert(scrollData, ZO_ScrollList_CreateDataEntry(1, data))
+    end
+end
diff --git a/ui/skills2.lua b/ui/skills2.lua
new file mode 100644
index 0000000..8e6fc32
--- /dev/null
+++ b/ui/skills2.lua
@@ -0,0 +1,126 @@
+
+
+LeoAltholicSkills2List = ZO_SortFilterList:Subclass()
+function LeoAltholicSkills2List:New(control)
+
+    ZO_SortFilterList.InitializeSortFilterList(self, control)
+
+    local sorterKeys =
+    {
+        ["name"] = {},
+    }
+
+    self.masterList = {}
+    self.currentSortKey = "name"
+    self.currentSortOrder = ZO_SORT_ORDER_UP
+    ZO_ScrollList_AddDataType(self.list, 1, "LeoAltholicSkills2ListTemplate", 32, function(control, data) self:SetupEntry(control, data) end)
+
+    self.sortFunction = function(listEntry1, listEntry2)
+        return ZO_TableOrderingFunction(listEntry1.data, listEntry2.data, self.currentSortKey, sorterKeys, self.currentSortOrder)
+    end
+
+    return self
+end
+
+function LeoAltholicSkills2List:SetupEntry(control, data)
+
+    control.data = data
+
+    control.name = GetControl(control, "Name")
+    control.name:SetText(data.name)
+
+    control.world = {}
+    for i = 1, 4 do
+        control.world[i] = GetControl(control, "World"..i)
+        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)
+        else
+            control.world[i]:SetText("-")
+            control.world[i].number = tonumber(0)
+        end
+        control.world[i].max = tonumber(10)
+    end
+    control.guild = {}
+    for i = 1, 6 do
+        control.guild[i] = GetControl(control, "Guild"..i)
+        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)
+        else
+            control.guild[i]:SetText("-")
+            control.guild[i].number = tonumber(0)
+        end
+        control.guild[i].max = tonumber(10)
+    end
+
+    control.ava = {}
+    for i = 1, 3 do
+        control.ava[i] = GetControl(control, "AvA"..i)
+        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)
+        else
+            control.ava[i]:SetText("-")
+            control.ava[i].number = tonumber(0)
+        end
+        control.ava[i].max = tonumber(50)
+    end
+
+    ZO_SortFilterList.SetupRow(self, control, data)
+end
+
+function LeoAltholicSkills2List:ColorRow(control, data, mouseIsOver)
+
+    local color = ZO_SECOND_CONTRAST_TEXT
+    local r, g, b = GetInterfaceColor(INTERFACE_COLOR_TYPE_ITEM_QUALITY_COLORS, ITEM_QUALITY_MAGIC)
+
+    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())
+            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)
+            end
+        end
+    end
+end
+
+function LeoAltholicSkills2List:BuildMasterList()
+    self.masterList = {}
+    local list = LeoAltholic.ExportCharacters()
+    for k, v in ipairs(list) do
+        local data = {
+            name = v.bio.name,
+            skills = v.skills
+        }
+        data.queueIndex = k
+        table.insert(self.masterList, data)
+    end
+end
+
+function LeoAltholicSkills2List:SortScrollList()
+    local scrollData = ZO_ScrollList_GetDataList(self.list)
+    table.sort(scrollData, self.sortFunction)
+end
+
+function LeoAltholicSkills2List:FilterScrollList()
+    local scrollData = ZO_ScrollList_GetDataList(self.list)
+    ZO_ClearNumericallyIndexedTable(scrollData)
+    for i = 1, #self.masterList do
+        local data = self.masterList[i]
+        table.insert(scrollData, ZO_ScrollList_CreateDataEntry(1, data))
+    end
+end
diff --git a/ui/stats.lua b/ui/stats.lua
new file mode 100644
index 0000000..3f0d755
--- /dev/null
+++ b/ui/stats.lua
@@ -0,0 +1,91 @@
+
+LeoAltholicStatsList = ZO_SortFilterList:Subclass()
+function LeoAltholicStatsList:New(control)
+
+    ZO_SortFilterList.InitializeSortFilterList(self, control)
+
+    local sorterKeys =
+    {
+        ["name"] = {}
+    }
+
+    self.masterList = {}
+    self.currentSortKey = "name"
+    self.currentSortOrder = ZO_SORT_ORDER_UP
+    ZO_ScrollList_AddDataType(self.list, 1, "LeoAltholicStatsListTemplate", 32, function(control, data) self:SetupEntry(control, data) end)
+
+    self.sortFunction = function(listEntry1, listEntry2)
+        return ZO_TableOrderingFunction(listEntry1.data, listEntry2.data, self.currentSortKey, sorterKeys, self.currentSortOrder)
+    end
+
+    return self
+end
+
+function LeoAltholicStatsList:SetupEntry(control, data)
+
+    control.data = data
+
+    control.name = GetControl(control, "Name")
+    control.name:SetText(data.name)
+
+    control.points = GetControl(control, "Points")
+    control.points:SetText("|c596cfd" .. data.magicka.points .. "|r / |cCB110E" .. data.health.points .. "|r / |c21A121" .. data.health.points .. "|r")
+
+    control.maximum = GetControl(control, "Maximum")
+    control.maximum:SetText("|c596cfd" .. data.magicka.max .. "|r / |cCB110E" .. data.health.max .. "|r / |c21A121" .. data.stamina.max .. "|r")
+
+    control.recovery = GetControl(control, "Recovery")
+    control.recovery:SetText("|c596cfd" .. data.magicka.recovery .. "|r / |cCB110E" .. data.health.recovery .. "|r / |c21A121" .. data.stamina.recovery .. "|r")
+
+    control.weaponSpellcrit = GetControl(control, "WeaponSpellCrit")
+    control.weaponSpellcrit:SetText(string.format("%.1f%% / %.1f%%", data.weaponCrit, data.spellCrit))
+
+    ZO_SortFilterList.SetupRow(self, control, data)
+end
+
+
+function LeoAltholicStatsList:ColorRow(control, data, mouseIsOver)
+
+    local color = ZO_SECOND_CONTRAST_TEXT
+    local r, g, b = GetInterfaceColor(INTERFACE_COLOR_TYPE_ITEM_QUALITY_COLORS, ITEM_QUALITY_MAGIC)
+
+    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())
+        end
+    end
+end
+
+function LeoAltholicStatsList:BuildMasterList()
+    self.masterList = {}
+    local list = LeoAltholic.ExportCharacters()
+    for k, v in ipairs(list) do
+        local data = {
+            name = v.bio.name,
+            magicka = v.attributes.magicka,
+            health = v.attributes.health,
+            stamina = v.attributes.stamina,
+            spellCrit = v.attributes.spell.criticalChance,
+            weaponCrit = v.attributes.weapon.criticalChance
+        }
+        data.queueIndex = k
+        table.insert(self.masterList, data)
+    end
+end
+
+function LeoAltholicStatsList:SortScrollList()
+    local scrollData = ZO_ScrollList_GetDataList(self.list)
+    table.sort(scrollData, self.sortFunction)
+end
+
+function LeoAltholicStatsList:FilterScrollList()
+    local scrollData = ZO_ScrollList_GetDataList(self.list)
+    ZO_ClearNumericallyIndexedTable(scrollData)
+    for i = 1, #self.masterList do
+        local data = self.masterList[i]
+        table.insert(scrollData, ZO_ScrollList_CreateDataEntry(1, data))
+    end
+end
diff --git a/ui/tracked.lua b/ui/tracked.lua
new file mode 100644
index 0000000..48cf8ec
--- /dev/null
+++ b/ui/tracked.lua
@@ -0,0 +1,83 @@
+
+function LeoAltholicUI.InitTrackedPanel()
+    local charList = LeoAltholic.ExportCharacters()
+    local control
+    local anchorY = 112;
+    control = WINDOW_MANAGER:GetControlByName('LeoAltholicWindowTrackedPanelScrollChild')
+    control:SetHeight(#LeoAltholic.GetCharacters() * anchorY)
+
+    local numRows = 1
+
+    for x,char in pairs(charList) do
+
+        if char.quests ~= nil and char.quests.tracked ~= nil then
+            local count = 0
+            for i = 1, 10 do
+                if char.quests.tracked[i] ~= nil then
+                    count = count + 1
+                end
+            end
+            if count > 0 then
+                local bg
+                local row
+                local sc = WINDOW_MANAGER:GetControlByName("LeoAltholicWindowTrackedPanelScrollChild")
+                row = CreateControlFromVirtual("LeoAltholicTrackedRow" .. numRows, sc, "LeoAltholicTrackedRowTemplate")
+                row:SetHidden(false)
+
+                row:SetAnchor(TOPLEFT,sc,TOPLEFT,0,(numRows - 1) * anchorY)
+                bg = row:GetNamedChild("BG")
+                if char.bio.name == LeoAltholic.CharName then
+                    bg:SetCenterColor(unpack({0.1,0.1,0.1,1 }))
+                    bg:SetEdgeColor(0.2,0.7,0.2,1)
+                end
+
+                control = row:GetNamedChild("Name")
+                control:SetText(char.bio.name)
+
+                control = row:GetNamedChild("Alliance")
+                local icon = ZO_GetAllianceIcon(char.bio.alliance.id)
+                control:SetText("|cF1FF77|t50:90:" .. icon .. "|t|r ")
+                control.data = char.bio.alliance.name
+
+                control = row:GetNamedChild("RaceClass")
+                control:SetText(char.bio.race .. " " .. char.bio.class)
+
+                row = WINDOW_MANAGER:GetControlByName('LeoAltholicTrackedRow'..numRows)
+                local index = 1
+                for i = 1, 10 do
+                    if char.quests.tracked[i] ~= nil then
+                        local label = row:GetNamedChild("Quest" .. index .. "Label")
+                        local done = row:GetNamedChild("Quest" .. index .. "Done")
+                        label:SetText(char.quests.tracked[i].name)
+                        label:SetHandler('OnMouseUp', function(control, button, upInside)
+                            if upInside == true and button == MOUSE_BUTTON_INDEX_RIGHT then
+                                LeoAltholic.log(zo_strformat(GetString(LEOALT_REMOVED_FROM), label:GetText(), char.bio.name))
+                                table.remove(LeoAltholic.savedVariables.CharList[char.bio.name].quests.tracked, i)
+                                control:SetHidden(true)
+                                control:GetParent():GetNamedChild("Quest" .. index .. "Done"):SetHidden(true)
+                            end
+                        end)
+                        if char.quests.tracked[i].lastDone ~= nil then
+                            if char.quests.tracked[i].lastDone <= LeoAltholic.TodayReset() then
+                                done:SetText("|cCB110Enot done today|r")
+                            else
+                                local diff = GetTimeStamp() - char.quests.tracked[i].lastDone
+                                if diff < 3600 then
+                                    done:SetText(zo_strformat(GetString(LEOALT_MINUTES_AGO),  math.floor(diff / 60)))
+                                elseif diff < 86400 then
+                                    done:SetText(zo_strformat(GetString(LEOALT_HOURS_AGO),  math.floor(diff / 3600)))
+                                else
+                                    done:SetText(zo_strformat(GetString(LEOALT_DAYS_AGO),  math.floor(diff / 86400)))
+                                end
+                            end
+                        else
+                            done:SetText("|cCB110E"..GetString(LEOALT_NOT_DONE_TODAY).."|r")
+                        end
+                        index = index + 1
+                    end
+                end
+                numRows = numRows + 1
+            end
+        end
+    end
+end
diff --git a/ui/writs.lua b/ui/writs.lua
new file mode 100644
index 0000000..b208078
--- /dev/null
+++ b/ui/writs.lua
@@ -0,0 +1,171 @@
+
+
+LeoAltholicWritsList = ZO_SortFilterList:Subclass()
+function LeoAltholicWritsList:New(control)
+
+    ZO_SortFilterList.InitializeSortFilterList(self, control)
+
+    local sorterKeys =
+    {
+        ["name"] = {},
+    }
+
+    self.masterList = {}
+    self.currentSortKey = "name"
+    self.currentSortOrder = ZO_SORT_ORDER_UP
+    ZO_ScrollList_AddDataType(self.list, 1, "LeoAltholicWritsListTemplate", 32, function(control, data) self:SetupEntry(control, data) end)
+
+    self.sortFunction = function(listEntry1, listEntry2)
+        return ZO_TableOrderingFunction(listEntry1.data, listEntry2.data, self.currentSortKey, sorterKeys, self.currentSortOrder)
+    end
+
+    return self
+end
+
+function LeoAltholicWritsList:SetupEntry(control, data)
+
+    control.data = data
+
+    control.name = GetControl(control, "Name")
+    control.name:SetText(data.name)
+
+    local child
+    for _, craft in pairs({CRAFTING_TYPE_ALCHEMY,CRAFTING_TYPE_BLACKSMITHING,CRAFTING_TYPE_CLOTHIER,CRAFTING_TYPE_ENCHANTING,CRAFTING_TYPE_JEWELRYCRAFTING,CRAFTING_TYPE_PROVISIONING,CRAFTING_TYPE_WOODWORKING}) do
+        child = GetControl(control, "Craft"..craft.."Status")
+        local shown = false
+        child:SetTexture("esoui/art/tutorial/menubar_help_up.dds")
+        child:SetColor(unpack({1,1,1,1}))
+        child.data = ""
+        if data.writs[craft] ~= nil then
+            local color = {1,0,0,1}
+            if
+            (craft == CRAFTING_TYPE_ALCHEMY and string.find(zo_strformat("<<z:1>>",data.writs[craft].name), zo_strformat("<<z:1>>",GetString(LEOALT_ALCHEMIST)))) or
+                    (craft == CRAFTING_TYPE_BLACKSMITHING and string.find(zo_strformat("<<z:1>>",data.writs[craft].name), zo_strformat("<<z:1>>",GetString(LEOALT_BLACKSMITH)))) or
+                    (craft == CRAFTING_TYPE_CLOTHIER and string.find(zo_strformat("<<z:1>>",data.writs[craft].name), zo_strformat("<<z:1>>",GetString(LEOALT_CLOTHIER)))) or
+                    (craft == CRAFTING_TYPE_ENCHANTING and string.find(zo_strformat("<<z:1>>",data.writs[craft].name), zo_strformat("<<z:1>>",GetString(LEOALT_ENCHANTER)))) or
+                    (craft == CRAFTING_TYPE_JEWELRYCRAFTING and string.find(zo_strformat("<<z:1>>",data.writs[craft].name), zo_strformat("<<z:1>>",GetString(LEOALT_JEWELRY)))) or
+                    (craft == CRAFTING_TYPE_PROVISIONING and string.find(zo_strformat("<<z:1>>",data.writs[craft].name), zo_strformat("<<z:1>>",GetString(LEOALT_PROVISIONER)))) or
+                    (craft == CRAFTING_TYPE_WOODWORKING and string.find(zo_strformat("<<z:1>>",data.writs[craft].name), zo_strformat("<<z:1>>",GetString(LEOALT_WOODWORKER)))) then
+                if data.writs[craft].lastDone ~= nil and data.writs[craft].lastDone > LeoAltholic.TodayReset() then
+                    color = {0,1,0,1}
+                end
+                child:SetTexture("esoui/art/buttons/accept_up.dds")
+                child:SetColor(unpack(color))
+                if data.writs[craft].lastDone ~= nil then
+                    local diff = GetTimeStamp() - data.writs[craft].lastDone
+                    if diff < 3600 then
+                        child.data = zo_strformat(GetString(LEOALT_MINUTES_AGO),  math.floor(diff / 60))
+                    elseif diff < 86400 then
+                        child.data = zo_strformat(GetString(LEOALT_HOURS_AGO),  math.floor(diff / 3600))
+                    else
+                        child.data = zo_strformat(GetString(LEOALT_DAYS_AGO),  math.floor(diff / 86400))
+                    end
+                else
+                    child.data = "|cCB110E"..GetString(LEOALT_NOT_DONE_TODAY).."|r"
+                end
+                shown = true
+            end
+        end
+        if shown == false then
+            child:SetTexture("esoui/art/tutorial/menubar_help_up.dds")
+            child:SetColor(unpack({1,1,1,1}))
+            child.data = ""
+        end
+    end
+
+    ZO_SortFilterList.SetupRow(self, control, data)
+end
+
+
+function LeoAltholicWritsList:ColorRow(control, data, mouseIsOver)
+
+    local color = ZO_SECOND_CONTRAST_TEXT
+    local r, g, b = GetInterfaceColor(INTERFACE_COLOR_TYPE_ITEM_QUALITY_COLORS, ITEM_QUALITY_MAGIC)
+
+    local child = GetControl(control, "Name")
+    if data.name == LeoAltholic.CharName then
+        child:SetColor(r, g, b)
+    else
+        child:SetColor(color:UnpackRGBA())
+    end
+end
+
+function LeoAltholicWritsList:BuildMasterList()
+    self.masterList = {}
+    local list = LeoAltholic.ExportCharacters()
+    for k, v in ipairs(list) do
+        local data = {
+            name = v.bio.name,
+            writs = v.quests.writs or {}
+        }
+        data.queueIndex = k
+        table.insert(self.masterList, data)
+    end
+end
+
+function LeoAltholicWritsList:SortScrollList()
+    local scrollData = ZO_ScrollList_GetDataList(self.list)
+    table.sort(scrollData, self.sortFunction)
+end
+
+function LeoAltholicWritsList:FilterScrollList()
+    local scrollData = ZO_ScrollList_GetDataList(self.list)
+    ZO_ClearNumericallyIndexedTable(scrollData)
+    for i = 1, #self.masterList do
+        local data = self.masterList[i]
+        table.insert(scrollData, ZO_ScrollList_CreateDataEntry(1, data))
+    end
+end
+
+
+
+function LeoAltholicUI.InitWritsPanel()
+    local charList = LeoAltholic.ExportCharacters()
+    local control
+    local anchorY = 40;
+    for x,char in pairs(charList) do
+
+        for _, craft in pairs({CRAFTING_TYPE_ALCHEMY,CRAFTING_TYPE_BLACKSMITHING,CRAFTING_TYPE_CLOTHIER,CRAFTING_TYPE_ENCHANTING,CRAFTING_TYPE_JEWELRYCRAFTING,CRAFTING_TYPE_PROVISIONING,CRAFTING_TYPE_WOODWORKING}) do
+            control = row:GetNamedChild("Craft"..craft.."Status")
+            local shown = false
+            control:SetTexture("esoui/art/tutorial/menubar_help_up.dds")
+            control:SetColor(unpack({1,1,1,1}))
+            control.data = ""
+            if char.quests ~= nil and char.quests.writs ~= nil and char.quests.writs[craft] ~= nil then
+                local color = {1,0,0,1}
+                if
+                (craft == CRAFTING_TYPE_ALCHEMY and string.find(zo_strformat("<<z:1>>",char.quests.writs[craft].name), zo_strformat("<<z:1>>",GetString(LEOALT_ALCHEMIST)))) or
+                        (craft == CRAFTING_TYPE_BLACKSMITHING and string.find(zo_strformat("<<z:1>>",char.quests.writs[craft].name), zo_strformat("<<z:1>>",GetString(LEOALT_BLACKSMITH)))) or
+                        (craft == CRAFTING_TYPE_CLOTHIER and string.find(zo_strformat("<<z:1>>",char.quests.writs[craft].name), zo_strformat("<<z:1>>",GetString(LEOALT_CLOTHIER)))) or
+                        (craft == CRAFTING_TYPE_ENCHANTING and string.find(zo_strformat("<<z:1>>",char.quests.writs[craft].name), zo_strformat("<<z:1>>",GetString(LEOALT_ENCHANTER)))) or
+                        (craft == CRAFTING_TYPE_JEWELRYCRAFTING and string.find(zo_strformat("<<z:1>>",char.quests.writs[craft].name), zo_strformat("<<z:1>>",GetString(LEOALT_JEWELRY)))) or
+                        (craft == CRAFTING_TYPE_PROVISIONING and string.find(zo_strformat("<<z:1>>",char.quests.writs[craft].name), zo_strformat("<<z:1>>",GetString(LEOALT_PROVISIONER)))) or
+                        (craft == CRAFTING_TYPE_WOODWORKING and string.find(zo_strformat("<<z:1>>",char.quests.writs[craft].name), zo_strformat("<<z:1>>",GetString(LEOALT_WOODWORKER)))) then
+                    if char.quests.writs[craft].lastDone ~= nil and char.quests.writs[craft].lastDone > LeoAltholic.TodayReset() then
+                        color = {0,1,0,1}
+                    end
+                    control:SetTexture("esoui/art/buttons/accept_up.dds")
+                    control:SetColor(unpack(color))
+                    if char.quests.writs[craft].lastDone ~= nil then
+                        local diff = GetTimeStamp() - char.quests.writs[craft].lastDone
+                        if diff < 3600 then
+                            control.data = zo_strformat(GetString(LEOALT_MINUTES_AGO),  math.floor(diff / 60))
+                        elseif diff < 86400 then
+                            control.data = zo_strformat(GetString(LEOALT_HOURS_AGO),  math.floor(diff / 3600))
+                        else
+                            control.data = zo_strformat(GetString(LEOALT_DAYS_AGO),  math.floor(diff / 86400))
+                        end
+                    else
+                        control.data = "|cCB110E"..GetString(LEOALT_NOT_DONE_TODAY).."|r"
+                    end
+                    shown = true
+                end
+            end
+            if shown == false then
+                control:SetTexture("esoui/art/tutorial/menubar_help_up.dds")
+                control:SetColor(unpack({1,1,1,1}))
+                control.data = ""
+            end
+        end
+    end
+end