From bc92e132bc9943c11390aefc15aadc8404ebe5ab Mon Sep 17 00:00:00 2001
From: onechiporenko <oo.nechiporenko@gmail.com>
Date: Thu, 22 Oct 2020 19:32:15 +0300
Subject: [PATCH] Update layout to use AceGUI widgets

---
 Locales/enUS.lua                              |   1 +
 MyDungeonsBook.toc                            |   6 +-
 MyDungeonsBook.wowproj                        |  11 +-
 Options.lua                                   |  38 +--
 UI/ChallengeDetails.lua                       |  79 ++---
 UI/ChallengeDetails/Tabs.lua                  |  38 ++-
 UI/ChallengeDetails/Tabs/DEV.lua              |  38 +--
 UI/ChallengeDetails/Tabs/Details.lua          |  33 +-
 UI/ChallengeDetails/Tabs/Encounters.lua       |  47 +--
 UI/ChallengeDetails/Tabs/Mechanics.lua        |  30 +-
 UI/ChallengeDetails/Tabs/Mechanics/Tabs.lua   |  28 +-
 .../Tabs/Mechanics/Tabs/Casts.lua             |  26 +-
 .../Tabs/Mechanics/Tabs/Casts/Tabs.lua        |  25 +-
 .../Tabs/Casts/Tabs/CastsByPartyMembers.lua   |  39 +--
 .../Mechanics/Tabs/Casts/Tabs/Interrupts.lua  |  58 +---
 .../Casts/Tabs/OwnCastsByPartyMembers.lua     |  30 +-
 .../Tabs/OwnCastsByPartyMembers/Tabs.lua      |  22 +-
 .../Tabs/OwnCastsByPartyMember.lua            |  58 +---
 .../Tabs/Mechanics/Tabs/Damage.lua            |  26 +-
 .../Tabs/Mechanics/Tabs/Damage/Tabs.lua       |  23 +-
 .../Tabs/Damage/Tabs/AvoidableDamage.lua      |  38 +--
 .../Damage/Tabs/DamageDoneToPartyMembers.lua  |  38 +--
 .../Tabs/Damage/Tabs/DamageDoneToUnits.lua    |  37 +--
 .../Tabs/Mechanics/Tabs/EffectsAndAuras.lua   |  35 +-
 .../Mechanics/Tabs/EffectsAndAuras/Tabs.lua   |  38 ++-
 .../Tabs/AllBuffsOnPartyMembers.lua           |  37 +--
 .../Tabs/AllDebuffsOnPartyMembers.lua         |  38 +--
 .../EffectsAndAuras/Tabs/AvoidableDebuffs.lua |  43 +--
 .../Tabs/BuffsOrDebuffsOnPartyMembers.lua     |  68 ++--
 .../Tabs/BuffsOrDebuffsOnUnits.lua            |  40 +--
 .../Tabs/EffectsAndAuras/Tabs/Dispels.lua     |  60 +---
 .../Tabs/Mechanics/Tabs/UsedItems.lua         |  38 +--
 UI/ChallengeDetails/Tabs/Roster.lua           | 308 +++++-------------
 UI/Challenges.lua                             |  24 +-
 UI/Main.lua                                   | 110 ++-----
 Utils/Table.lua                               |  55 ++--
 Utils/Tabs.lua                                |  58 ----
 Utils/Utils.lua                               |   6 +
 Widgets/TabContentWrapper.lua                 |  22 ++
 Widgets/Table.lua                             |  41 +++
 Widgets/Tabs.lua                              |  29 ++
 .../ScrollingTable-4.1/ScrollingTable-4.1.lua |  25 +-
 42 files changed, 666 insertions(+), 1178 deletions(-)
 delete mode 100644 Utils/Tabs.lua
 create mode 100644 Widgets/TabContentWrapper.lua
 create mode 100644 Widgets/Table.lua
 create mode 100644 Widgets/Tabs.lua

diff --git a/Locales/enUS.lua b/Locales/enUS.lua
index 663c437..9476d3b 100644
--- a/Locales/enUS.lua
+++ b/Locales/enUS.lua
@@ -83,6 +83,7 @@ L["Casts"] = "Casts";
 -- Settings start
 L["Performance"] = "Performance";
 L["Run garbage collector on close"] = "Run garbage collector on close";
+L["Show DEV Tab"] = "Show DEV Tab";
 L["Verbose"] = "Verbose";
 L["MainFrame_Show DEBUG messages"] = "MainFrame_Show DEBUG messages";
 L["MainFrame_Show LOG messages"] = "MainFrame_Show LOG messages";
diff --git a/MyDungeonsBook.toc b/MyDungeonsBook.toc
index 3b345cd..480a551 100644
--- a/MyDungeonsBook.toc
+++ b/MyDungeonsBook.toc
@@ -33,7 +33,6 @@ UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/CastsByPartyMembers.lua
 UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/OwnCastsByPartyMembers.lua
 UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/OwnCastsByPartyMembers/Tabs.lua
 UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/OwnCastsByPartyMembers/Tabs/OwnCastsByPartyMember.lua
-
 UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage.lua
 UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs.lua
 UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs/AvoidableDamage.lua
@@ -48,6 +47,10 @@ UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/AllBuffsOnPartyMemb
 UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/AllDebuffsOnPartyMembers.lua
 UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/Dispels.lua
 
+Widgets/Table.lua
+Widgets/Tabs.lua
+Widgets/TabContentWrapper.lua
+
 Events.lua
 Challenge.lua
 Mechanics/Common.lua
@@ -55,5 +58,4 @@ Mechanics/BfA/Common.lua
 Mechanics/SL/Common.lua
 Utils/Utils.lua
 Utils/Table.lua
-Utils/Tabs.lua
 Utils/JSON.lua
diff --git a/MyDungeonsBook.wowproj b/MyDungeonsBook.wowproj
index 5f02da4..f0ba2ce 100644
--- a/MyDungeonsBook.wowproj
+++ b/MyDungeonsBook.wowproj
@@ -165,10 +165,16 @@
     <Content Include="Utils\Table.lua">
       <SubType>Code</SubType>
     </Content>
-    <Content Include="Utils\Tabs.lua">
+    <Content Include="Utils\Utils.lua">
       <SubType>Code</SubType>
     </Content>
-    <Content Include="Utils\Utils.lua">
+    <Content Include="Widgets\TabContentWrapper.lua">
+      <SubType>Code</SubType>
+    </Content>
+    <Content Include="Widgets\Table.lua">
+      <SubType>Code</SubType>
+    </Content>
+    <Content Include="Widgets\Tabs.lua">
       <SubType>Code</SubType>
     </Content>
   </ItemGroup>
@@ -192,6 +198,7 @@
     <Folder Include="UI" />
     <Folder Include="UI\ChallengeDetails" />
     <Folder Include="UI\ChallengeDetails\Tabs" />
+    <Folder Include="Widgets" />
   </ItemGroup>
   <Import Project="$(DevEnvDir)\Extensions\Tools\MSBuild\AddonStudio\Wow\3.0\WowAddonStudio.targets" />
   <!--
diff --git a/Options.lua b/Options.lua
index ea2755c..75308f3 100644
--- a/Options.lua
+++ b/Options.lua
@@ -17,15 +17,15 @@ MyDungeonsBook.OptionsDefaults = {
 	profile = {
 		display = {
 			x = 0,
-			y = 0,
-			scale = 1
+			y = 0
 		},
 		verbose = {
 			debug = true,
 			log = true
 		},
 		performance = {
-			collectgarbage = true
+			collectgarbage = true,
+			showdevtab = false
 		}
 	},
 	global = {
@@ -43,23 +43,7 @@ MyDungeonsBook.Options = {
 			order = 1,
 			name = L["UI"],
 			type="group",
-			args = {
-				scale = {
-					order = 1,
-					name = L["Main Window Scale"],
-					type = "range",
-					min = 0.8,
-					max = 2.0,
-					step = 0.1,
-					width = "full",
-					get = function()
-						return MyDungeonsBook.db.profile.display.scale;
-					end,
-					set = function(_, v)
-						MyDungeonsBook.db.profile.display.scale = v;
-					end
-				}
-			}
+			args = {}
 		},
 		verbose = {
 			order = 1,
@@ -108,8 +92,20 @@ MyDungeonsBook.Options = {
 					set = function (_, v)
 						MyDungeonsBook.db.profile.performance.collectgarbage = v;
 					end
+				},
+				showdevtab = {
+					order = 2,
+					name = L["Show DEV Tab"],
+					type = "toggle",
+					width = "full",
+					get = function()
+						return MyDungeonsBook.db.profile.performance.showdevtab;
+					end,
+					set = function (_, v)
+						MyDungeonsBook.db.profile.performance.showdevtab = v;
+					end
 				}
 			}
 		}
 	}
-};
+};	
diff --git a/UI/ChallengeDetails.lua b/UI/ChallengeDetails.lua
index d34ad77..6d7cbe7 100644
--- a/UI/ChallengeDetails.lua
+++ b/UI/ChallengeDetails.lua
@@ -8,6 +8,7 @@ UI
 ]]
 
 local L = LibStub("AceLocale-3.0"):GetLocale("MyDungeonsBook");
+local AceGUI = LibStub("AceGUI-3.0");
 
 --[[--
 Click-handler for challenges table. Used on row click.
@@ -18,8 +19,8 @@ function MyDungeonsBook:ChallengeDetailsFrame_Show(challengeId)
 	self:DebugPrint("Show details for challenge #" .. challengeId);
 	self.activeChallengeId = challengeId;
 	self:ChallengeDetailsFrame_Update(challengeId);
-	self.challengeDetailsFrame:Show();
-    self:Tab_Click(self.challengeDetailsFrame, "roster");
+	self.challengeDetailsFrame.frame:Show();
+	self.challengeDetailsFrame.tabButtonsFrame:SelectTab("roster");
 end
 
 --[[--
@@ -29,25 +30,22 @@ Creates all frames related to the challenge details frames (with itself).
 @return[type=Frame] challengeDetailsFrame
 ]]
 function MyDungeonsBook:ChallengeDetailsFrame_Create(parentFrame)
-	local challengeDetailsFrame = CreateFrame("Frame", nil, parentFrame);
-	challengeDetailsFrame:SetPoint("TOPLEFT", 500, -30);
+	local parentFrameHeight = parentFrame.frame:GetHeight();
+	local challengeDetailsFrame = AceGUI:Create("SimpleGroup");
+	challengeDetailsFrame:SetLayout("List");
+	challengeDetailsFrame:SetFullHeight(true);
 	challengeDetailsFrame:SetWidth(700);
-	challengeDetailsFrame:SetHeight(650);
-	challengeDetailsFrame.titleFrame = self:ChallengeDetailsFrame_TitleFrame_Create(challengeDetailsFrame);
-	challengeDetailsFrame.tabButtonsFrame = self:ChallengeDetailsFrame_CreateTabButtonsFrame(challengeDetailsFrame);
-	challengeDetailsFrame.challengeRosterFrame = self:RosterFrame_Create(challengeDetailsFrame);
-	challengeDetailsFrame.detailsFrame = self:DetailsFrame_Create(challengeDetailsFrame);
-	challengeDetailsFrame.encountersFrame = self:EncountersFrame_Create(challengeDetailsFrame);
-	challengeDetailsFrame.mechanicsFrame = self:MechanicsFrame_Create(challengeDetailsFrame);
-	challengeDetailsFrame.devFrame = self:DevFrame_Create(challengeDetailsFrame);
-	challengeDetailsFrame.tabs = {
-		roster = challengeDetailsFrame.challengeRosterFrame,
-		details = challengeDetailsFrame.detailsFrame,
-		dev = challengeDetailsFrame.devFrame,
-		encounters = challengeDetailsFrame.encountersFrame,
-		mechanics = challengeDetailsFrame.mechanicsFrame
-	};
-	challengeDetailsFrame:Hide();
+	parentFrame:AddChild(challengeDetailsFrame);
+	local grid = AceGUI:Create("SimpleGroup");
+	grid:SetLayout("List");
+	grid:SetFullWidth(true);
+	challengeDetailsFrame:AddChild(grid);
+	local titleAffixes, titleText = self:ChallengeDetailsFrame_TitleFrame_Create(grid);
+	challengeDetailsFrame.titleAffixes = titleAffixes;
+	challengeDetailsFrame.titleText = titleText;
+	local tabButtonsFrame = self:ChallengeDetailsFrame_CreateTabButtonsFrame(grid);
+	challengeDetailsFrame.tabButtonsFrame = tabButtonsFrame;
+	challengeDetailsFrame.frame:Hide();
 	return challengeDetailsFrame;
 end
 
@@ -58,27 +56,21 @@ Creates a frame with challenge name and affixes.
 @return[type=Frame] titleFrame
 ]]
 function MyDungeonsBook:ChallengeDetailsFrame_TitleFrame_Create(parentFrame)
-	local titleFrame = CreateFrame("Frame", nil, parentFrame);
-	titleFrame:SetPoint("TOPLEFT", 0, 0);
-	titleFrame:SetWidth(700);
-	titleFrame:SetHeight(50);
+	local grid = AceGUI:Create("SimpleGroup");
+	grid:SetLayout("Flow");
+	grid:SetFullWidth(true);
+	parentFrame:AddChild(grid);
+	grid:SetFullHeight(true);
+	local titleAffixes = AceGUI:Create("Label");
+	titleAffixes:SetFontObject(GameFontNormal);
+	titleAffixes:SetWidth(200);
+	grid:AddChild(titleAffixes);
 
-	local titleText = titleFrame:CreateFontString(nil, "ARTWORK");
+	local titleText = AceGUI:Create("Label");
 	titleText:SetFontObject(GameFontNormalLarge);
-	titleText:SetTextColor(0.6, 0.6, 0.6);
-	titleText:SetPoint("TOPRIGHT", titleFrame, "TOPRIGHT", -10, 0);
-	titleText:SetPoint("BOTTOMRIGHT", titleFrame);
-	titleText:SetHeight(50);
-	titleFrame.titleText = titleText;
-
-	local titleAffixes = titleFrame:CreateFontString(nil, "ARTWORK");
-	titleAffixes:SetFontObject(GameFontNormal);
-	titleAffixes:SetTextColor(0.6, 0.6, 0.6);
-	titleAffixes:SetPoint("TOPLEFT", titleFrame, "TOPLEFT", 0, 0);
-	titleAffixes:SetPoint("BOTTOMLEFT", titleFrame);
-	titleAffixes:SetHeight(50);
-	titleFrame.titleAffixes = titleAffixes;
-	return titleFrame;
+	titleText:SetWidth(300);
+	grid:AddChild(titleText);
+	return titleAffixes, titleText;
 end
 
 --[[--
@@ -89,13 +81,8 @@ Update all frames related to challenge details.
 function MyDungeonsBook:ChallengeDetailsFrame_Update(challengeId)
 	local challenge = self.db.char.challenges[challengeId];
 	if (challenge) then
-		self.challengeDetailsFrame.titleFrame.titleText:SetText(string.format(L["%s (%s) %s"], challenge.challengeInfo.zoneName, challenge.challengeInfo.cmLevel, self:GetKeyUpgradeStr(challenge)));
-		self.challengeDetailsFrame.titleFrame.titleAffixes:SetText(self:GetChallengeAffixesIconsStr(challengeId, 30));
-		self:DetailsFrame_Update(challengeId);
-		self:DevFrame_Update(challengeId);
-		self:RosterFrame_Update(challengeId);
-		self:EncountersFrame_Update(challengeId);
-		self:MechanicsFrame_Update(challengeId);
+		self.challengeDetailsFrame.titleText:SetText(string.format(L["%s (%s) %s"], challenge.challengeInfo.zoneName, challenge.challengeInfo.cmLevel, self:GetKeyUpgradeStr(challenge)));
+		self.challengeDetailsFrame.titleAffixes:SetText(self:GetChallengeAffixesIconsStr(challengeId, 30));
 	else
 		self:DebugPrint(string.format("Challenge #%s not found", challengeId));
 	end
diff --git a/UI/ChallengeDetails/Tabs.lua b/UI/ChallengeDetails/Tabs.lua
index 92a233f..284520b 100644
--- a/UI/ChallengeDetails/Tabs.lua
+++ b/UI/ChallengeDetails/Tabs.lua
@@ -18,11 +18,35 @@ Created frame has a field `tabButtons` with tab-buttons. Keys in the `tabButtons
 @return[type=Frame] tabsButtonsFrame
 ]]
 function MyDungeonsBook:ChallengeDetailsFrame_CreateTabButtonsFrame(parentFrame)
-	return self:Tabs_Create(parentFrame, {
-		{id = "roster", title = L["Roster"]},
-		{id = "details", title = L["Details"]},
-		{id = "encounters", title = L["Encounters"]},
-		{id = "mechanics", title = L["Mechanics"]},
-		{id = "dev", title = L["DEV"]}
-	});
+	local tabs = self:TabsWidget_Create(parentFrame);
+	local tabsConfig = {
+		{value = "roster", text = L["Roster"]},
+		{value = "details", text = L["Details"]},
+		{value = "encounters", text = L["Encounters"]},
+		{value = "mechanics", text = L["Mechanics"]}
+	};
+	if (self.db.profile.performance.showdevtab) then
+		tinsert(tabsConfig, {value = "dev", text = L["DEV"]});
+	end
+	tabs:SetTabs(tabsConfig);
+	tabs:SetCallback("OnGroupSelected", function (container, _, tabId)
+		container:ReleaseChildren();
+		if (tabId == "roster") then
+			self:RosterFrame_Create(container, self.activeChallengeId);
+		end
+		if (tabId == "details") then
+			self:DetailsFrame_Create(container, self.activeChallengeId);
+		end
+		if (tabId == "encounters") then
+			self:EncountersFrame_Create(container, self.activeChallengeId);
+		end
+		if (tabId == "dev") then
+			self:DevFrame_Create(container, self.activeChallengeId);
+		end
+		if (tabId == "mechanics") then
+			self:MechanicsFrame_Create(container, self.activeChallengeId);
+		end
+	end);
+	tabs:SetHeight(618);
+	return tabs;
 end
diff --git a/UI/ChallengeDetails/Tabs/DEV.lua b/UI/ChallengeDetails/Tabs/DEV.lua
index 815ae65..8778980 100644
--- a/UI/ChallengeDetails/Tabs/DEV.lua
+++ b/UI/ChallengeDetails/Tabs/DEV.lua
@@ -6,36 +6,28 @@
 UI
 @section UI
 ]]
-
+local AceGUI = LibStub("AceGUI-3.0");
 --[[--
 Creates a frame for DEV tab.
 
 @param[type=Frame] parentFrame
-@return[type=Frame] devWrapper
-]]
-function MyDungeonsBook:DevFrame_Create(parentFrame)
-	local devWrapper = CreateFrame("Frame", nil, parentFrame);
-	devWrapper:SetWidth(700);
-	devWrapper:SetHeight(490);
-	devWrapper:SetPoint("TOPLEFT", 0, -80);
-	local textarea = CreateFrame("EditBox", nil, devWrapper, "InputBoxTemplate");
-	textarea:SetFontObject(GameFontNormal);
-	textarea:SetPoint("TOPLEFT", 0, 0);
-	textarea:SetWidth(650);
-	textarea:SetHeight(30);
-	devWrapper.textarea = textarea;
-	return devWrapper; 
-end
-
---[[--
-Update DEV-tab for challenge with id `challengeId`.
-
 @param[type=number] challengeId
+@return[type=Frame] devFrame
 ]]
-function MyDungeonsBook:DevFrame_Update(challengeId)
+function MyDungeonsBook:DevFrame_Create(parentFrame, challengeId)
+	local devFrame = self:TabContentWrapperWidget_Create(parentFrame);
+	devFrame:SetFullHeight(true);
 	local challenge = self.db.char.challenges[challengeId];
 	if (challenge) then
-		self.challengeDetailsFrame.devFrame.textarea:SetText(self:Table2Json(challenge));
-		self.challengeDetailsFrame.devFrame.textarea:HighlightText();
+		local editBox = AceGUI:Create("EditBox");
+		editBox:SetFullWidth(true);
+		editBox.button:SetText("Get JSON");
+		editBox.button:Show();
+		editBox:SetCallback("OnEnterPressed", function ()
+			editBox:SetText(self:Table2Json(challenge));
+			editBox:HighlightText();
+		end);
+		devFrame:AddChild(editBox);
 	end
+	return devFrame;
 end
diff --git a/UI/ChallengeDetails/Tabs/Details.lua b/UI/ChallengeDetails/Tabs/Details.lua
index 6249a27..cf999f6 100644
--- a/UI/ChallengeDetails/Tabs/Details.lua
+++ b/UI/ChallengeDetails/Tabs/Details.lua
@@ -9,31 +9,28 @@ UI
 
 local L = LibStub("AceLocale-3.0"):GetLocale("MyDungeonsBook");
 
-
 --[[--
 Creates a frame for Details tab (data should be from `details` section for challenge).
 
 @param[type=Frame] parentFrame
+@param[type=number] challengeId
 @return[type=Frame]
 ]]
-function MyDungeonsBook:DetailsFrame_Create(parentFrame)
-	local ScrollingTable = LibStub("ScrollingTable");
-	local cols = self:DetailsFrame_GetHeadersForTable();
-	local detailsFrame = CreateFrame("Frame", nil, parentFrame);
-	detailsFrame:SetWidth(825);
-	detailsFrame:SetHeight(250);
-	detailsFrame:SetPoint("TOPLEFT", 0, -110);
-	local table = ScrollingTable:CreateST(cols, 5, 40, nil, detailsFrame);
-	detailsFrame.table = table;
+function MyDungeonsBook:DetailsFrame_Create(parentFrame, challengeId)
+	local detailsFrame = self:TabContentWrapperWidget_Create(parentFrame);
+	local cols = self:DetailsFrame_GetColumnsForTable();
+	local table = self:TableWidget_Create(cols, 5, 40, nil, detailsFrame, "details");
+	table:SetData(self:DetailsFrame_GetDataForTable(challengeId));
+	table:SortData();
 	return detailsFrame;
 end
 
 --[[--
-Generate columns for avoidable damage table.
+Generate columns for Details table.
 
 @return[type=Frame]
 ]]
-function MyDungeonsBook:DetailsFrame_GetHeadersForTable()
+function MyDungeonsBook:DetailsFrame_GetColumnsForTable()
 	return {
 		{
 			name = L["Player"],
@@ -141,15 +138,3 @@ function MyDungeonsBook:DetailsFrame_GetDataForTable(challengeId)
 	end
 	return tableData;
 end
-
---[[--
-Updates a Details frame with data for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:DetailsFrame_Update(challengeId)
-	local challenge = self.db.char.challenges[challengeId];
-	if (challenge) then
-		self.challengeDetailsFrame.detailsFrame.table:SetData(self:DetailsFrame_GetDataForTable(challengeId));
-	end
-end
diff --git a/UI/ChallengeDetails/Tabs/Encounters.lua b/UI/ChallengeDetails/Tabs/Encounters.lua
index 2658119..9a47282 100644
--- a/UI/ChallengeDetails/Tabs/Encounters.lua
+++ b/UI/ChallengeDetails/Tabs/Encounters.lua
@@ -2,7 +2,6 @@
 @module MyDungeonsBook
 ]]
 local L = LibStub("AceLocale-3.0"):GetLocale("MyDungeonsBook");
-
 --[[--
 UI
 @section UI
@@ -12,26 +11,15 @@ UI
 Creates a frame for Encounters tab
 
 @param[type=Frame] parentFrame
+@param[type=number] challengeId
 @return[type=Frame]
 ]]
-function MyDungeonsBook:EncountersFrame_Create(parentFrame)
-	local ScrollingTable = LibStub("ScrollingTable");
-	local encountersFrame = CreateFrame("Frame", nil, parentFrame);
-	encountersFrame:SetWidth(900);
-	encountersFrame:SetHeight(490);
-	encountersFrame:SetPoint("TOPLEFT", 0, -110);
-	local cols = self:EncountersFrame_GetHeadersForTable();
-	local tableWrapper = CreateFrame("Frame", nil, encountersFrame);
-	tableWrapper:SetWidth(700);
-	tableWrapper:SetHeight(270);
-	tableWrapper:SetPoint("TOPLEFT", 0, 0);
-	local table = ScrollingTable:CreateST(cols, 6, 40, nil, tableWrapper);
-	table:RegisterEvents({
-		OnClick = function()
-			return true;
-	    end
-	});
-	encountersFrame.table = table;
+function MyDungeonsBook:EncountersFrame_Create(parentFrame, challengeId)
+	local encountersFrame = self:TabContentWrapperWidget_Create(parentFrame);
+	local data = self:EncountersFrame_GetDataForTable(challengeId);
+	local columns = self:EncountersFrame_GetColumnsForTable();
+	local table = self:TableWidget_Create(columns, 6, 40, nil, encountersFrame, "encounters");
+	table:SetData(data);
 	return encountersFrame;
 end
 
@@ -40,7 +28,7 @@ Generate columns for Encounters table.
 
 @return[type=table]
 ]]
-function MyDungeonsBook:EncountersFrame_GetHeadersForTable()
+function MyDungeonsBook:EncountersFrame_GetColumnsForTable()
 	return {
 		{
 			name = L["ID"],
@@ -54,7 +42,7 @@ function MyDungeonsBook:EncountersFrame_GetHeadersForTable()
 		},
 		{
 			name = L["Start Time"],
-			width = 75,
+			width = 60,
 			align = "LEFT",
 			sort = "dsc",
 			DoCellUpdate = function(...)
@@ -63,7 +51,7 @@ function MyDungeonsBook:EncountersFrame_GetHeadersForTable()
 		},
 		{
 			name = L["End Time"],
-			width = 75,
+			width = 60,
 			align = "LEFT",
 			DoCellUpdate = function(...)
 				self:Table_Cell_FormatAsTime(...);
@@ -104,7 +92,7 @@ function MyDungeonsBook:EncountersFrame_GetHeadersForTable()
 				else
 					icon = "interface\\raidframe\\readycheck-notready.blp";
 				end
-				cellFrame.text:SetText("|T" .. (icon or "") .. ":16:16:0:0:64:64:5:59:5:59|t");
+				(cellFrame.text or cellFrame):SetText("|T" .. (icon or "") .. ":16:16:0:0:64:64:5:59:5:59|t");
 			end
 		}
 	}
@@ -147,16 +135,3 @@ function MyDungeonsBook:EncountersFrame_GetDataForTable(challengeId)
 	end
 	return tableData;
 end
-
---[[--
-Update Encounters-tab for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:EncountersFrame_Update(challengeId)
-	local challenge = self.db.char.challenges[challengeId];
-	if (challenge) then
-		local encountersTableData = self:EncountersFrame_GetDataForTable(challengeId);
-		self.challengeDetailsFrame.encountersFrame.table:SetData(encountersTableData or {});
-	end
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics.lua b/UI/ChallengeDetails/Tabs/Mechanics.lua
index cfd9987..d83bbb5 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics.lua
@@ -14,34 +14,8 @@ Creates a frame for Mechanics tab
 @return[type=Frame]
 ]]
 function MyDungeonsBook:MechanicsFrame_Create(parentFrame)
-	local mechanicsFrame = CreateFrame("Frame", nil, parentFrame);
-	mechanicsFrame:SetPoint("TOPLEFT", 0, -30);
-	mechanicsFrame:SetWidth(900);
-	mechanicsFrame:SetHeight(650);
+	local mechanicsFrame = self:TabContentWrapperWidget_Create(parentFrame);
 	mechanicsFrame.tabButtonsFrame = self:MechanicsFrame_CreateTabButtonsFrame(mechanicsFrame);
-	mechanicsFrame.usedItemsFrame = self:UsedItemsFrame_Create(mechanicsFrame);
-	mechanicsFrame.damageFrame = self:DamageFrame_Create(mechanicsFrame);
-	mechanicsFrame.effectsAndAurasFrame = self:EffectsAndAurasFrame_Create(mechanicsFrame);
-	mechanicsFrame.castsFrame = self:CastsFrame_Create(mechanicsFrame);
-	mechanicsFrame.tabs = {
-		usedItems = mechanicsFrame.usedItemsFrame,
-		effectsAndAuras = mechanicsFrame.effectsAndAurasFrame,
-		damage = mechanicsFrame.damageFrame,
-		casts = mechanicsFrame.castsFrame
-	};
-	mechanicsFrame:Hide();
+	mechanicsFrame.tabButtonsFrame:SelectTab("usedItems");
 	return mechanicsFrame;
 end
-
---[[--
-Updates a Mechanics frame with data for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:MechanicsFrame_Update(challengeId)
-	self:UsedItemsFrame_Update(challengeId);
-	self:DamageFrame_Update(challengeId);
-	self:EffectsAndAurasFrame_Update(challengeId);
-	self:CastsFrame_Update(challengeId);
-	self:Tab_Click(self.challengeDetailsFrame.mechanicsFrame, "usedItems");
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs.lua
index 7e55e4c..83487d4 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs.lua
@@ -18,10 +18,28 @@ Created frame has a field `tabButtons` with tab-buttons. Keys in the `tabButtons
 @return[type=Frame] tabsButtonsFrame
 ]]
 function MyDungeonsBook:MechanicsFrame_CreateTabButtonsFrame(parentFrame)
-	return self:Tabs_Create(parentFrame, {
-		{id = "usedItems", title = L["Used Items"]},
-		{id = "casts", title = L["Casts"]},
-		{id = "damage", title = L["Damage"]},
-		{id = "effectsAndAuras", title = L["Effects and Auras"]}
+	local tabs = self:TabsWidget_Create(parentFrame);
+	tabs:SetTabs({
+		{value = "usedItems", text = L["Used Items"]},
+		{value = "casts", text = L["Casts"]},
+		{value = "damage", text = L["Damage"]},
+		{value = "effectsAndAuras", text = L["Effects and Auras"]}
 	});
+	tabs:SetCallback("OnGroupSelected", function (container, _, tabId)
+		container:ReleaseChildren();
+		if (tabId == "usedItems") then
+			self:UsedItemsFrame_Create(container, self.activeChallengeId);
+		end
+		if (tabId == "casts") then
+			self:CastsFrame_Create(container, self.activeChallengeId);
+		end
+		if (tabId == "damage") then
+			self:DamageFrame_Create(container, self.activeChallengeId);
+		end
+		if (tabId == "effectsAndAuras") then
+			self:EffectsAndAurasFrame_Create(container, self.activeChallengeId);
+		end
+	end);
+	tabs:SetHeight(582);
+	return tabs;
 end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts.lua
index b77cd11..ac0e455 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts.lua
@@ -14,31 +14,9 @@ Creates a frame for Casts tab
 @return[type=Frame]
 ]]
 function MyDungeonsBook:CastsFrame_Create(parentFrame)
-    local castsFrame = CreateFrame("Frame", nil, parentFrame);
-    castsFrame:SetPoint("TOPLEFT", 0, -30);
-    castsFrame:SetWidth(900);
+    local castsFrame = self:TabContentWrapperWidget_Create(parentFrame);
     castsFrame:SetHeight(650);
     castsFrame.tabButtonsFrame = self:CastsFrame_CreateTabButtonsFrame(castsFrame);
-    castsFrame.specialCastsFrame = self:SpecialCastsFrame_Create(castsFrame);
-    castsFrame.ownCastsFrame = self:OwnCastsByPartyMembersFrame_Create(castsFrame);
-    castsFrame.interruptsFrame = self:InterruptsFrame_Create(castsFrame);
-    castsFrame.tabs = {
-        interrupts = castsFrame.interruptsFrame,
-        specialCasts = castsFrame.specialCastsFrame,
-        ownCasts = castsFrame.ownCastsFrame
-    };
-    castsFrame:Hide();
+    castsFrame.tabButtonsFrame:SelectTab("interrupts");
     return castsFrame;
 end
-
---[[--
-Updates a Casts frame with data for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:CastsFrame_Update(challengeId)
-    self:InterruptsFrame_Update(challengeId);
-    self:SpecialCastsFrame_Update(challengeId);
-    self:OwnCastsByPartyMembersFrame_Update(challengeId);
-    self:Tab_Click(self.challengeDetailsFrame.mechanicsFrame.castsFrame, "interrupts");
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs.lua
index bb86830..e308c96 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs.lua
@@ -18,9 +18,24 @@ Created frame has a field `tabButtons` with tab-buttons. Keys in the `tabButtons
 @return[type=Frame] tabsButtonsFrame
 ]]
 function MyDungeonsBook:CastsFrame_CreateTabButtonsFrame(parentFrame)
-    return self:Tabs_Create(parentFrame, {
-        {id = "interrupts", title = L["Interrupts"]},
-        {id = "specialCasts", title = L["Special Casts"]},
-        {id = "ownCasts", title = L["Own Casts"]},
-    });
+	local tabs = self:TabsWidget_Create(parentFrame);
+	tabs:SetTabs({
+		{value = "interrupts", text = L["Interrupts"]},
+		{value = "specialCasts", text = L["Special Casts"]},
+		{value = "ownCasts", text = L["Own Casts"]}
+	});
+	tabs:SetCallback("OnGroupSelected", function (container, _, tabId)
+		container:ReleaseChildren();
+		if (tabId == "interrupts") then
+			self:InterruptsFrame_Create(container, self.activeChallengeId);
+		end
+		if (tabId == "specialCasts") then
+			self:SpecialCastsFrame_Create(container, self.activeChallengeId);
+		end
+		if (tabId == "ownCasts") then
+			self:OwnCastsByPartyMembersFrame_Create(container, self.activeChallengeId);
+		end
+	end)
+	tabs:SetHeight(546);
+	return tabs;
 end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/CastsByPartyMembers.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/CastsByPartyMembers.lua
index f74f59b..e3c3480 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/CastsByPartyMembers.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/CastsByPartyMembers.lua
@@ -7,24 +7,21 @@ UI
 @section UI
 ]]
 
-local L = LibStub("AceLocale-3.0"):GetLocale("MyDungeonsBook");
-
 --[[--
 Create a frame for Special Casts tab (data is taken from `mechanics[**-CASTS-DONE-BY-PARTY-MEMBERS]`).
 
 Mouse hover/out handler are included.
 
 @param[type=Frame] parentFrame
+@param[type=number] challengeId
 @return[type=Frame] tableWrapper
 ]]
-function MyDungeonsBook:SpecialCastsFrame_Create(parentFrame)
-	local ScrollingTable = LibStub("ScrollingTable");
-	local cols = self:Table_Headers_GetForSpellsSummary();
-	local tableWrapper = CreateFrame("Frame", nil, parentFrame);
-	tableWrapper:SetWidth(600);
-	tableWrapper:SetHeight(450);
-	tableWrapper:SetPoint("TOPLEFT", 0, -120);
-	local table = ScrollingTable:CreateST(cols, 12, 40, nil, tableWrapper);
+function MyDungeonsBook:SpecialCastsFrame_Create(parentFrame, challengeId)
+	local specialCastsFrame = self:TabContentWrapperWidget_Create(parentFrame);
+	local data = self:SpecialCastsFrame_GetDataForTable(challengeId, self:GetMechanicsPrefixForChallenge(challengeId) .. "-CASTS-DONE-BY-PARTY-MEMBERS");
+	local columns = self:Table_Headers_GetForSpellsSummary(challengeId);
+	local table = self:TableWidget_Create(columns, 11, 40, nil, specialCastsFrame, "special-casts-by-party-members");
+	table:SetData(data);
 	table:RegisterEvents({
 		OnEnter = function (_, cellFrame, data, _, _, realrow, column)
 			if (realrow) then
@@ -32,17 +29,16 @@ function MyDungeonsBook:SpecialCastsFrame_Create(parentFrame)
 					self:Table_Cell_SpellMouseHover(cellFrame, data[realrow].cols[1].value);
 				end
 			end
-	    end,
+		end,
 		OnLeave = function (_, _, _, _, _, realrow, column)
 			if (realrow) then
 				if (column == 2 or column == 3) then
 					self:Table_Cell_MouseOut();
 				end
 			end
-	    end
+		end
 	});
-	tableWrapper.table = table;
-	return tableWrapper;
+	return specialCastsFrame;
 end
 
 --[[--
@@ -92,18 +88,3 @@ function MyDungeonsBook:SpecialCastsFrame_GetDataForTable(challengeId, key)
 	end
 	return tableData;
 end
-
---[[--
-Update Special Casts-tab for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:SpecialCastsFrame_Update(challengeId)
-	local challenge = self.db.char.challenges[challengeId];
-	if (challenge) then
-		local specialCastsTableData = self:SpecialCastsFrame_GetDataForTable(challengeId, self:GetMechanicsPrefixForChallenge(challengeId) .. "-CASTS-DONE-BY-PARTY-MEMBERS");
-		self.challengeDetailsFrame.mechanicsFrame.castsFrame.specialCastsFrame.table:SetData(specialCastsTableData);
-		self.challengeDetailsFrame.mechanicsFrame.castsFrame.specialCastsFrame.table:SetDisplayCols(self:Table_Headers_GetForSpellsSummary(challengeId));
-		self.challengeDetailsFrame.mechanicsFrame.castsFrame.specialCastsFrame.table:SortData();
-	end
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/Interrupts.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/Interrupts.lua
index 1cedb6a..43732a0 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/Interrupts.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/Interrupts.lua
@@ -12,20 +12,15 @@ local L = LibStub("AceLocale-3.0"):GetLocale("MyDungeonsBook");
 Creates a frame for Interrupts tab.
 
 @param[type=Frame] parentFrame
+@param[type=number] challengeId
 @return[type=Frame]
 ]]
-function MyDungeonsBook:InterruptsFrame_Create(parentFrame)
-	local ScrollingTable = LibStub("ScrollingTable");
-	local interruptsFrame = CreateFrame("Frame", nil, parentFrame);
-	interruptsFrame:SetWidth(900);
-	interruptsFrame:SetHeight(490);
-	interruptsFrame:SetPoint("TOPLEFT", 0, -110);
-	local cols = self:InterruptsFrame_GetHeadersForTable();
-	local tableWrapper = CreateFrame("Frame", nil, interruptsFrame);
-	tableWrapper:SetWidth(580);
-	tableWrapper:SetHeight(240);
-	tableWrapper:SetPoint("TOPLEFT", 0, 0);
-	local table = ScrollingTable:CreateST(cols, 6, 40, nil, tableWrapper);
+function MyDungeonsBook:InterruptsFrame_Create(parentFrame, challengeId)
+	local interruptsFrame = self:TabContentWrapperWidget_Create(parentFrame);
+	local data = self:InterruptsFrame_GetDataForTable(challengeId);
+	local columns = self:InterruptsFrame_GetHeadersForTable(challengeId);
+	local table = self:TableWidget_Create(columns, 5, 40, nil, interruptsFrame, "interrupts");
+	table:SetData(data);
 	table:RegisterEvents({
 		OnEnter = function (_, cellFrame, data, _, _, realrow, column)
 			if (realrow) then
@@ -33,22 +28,20 @@ function MyDungeonsBook:InterruptsFrame_Create(parentFrame)
 					self:Table_Cell_SpellMouseHover(cellFrame, data[realrow].cols[1].value);
 				end
 			end
-	    end,
+		end,
 		OnLeave = function (_, _, _, _, _, realrow, column)
 			if (realrow) then
 				if (column == 2 or column == 3) then
 					self:Table_Cell_MouseOut();
 				end
 			end
-	    end
+		end
 	});
-	interruptsFrame.table = table;
-	local summaryWrapper = CreateFrame("Frame", nil, interruptsFrame);
-	summaryWrapper:SetWidth(290);
-	summaryWrapper:SetHeight(250);
-	summaryWrapper:SetPoint("TOPLEFT", 0, -285);
-	local cols = self:InterruptsFrame_GetHeadersForSummaryTable();
-	local summaryTable = ScrollingTable:CreateST(cols, 5, 40, nil, summaryWrapper);
+	local summaryData = self:InterruptsFrame_GetDataForSummaryTable(challengeId);
+	local summaryColumns = self:InterruptsFrame_GetHeadersForSummaryTable(challengeId);
+	local summaryTable = self:TableWidget_Create(summaryColumns, 5, 40, nil, interruptsFrame, "interrupts-summary");
+	summaryTable.frame:SetPoint("TOPLEFT", 0, -280);
+	summaryTable:SetData(summaryData);
 	summaryTable:RegisterEvents({
 		OnEnter = function (_, cellFrame, data, _, _, realrow, column)
 			if (realrow) then
@@ -56,16 +49,15 @@ function MyDungeonsBook:InterruptsFrame_Create(parentFrame)
 					self:Table_Cell_SpellMouseHover(cellFrame, data[realrow].cols[1].value);
 				end
 			end
-	    end,
+		end,
 		OnLeave = function (_, _, _, _, _, realrow, column)
 			if (realrow) then
 				if (column == 3 or column == 4) then
 					self:Table_Cell_MouseOut();
 				end
 			end
-	    end
+		end
 	});
-	interruptsFrame.summaryTable = summaryTable;
 	return interruptsFrame;
 end
 
@@ -355,21 +347,3 @@ function MyDungeonsBook:InterruptsFrame_GetDataForSummaryTable(challengeId)
 	end
 	return tableData;
 end
-
---[[--
-Update Interrupts-tab for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:InterruptsFrame_Update(challengeId)
-	local challenge = self.db.char.challenges[challengeId];
-	if (challenge) then
-		local interruptsTableData = self:InterruptsFrame_GetDataForTable(challengeId);
-		self.challengeDetailsFrame.mechanicsFrame.castsFrame.interruptsFrame.table:SetData(interruptsTableData or {});
-		self.challengeDetailsFrame.mechanicsFrame.castsFrame.interruptsFrame.table:SetDisplayCols(self:InterruptsFrame_GetHeadersForTable(challengeId));
-		local interruptsSummaryTableData = self:InterruptsFrame_GetDataForSummaryTable(challengeId);
-		if (interruptsSummaryTableData) then
-			self.challengeDetailsFrame.mechanicsFrame.castsFrame.interruptsFrame.summaryTable:SetData(interruptsSummaryTableData);
-		end
-	end
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/OwnCastsByPartyMembers.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/OwnCastsByPartyMembers.lua
index 2b8a71e..1675be7 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/OwnCastsByPartyMembers.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/OwnCastsByPartyMembers.lua
@@ -11,32 +11,12 @@ UI
 Creates a frame for Own Casts By Party Members tab
 
 @param[type=Frame] parentFrame
+@param[type=number] challengeId
 @return[type=Frame]
 ]]
-function MyDungeonsBook:OwnCastsByPartyMembersFrame_Create(parentFrame)
-    local ownCastsByPartyMembersFrame = CreateFrame("Frame", nil, parentFrame);
-    ownCastsByPartyMembersFrame:SetPoint("TOPLEFT", 0, -30);
-    ownCastsByPartyMembersFrame:SetWidth(900);
-    ownCastsByPartyMembersFrame:SetHeight(650);
-    ownCastsByPartyMembersFrame.tabButtonsFrame = self:OwnCastsByPartyMembersFrame_CreateTabButtonsFrame(ownCastsByPartyMembersFrame);
-    ownCastsByPartyMembersFrame.tabs = {};
-    for _, unitId in pairs(self:GetPartyRoster()) do
-        ownCastsByPartyMembersFrame[unitId] = self:OwnCastsByPartyMemberFrame_Create(ownCastsByPartyMembersFrame, unitId);
-        ownCastsByPartyMembersFrame.tabs[unitId] = ownCastsByPartyMembersFrame[unitId];
-    end
-    ownCastsByPartyMembersFrame:Hide();
+function MyDungeonsBook:OwnCastsByPartyMembersFrame_Create(parentFrame, challengeId)
+    local ownCastsByPartyMembersFrame = self:TabContentWrapperWidget_Create(parentFrame);
+    ownCastsByPartyMembersFrame.tabButtonsFrame = self:OwnCastsByPartyMembersFrame_CreateTabButtonsFrame(ownCastsByPartyMembersFrame, challengeId);
+    ownCastsByPartyMembersFrame.tabButtonsFrame:SelectTab("player");
     return ownCastsByPartyMembersFrame;
 end
-
---[[--
-Updates a Own Casts By Party Members frame with data for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:OwnCastsByPartyMembersFrame_Update(challengeId)
-    for _, unitId in pairs(self:GetPartyRoster()) do
-        self:OwnCastsByPartyMemberFrame_Update(challengeId, unitId);
-        self.challengeDetailsFrame.mechanicsFrame.castsFrame.ownCastsFrame.tabButtonsFrame.tabButtons[unitId]:SetText(self:GetNameByPartyUnit(challengeId, unitId));
-    end
-    self:Tab_Click(self.challengeDetailsFrame.mechanicsFrame.castsFrame.ownCastsFrame, "player");
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/OwnCastsByPartyMembers/Tabs.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/OwnCastsByPartyMembers/Tabs.lua
index 23b3a60..9f5c9ef 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/OwnCastsByPartyMembers/Tabs.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/OwnCastsByPartyMembers/Tabs.lua
@@ -13,14 +13,20 @@ Creates tabs (with click-handlers) for Own Casts frame.
 Created frame has a field `tabButtons` with tab-buttons. Keys in the `tabButtons` are equal to keys in the `ownCastsFrame.tabs`.
 
 @param[type=Frame] parentFrame
+@param[type=number] challengeId
 @return[type=Frame] tabsButtonsFrame
 ]]
-function MyDungeonsBook:OwnCastsByPartyMembersFrame_CreateTabButtonsFrame(parentFrame)
-    return self:Tabs_Create(parentFrame, {
-        {id = "player", title = "Player"},
-        {id = "party1", title = "Party1"},
-        {id = "party2", title = "Party2"},
-        {id = "party3", title = "Party3"},
-        {id = "party4", title = "Party4"},
-    });
+function MyDungeonsBook:OwnCastsByPartyMembersFrame_CreateTabButtonsFrame(parentFrame, challengeId)
+	local tabs = self:TabsWidget_Create(parentFrame);
+	local tabsConfig = {};
+	for _, unitId in pairs(self:GetPartyRoster()) do
+		tinsert(tabsConfig, {value = unitId, text = self:GetNameByPartyUnit(challengeId, unitId)});
+	end
+	tabs:SetTabs(tabsConfig);
+	tabs:SetCallback("OnGroupSelected", function (container, _, tabId)
+		container:ReleaseChildren();
+		self:OwnCastsByPartyMemberFrame_Create(container, self.activeChallengeId, tabId);
+	end)
+	tabs:SetHeight(510);
+	return tabs;
 end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/OwnCastsByPartyMembers/Tabs/OwnCastsByPartyMember.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/OwnCastsByPartyMembers/Tabs/OwnCastsByPartyMember.lua
index 61c3a0e..b109d9c 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/OwnCastsByPartyMembers/Tabs/OwnCastsByPartyMember.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Casts/Tabs/OwnCastsByPartyMembers/Tabs/OwnCastsByPartyMember.lua
@@ -11,19 +11,17 @@ local L = LibStub("AceLocale-3.0"):GetLocale("MyDungeonsBook");
 
 --[[--
 @param[type=Frame] parentFrame
+@param[type=number] challengeId
+@param[type=unitId] unitId
+@return[type=Frame]
 ]]
-function MyDungeonsBook:OwnCastsByPartyMemberFrame_Create(parentFrame)
-    local ScrollingTable = LibStub("ScrollingTable");
-    local ownCastsByPartyMemberFrame = CreateFrame("Frame", nil, parentFrame);
-    ownCastsByPartyMemberFrame:SetWidth(900);
-    ownCastsByPartyMemberFrame:SetHeight(490);
-    ownCastsByPartyMemberFrame:SetPoint("TOPLEFT", 0, -120);
-    local tableWrapper = CreateFrame("Frame", nil, ownCastsByPartyMemberFrame);
-    tableWrapper:SetWidth(500);
-    tableWrapper:SetHeight(450);
-    tableWrapper:SetPoint("TOPLEFT", 0, 0);
-    local cols = self:OwnCastsByPartyMemberFrame_GetHeadersForTable();
-    local table = ScrollingTable:CreateST(cols, 11, 40, nil, tableWrapper);
+function MyDungeonsBook:OwnCastsByPartyMemberFrame_Create(parentFrame, challengeId, unitId)
+    local ownCastsByPartyMemberFrame = self:TabContentWrapperWidget_Create(parentFrame);
+    local key = self:GetMechanicsPrefixForChallenge(challengeId) .. "-OWN-CASTS-DONE-BY-PARTY-MEMBERS";
+    local data = self:OwnCastsByPartyMemberFrame_GetDataForTable(challengeId, key, unitId);
+    local columns = self:OwnCastsByPartyMemberFrame_GetHeadersForTable(challengeId, unitId);
+    local table = self:TableWidget_Create(columns, 10, 40, nil, ownCastsByPartyMemberFrame, "own-casts-by-" .. unitId);
+    table:SetData(data);
     table:RegisterEvents({
         OnEnter = function (_, cellFrame, data, _, _, realrow, column)
             if (realrow) then
@@ -40,13 +38,11 @@ function MyDungeonsBook:OwnCastsByPartyMemberFrame_Create(parentFrame)
             end
         end
     });
-    ownCastsByPartyMemberFrame.table = table;
-    local summaryWrapper = CreateFrame("Frame", nil, ownCastsByPartyMemberFrame);
-    summaryWrapper:SetWidth(200);
-    summaryWrapper:SetHeight(450);
-    summaryWrapper:SetPoint("TOPLEFT", 410, 0);
-    local cols = self:OwnCastsByPartyMemberFrame_GetHeadersForSummaryTable();
-    local summaryTable = ScrollingTable:CreateST(cols, 11, 40, nil, summaryWrapper);
+    local summaryData = self:OwnCastsByPartyMemberFrame_GetDataForSummaryTable(challengeId, key, unitId);
+    local summaryColumns = self:OwnCastsByPartyMemberFrame_GetHeadersForSummaryTable();
+    local summaryTable = self:TableWidget_Create(summaryColumns, 10, 40, nil, ownCastsByPartyMemberFrame, "own-casts-by-" .. unitId .. "-summary");
+    summaryTable:SetData(summaryData);
+    summaryTable.frame:SetPoint("TOPLEFT", 380, -40);
     summaryTable:RegisterEvents({
         OnEnter = function (_, cellFrame, data, _, _, realrow, column)
             if (realrow) then
@@ -63,7 +59,6 @@ function MyDungeonsBook:OwnCastsByPartyMemberFrame_Create(parentFrame)
             end
         end
     });
-    ownCastsByPartyMemberFrame.summaryTable = summaryTable;
     return ownCastsByPartyMemberFrame;
 end
 
@@ -87,7 +82,7 @@ function MyDungeonsBook:OwnCastsByPartyMemberFrame_GetHeadersForTable()
         },
         {
             name = "",
-            width = 130,
+            width = 110,
             align = "LEFT",
             DoCellUpdate = function(...)
                 self:Table_Cell_FormatAsSpellLink(...);
@@ -136,7 +131,7 @@ function MyDungeonsBook:OwnCastsByPartyMemberFrame_GetHeadersForSummaryTable()
         },
         {
             name = "",
-            width = 130,
+            width = 110,
             align = "LEFT",
             DoCellUpdate = function(...)
                 self:Table_Cell_FormatAsSpellLink(...);
@@ -234,22 +229,3 @@ function MyDungeonsBook:OwnCastsByPartyMemberFrame_GetDataForSummaryTable(challe
     end
     return tableData;
 end
-
---[[--
-Update All Buffs On Party Members tab for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-@param[type=unitId] unitId
-]]
-function MyDungeonsBook:OwnCastsByPartyMemberFrame_Update(challengeId, unitId)
-    local challenge = self.db.char.challenges[challengeId];
-    if (challenge) then
-        local key = self:GetMechanicsPrefixForChallenge(challengeId) .. "-OWN-CASTS-DONE-BY-PARTY-MEMBERS";
-        local ownCastsByPartyMemberTableData = self:OwnCastsByPartyMemberFrame_GetDataForTable(challengeId, key, unitId);
-        self.challengeDetailsFrame.mechanicsFrame.castsFrame.ownCastsFrame[unitId].table:SetData(ownCastsByPartyMemberTableData);
-        self.challengeDetailsFrame.mechanicsFrame.castsFrame.ownCastsFrame[unitId].table:SetDisplayCols(self:OwnCastsByPartyMemberFrame_GetHeadersForTable(challengeId, unitId));
-        self.challengeDetailsFrame.mechanicsFrame.castsFrame.ownCastsFrame[unitId].table:SortData();
-        local ownCastsByPartyMemberSummaryTableData = self:OwnCastsByPartyMemberFrame_GetDataForSummaryTable(challengeId, key, unitId);
-        self.challengeDetailsFrame.mechanicsFrame.castsFrame.ownCastsFrame[unitId].summaryTable:SetData(ownCastsByPartyMemberSummaryTableData);
-    end
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage.lua
index 8c29875..9362b60 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage.lua
@@ -14,31 +14,9 @@ Creates a frame for Damage tab
 @return[type=Frame]
 ]]
 function MyDungeonsBook:DamageFrame_Create(parentFrame)
-	local damageFrame = CreateFrame("Frame", nil, parentFrame);
-	damageFrame:SetPoint("TOPLEFT", 0, -30);
-	damageFrame:SetWidth(900);
+	local damageFrame = self:TabContentWrapperWidget_Create(parentFrame);
 	damageFrame:SetHeight(650);
 	damageFrame.tabButtonsFrame = self:DamageFrame_CreateTabButtonsFrame(damageFrame);
-	damageFrame.damageDoneToUnitsFrame = self:DamageDoneToUnitsFrame_Create(damageFrame);
-	damageFrame.damageDoneToPartyMembersFrame = self:DamageDoneToPartyMembersFrame_Create(damageFrame);
-	damageFrame.avoidableDamageFrame = self:AvoidableDamageFrame_Create(damageFrame);
-	damageFrame.tabs = {
-		avoidableDamage = damageFrame.avoidableDamageFrame,
-		damageDoneToUnits = damageFrame.damageDoneToUnitsFrame,
-		damageDoneToPartyMembers = damageFrame.damageDoneToPartyMembersFrame,
-	};
-	damageFrame:Hide();
+	damageFrame.tabButtonsFrame:SelectTab("avoidableDamage");
 	return damageFrame;
 end
-
---[[--
-Updates a Damage frame with data for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:DamageFrame_Update(challengeId)
-	self:DamageDoneToUnitsFrame_Update(challengeId);
-	self:DamageDoneToPartyMembersFrame_Update(challengeId);
-	self:AvoidableDamageFrame_Update(challengeId);
-	self:Tab_Click(self.challengeDetailsFrame.mechanicsFrame.damageFrame, "avoidableDamage");
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs.lua
index 4c86770..bb5b06d 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs.lua
@@ -18,9 +18,24 @@ Created frame has a field `tabButtons` with tab-buttons. Keys in the `tabButtons
 @return[type=Frame] tabsButtonsFrame
 ]]
 function MyDungeonsBook:DamageFrame_CreateTabButtonsFrame(parentFrame)
-	return self:Tabs_Create(parentFrame, {
-		{id = "avoidableDamage", title = L["Avoidable Damage"]},
-		{id = "damageDoneToPartyMembers", title = L["All damage taken"]},
-		{id = "damageDoneToUnits", title = L["Damage Done To Units"]},
+	local tabs = self:TabsWidget_Create(parentFrame);
+	tabs:SetTabs({
+		{value = "avoidableDamage", text = L["Avoidable Damage"]},
+		{value = "damageDoneToPartyMembers", text = L["All damage taken"]},
+		{value = "damageDoneToUnits", text = L["Damage Done To Units"]},
 	});
+	tabs:SetCallback("OnGroupSelected", function (container, _, tabId)
+		container:ReleaseChildren();
+		if (tabId == "avoidableDamage") then
+			self:AvoidableDamageFrame_Create(container, self.activeChallengeId);
+		end
+		if (tabId == "damageDoneToPartyMembers") then
+			self:DamageDoneToPartyMembersFrame_Create(container, self.activeChallengeId);
+		end
+		if (tabId == "damageDoneToUnits") then
+			self:DamageDoneToUnitsFrame_Create(container, self.activeChallengeId);
+		end
+	end);
+	tabs:SetHeight(546);
+	return tabs;
 end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs/AvoidableDamage.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs/AvoidableDamage.lua
index c9df49a..a67efb9 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs/AvoidableDamage.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs/AvoidableDamage.lua
@@ -6,7 +6,6 @@
 UI
 @section UI
 ]]
-local L = LibStub("AceLocale-3.0"):GetLocale("MyDungeonsBook");
 
 --[[--
 Create a frame for Avoidable Damage tab (data is taken from `mechanics[**-AVOIDABLE-SPELLS]`).
@@ -14,16 +13,15 @@ Create a frame for Avoidable Damage tab (data is taken from `mechanics[**-AVOIDA
 Mouse hover/out handler are included.
 
 @param[type=Frame] parentFrame
+@param[type=number] challengeId
 @return[type=Frame] tableWrapper
 ]]
-function MyDungeonsBook:AvoidableDamageFrame_Create(parentFrame)
-	local ScrollingTable = LibStub("ScrollingTable");
-	local cols = self:Table_Headers_GetForDamageToPartyMembers();
-	local tableWrapper = CreateFrame("Frame", nil, parentFrame);
-	tableWrapper:SetWidth(900);
-	tableWrapper:SetHeight(450);
-	tableWrapper:SetPoint("TOPLEFT", 0, -120);
-	local table = ScrollingTable:CreateST(cols, 11, 40, nil, tableWrapper);
+function MyDungeonsBook:AvoidableDamageFrame_Create(parentFrame, challengeId)
+	local avoidableDamageFrame = self:TabContentWrapperWidget_Create(parentFrame);
+	local data = self:AvoidableDamageFrame_GetDataForTable(challengeId, self:GetMechanicsPrefixForChallenge(challengeId) .. "-AVOIDABLE-SPELLS");
+	local columns = self:Table_Columns_GetForDamageToPartyMembers(challengeId);
+	local table = self:TableWidget_Create(columns, 11, 40, nil, avoidableDamageFrame, "avoidable-damage");
+	table:SetData(data);
 	table:RegisterEvents({
 		OnEnter = function (_, cellFrame, data, _, _, realrow, column)
 			if (realrow) then
@@ -31,17 +29,16 @@ function MyDungeonsBook:AvoidableDamageFrame_Create(parentFrame)
 					self:Table_Cell_SpellMouseHover(cellFrame, data[realrow].cols[1].value);
 				end
 			end
-	    end,
+		end,
 		OnLeave = function (_, _, _, _, _, realrow, column)
 			if (realrow) then
 				if (column == 2 or column == 3) then
 					self:Table_Cell_MouseOut();
 				end
 			end
-	    end
+		end
 	});
-	tableWrapper.table = table;
-	return tableWrapper;
+	return avoidableDamageFrame;
 end
 
 --[[--
@@ -165,18 +162,3 @@ function MyDungeonsBook:AvoidableDamageFrame_GetSummaryRow(challengeId, key)
 	end
 	return tableData;
 end
-
---[[--
-Update Avoidable Damage-tab for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:AvoidableDamageFrame_Update(challengeId)
-	local challenge = self.db.char.challenges[challengeId];
-	if (challenge) then
-		local avoidableDamageTableData = self:AvoidableDamageFrame_GetDataForTable(challengeId, self:GetMechanicsPrefixForChallenge(challengeId) .. "-AVOIDABLE-SPELLS");
-		self.challengeDetailsFrame.mechanicsFrame.damageFrame.avoidableDamageFrame.table:SetData(avoidableDamageTableData);
-		self.challengeDetailsFrame.mechanicsFrame.damageFrame.avoidableDamageFrame.table:SetDisplayCols(self:Table_Headers_GetForDamageToPartyMembers(challengeId));
-		self.challengeDetailsFrame.mechanicsFrame.damageFrame.avoidableDamageFrame.table:SortData();
-	end
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs/DamageDoneToPartyMembers.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs/DamageDoneToPartyMembers.lua
index 27df6eb..eec4617 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs/DamageDoneToPartyMembers.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs/DamageDoneToPartyMembers.lua
@@ -6,7 +6,6 @@
 UI
 @section UI
 ]]
-local L = LibStub("AceLocale-3.0"):GetLocale("MyDungeonsBook");
 
 --[[--
 Create a frame for Damage Done To Party Members tab (data is taken from `mechanics[ALL-DAMAGE-DONE-TO-PARTY-MEMBERS]`).
@@ -14,16 +13,15 @@ Create a frame for Damage Done To Party Members tab (data is taken from `mechani
 Mouse hover/out handler are included.
 
 @param[type=Frame] parentFrame
+@param[type=number] challengeId
 @return[type=Frame] tableWrapper
 ]]
-function MyDungeonsBook:DamageDoneToPartyMembersFrame_Create(parentFrame)
-	local ScrollingTable = LibStub("ScrollingTable");
-	local cols = self:Table_Headers_GetForDamageToPartyMembers();
-	local tableWrapper = CreateFrame("Frame", nil, parentFrame);
-	tableWrapper:SetWidth(900);
-	tableWrapper:SetHeight(450);
-	tableWrapper:SetPoint("TOPLEFT", 0, -120);
-	local table = ScrollingTable:CreateST(cols, 11, 40, nil, tableWrapper);
+function MyDungeonsBook:DamageDoneToPartyMembersFrame_Create(parentFrame, challengeId)
+	local damageDoneToPartyMembersFrame = self:TabContentWrapperWidget_Create(parentFrame);
+	local data = self:DamageDoneToPartyMembersFrame_GetDataForTable(challengeId, "ALL-DAMAGE-DONE-TO-PARTY-MEMBERS");
+	local columns = self:Table_Columns_GetForDamageToPartyMembers(challengeId);
+	local table = self:TableWidget_Create(columns, 11, 40, nil, damageDoneToPartyMembersFrame, "damage-done-to-party-members");
+	table:SetData(data);
 	table:RegisterEvents({
 		OnEnter = function (_, cellFrame, data, _, _, realrow, column, _)
 			if (realrow) then
@@ -31,17 +29,16 @@ function MyDungeonsBook:DamageDoneToPartyMembersFrame_Create(parentFrame)
 					self:Table_Cell_SpellMouseHover(cellFrame, data[realrow].cols[1].value);
 				end
 			end
-	    end,
+		end,
 		OnLeave = function (_, _, _, _, _, realrow, column, _)
 			if (realrow) then
 				if (column == 2 or column == 3) then
 					self:Table_Cell_MouseOut();
 				end
 			end
-	    end
+		end
 	});
-	tableWrapper.table = table;
-	return tableWrapper;
+	return damageDoneToPartyMembersFrame;
 end
 
 --[[--
@@ -150,18 +147,3 @@ function MyDungeonsBook:DamageDoneToPartyMembersFrame_GetSummaryRow(challengeId,
 	end
 	return tableData;
 end
-
---[[--
-Update Damage Done To Units tab for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:DamageDoneToPartyMembersFrame_Update(challengeId)
-	local challenge = self.db.char.challenges[challengeId];
-	if (challenge) then
-		local damageDoneToPartyMembersTableData = self:DamageDoneToPartyMembersFrame_GetDataForTable(challengeId, "ALL-DAMAGE-DONE-TO-PARTY-MEMBERS");
-		self.challengeDetailsFrame.mechanicsFrame.damageFrame.damageDoneToPartyMembersFrame.table:SetData(damageDoneToPartyMembersTableData);
-		self.challengeDetailsFrame.mechanicsFrame.damageFrame.damageDoneToPartyMembersFrame.table:SetDisplayCols(self:Table_Headers_GetForDamageToPartyMembers(challengeId));
-		self.challengeDetailsFrame.mechanicsFrame.damageFrame.damageDoneToPartyMembersFrame.table:SortData();
-	end
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs/DamageDoneToUnits.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs/DamageDoneToUnits.lua
index d2ac24a..b3e70d5 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs/DamageDoneToUnits.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/Damage/Tabs/DamageDoneToUnits.lua
@@ -14,28 +14,26 @@ Create a frame for Damage Done To Units tab (data is taken from `mechanics[**-DA
 Mouse hover/out handler are included.
 
 @param[type=Frame] parentFrame
+@param[type=number] challengeId
 @return[type=Frame] tableWrapper
 ]]
-function MyDungeonsBook:DamageDoneToUnitsFrame_Create(parentFrame)
-	local ScrollingTable = LibStub("ScrollingTable");
-	local cols = self:DamageDoneToUnitsFrame_GetHeadersForTable();
-	local tableWrapper = CreateFrame("Frame", nil, parentFrame);
-	tableWrapper:SetWidth(900);
-	tableWrapper:SetHeight(450);
-	tableWrapper:SetPoint("TOPLEFT", 0, -120);
-	local table = ScrollingTable:CreateST(cols, 11, 40, nil, tableWrapper);
+function MyDungeonsBook:DamageDoneToUnitsFrame_Create(parentFrame, challengeId)
+	local damageDoneToUnitsFrame = self:TabContentWrapperWidget_Create(parentFrame);
+	local data = self:DamageDoneToUnitsFrame_GetDataForTable(challengeId, self:GetMechanicsPrefixForChallenge(challengeId) .. "-DAMAGE-DONE-TO-UNITS");
+	local columns = self:DamageDoneToUnitsFrame_GetHeadersForTable(challengeId);
+	local table = self:TableWidget_Create(columns, 11, 40, nil, damageDoneToUnitsFrame, "damage-done-to-units");
+	table:SetData(data);
 	table:RegisterEvents({
 		OnEnter = function (...)
 			self:DamageDoneToUnitsFrame_RowHover(...);
-	    end,
+		end,
 		OnLeave = function (_, _, _, _, _, realrow)
 			if (realrow) then
 				self:Table_Cell_MouseOut();
 			end
-	    end
+		end
 	});
-	tableWrapper.table = table;
-	return tableWrapper;
+	return damageDoneToUnitsFrame;
 end
 
 --[[--
@@ -259,18 +257,3 @@ function MyDungeonsBook:DamageDoneToUnitsFrame_GetDataForTable(challengeId, key)
 	end
 	return tableData;
 end
-
---[[--
-Update Damage Done To Units tab for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:DamageDoneToUnitsFrame_Update(challengeId)
-	local challenge = self.db.char.challenges[challengeId];
-	if (challenge) then
-		local damageDoneToUnitsTableData = self:DamageDoneToUnitsFrame_GetDataForTable(challengeId, self:GetMechanicsPrefixForChallenge(challengeId) .. "-DAMAGE-DONE-TO-UNITS");
-		self.challengeDetailsFrame.mechanicsFrame.damageFrame.damageDoneToUnitsFrame.table:SetData(damageDoneToUnitsTableData);
-		self.challengeDetailsFrame.mechanicsFrame.damageFrame.damageDoneToUnitsFrame.table:SetDisplayCols(self:DamageDoneToUnitsFrame_GetHeadersForTable(challengeId));
-		self.challengeDetailsFrame.mechanicsFrame.damageFrame.damageDoneToUnitsFrame.table:SortData();
-	end
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras.lua
index ca16fbf..afb09b6 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras.lua
@@ -14,40 +14,9 @@ Creates a frame for Effects And Auras tab
 @return[type=Frame]
 ]]
 function MyDungeonsBook:EffectsAndAurasFrame_Create(parentFrame)
-	local effectsAndAurasFrame = CreateFrame("Frame", nil, parentFrame);
-	effectsAndAurasFrame:SetPoint("TOPLEFT", 0, -30);
-	effectsAndAurasFrame:SetWidth(900);
+	local effectsAndAurasFrame = self:TabContentWrapperWidget_Create(parentFrame);
 	effectsAndAurasFrame:SetHeight(650);
 	effectsAndAurasFrame.tabButtonsFrame = self:EffectsAndAurasFrame_CreateTabButtonsFrame(effectsAndAurasFrame);
-	effectsAndAurasFrame.buffsOrDebuffsOnUnitsFrame = self:BuffsOrDebuffsOnUnitsFrame_Create(effectsAndAurasFrame);
-	effectsAndAurasFrame.buffsOrDebuffsOnPartyMembersFrame = self:BuffsOrDebuffsOnPartyMembersFrame_Create(effectsAndAurasFrame);
-	effectsAndAurasFrame.avoidableDebuffsFrame = self:AvoidableDebuffsFrame_Create(effectsAndAurasFrame);
-	effectsAndAurasFrame.allBuffsOnPartyMembersFrame = self:AllBuffsOnPartyMemberFrame_Create(effectsAndAurasFrame);
-	effectsAndAurasFrame.allDebuffsOnPartyMembersFrame = self:AllDebuffsOnPartyMemberFrame_Create(effectsAndAurasFrame);
-	effectsAndAurasFrame.dispelsFrame = self:DispelsFrame_Create(effectsAndAurasFrame);
-	effectsAndAurasFrame.tabs = {
-		avoidableDebuffs = effectsAndAurasFrame.avoidableDebuffsFrame,
-		buffsOrDebuffsOnUnits = effectsAndAurasFrame.buffsOrDebuffsOnUnitsFrame,
-		buffsOrDebuffsOnPartyMembers = effectsAndAurasFrame.buffsOrDebuffsOnPartyMembersFrame,
-		allBuffsOnPartyMembers = effectsAndAurasFrame.allBuffsOnPartyMembersFrame,
-		allDebuffsOnPartyMembers = effectsAndAurasFrame.allDebuffsOnPartyMembersFrame,
-		dispels = effectsAndAurasFrame.dispelsFrame
-	};
-	effectsAndAurasFrame:Hide();
+	effectsAndAurasFrame.tabButtonsFrame:SelectTab("dispels");
 	return effectsAndAurasFrame;
 end
-
---[[--
-Updates a Effects And Auras frame with data for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:EffectsAndAurasFrame_Update(challengeId)
-	self:BuffsOrDebuffsOnUnitsFrame_Update(challengeId);
-	self:BuffsOrDebuffsOnPartyMembersFrame_Update(challengeId);
-	self:AvoidableDebuffsFrame_Update(challengeId);
-	self:AllBuffsOnPartyMemberFrame_Update(challengeId);
-	self:AllDebuffsOnPartyMemberFrame_Update(challengeId);
-	self:DispelsFrame_Update(challengeId);
-	self:Tab_Click(self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame, "dispels");
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs.lua
index 373ca22..c8f9a7e 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs.lua
@@ -18,12 +18,36 @@ Created frame has a field `tabButtons` with tab-buttons. Keys in the `tabButtons
 @return[type=Frame] tabsButtonsFrame
 ]]
 function MyDungeonsBook:EffectsAndAurasFrame_CreateTabButtonsFrame(parentFrame)
-	return self:Tabs_Create(parentFrame, {
-		{id = "dispels", title = L["Dispels"]},
-		{id = "avoidableDebuffs", title = L["Avoidable Debuffs"]},
-		{id = "allDebuffsOnPartyMembers", title = L["All Debuffs"]},
-		{id = "allBuffsOnPartyMembers", title = L["All Buffs"]},
-		{id = "buffsOrDebuffsOnPartyMembers", title = L["Special Buffs Or Debuffs"]},
-		{id = "buffsOrDebuffsOnUnits", title = L["Buffs Or Debuffs On Units"]},
+	local tabs = self:TabsWidget_Create(parentFrame);
+	tabs:SetTabs({
+		{value = "dispels", text = L["Dispels"]},
+		{value = "avoidableDebuffs", text = L["Avoidable Debuffs"]},
+		{value = "allDebuffsOnPartyMembers", text = L["All Debuffs"]},
+		{value = "allBuffsOnPartyMembers", text = L["All Buffs"]},
+		{value = "buffsOrDebuffsOnPartyMembers", text = L["Special Buffs Or Debuffs"]},
+		{value = "buffsOrDebuffsOnUnits", text = L["Buffs Or Debuffs On Units"]}
 	});
+	tabs:SetCallback("OnGroupSelected", function (container, _, tabId)
+		container:ReleaseChildren();
+		if (tabId == "dispels") then
+			self:DispelsFrame_Create(container, self.activeChallengeId);
+		end
+		if (tabId == "avoidableDebuffs") then
+			self:AvoidableDebuffsFrame_Create(container, self.activeChallengeId);
+		end
+		if (tabId == "allDebuffsOnPartyMembers") then
+			self:AllDebuffsOnPartyMemberFrame_Create(container, self.activeChallengeId);
+		end
+		if (tabId == "allBuffsOnPartyMembers") then
+			self:AllBuffsOnPartyMemberFrame_Create(container, self.activeChallengeId);
+		end
+		if (tabId == "buffsOrDebuffsOnPartyMembers") then
+			self:BuffsOrDebuffsOnPartyMembersFrame_Create(container, self.activeChallengeId);
+		end
+		if (tabId == "buffsOrDebuffsOnUnits") then
+			self:BuffsOrDebuffsOnUnitsFrame_Create(container, self.activeChallengeId);
+		end
+	end);
+	tabs:SetHeight(546);
+	return tabs;
 end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/AllBuffsOnPartyMembers.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/AllBuffsOnPartyMembers.lua
index cb01a2e..e675dc5 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/AllBuffsOnPartyMembers.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/AllBuffsOnPartyMembers.lua
@@ -13,20 +13,15 @@ Create a frame for All Buffs On Party Members tab (data is taken from `mechanics
 Mouse hover/out handler are included.
 
 @param[type=Frame] parentFrame
+@param[type=number] challengeId
 @return[type=Frame] tableWrapper
 ]]
-function MyDungeonsBook:AllBuffsOnPartyMemberFrame_Create(parentFrame)
-    local ScrollingTable = LibStub("ScrollingTable");
-    local interruptsFrame = CreateFrame("Frame", nil, parentFrame);
-    interruptsFrame:SetWidth(900);
-    interruptsFrame:SetHeight(490);
-    interruptsFrame:SetPoint("TOPLEFT", 0, -120);
-    local tableWrapper = CreateFrame("Frame", nil, interruptsFrame);
-    tableWrapper:SetWidth(600);
-    tableWrapper:SetHeight(450);
-    tableWrapper:SetPoint("TOPLEFT", 0, 0);
-    local cols = self:Table_Headers_GetForSpellsSummary();
-    local table = ScrollingTable:CreateST(cols, 11, 40, nil, tableWrapper);
+function MyDungeonsBook:AllBuffsOnPartyMemberFrame_Create(parentFrame, challengeId)
+    local allBuffsOnPartyMemberFrame = self:TabContentWrapperWidget_Create(parentFrame);
+    local data = self:AllBuffsOnPartyMemberFrame_GetDataForTable(challengeId, "ALL-AURAS", "BUFF");
+    local columns = self:Table_Headers_GetForSpellsSummary(challengeId);
+    local table = self:TableWidget_Create(columns, 11, 40, nil, allBuffsOnPartyMemberFrame, "all-buffs-on-party-members");
+    table:SetData(data);
     table:RegisterEvents({
         OnEnter = function (_, cellFrame, data, _, _, realrow, column)
             if (realrow) then
@@ -43,8 +38,7 @@ function MyDungeonsBook:AllBuffsOnPartyMemberFrame_Create(parentFrame)
             end
         end
     });
-    tableWrapper.table = table;
-    return tableWrapper;
+    return allBuffsOnPartyMemberFrame;
 end
 
 --[[--
@@ -104,18 +98,3 @@ function MyDungeonsBook:AllBuffsOnPartyMemberFrame_GetDataForTable(challengeId,
     end
     return remappedTableData;
 end
-
---[[--
-Update All Buffs On Party Members tab for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:AllBuffsOnPartyMemberFrame_Update(challengeId)
-    local challenge = self.db.char.challenges[challengeId];
-    if (challenge) then
-        local allBuffsOnPartyMembersTableData = self:AllBuffsOnPartyMemberFrame_GetDataForTable(challengeId, "ALL-AURAS", "BUFF");
-        self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.allBuffsOnPartyMembersFrame.table:SetData(allBuffsOnPartyMembersTableData);
-        self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.allBuffsOnPartyMembersFrame.table:SetDisplayCols(self:Table_Headers_GetForSpellsSummary(challengeId));
-        self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.allBuffsOnPartyMembersFrame.table:SortData();
-    end
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/AllDebuffsOnPartyMembers.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/AllDebuffsOnPartyMembers.lua
index 1d853c4..82cc4e1 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/AllDebuffsOnPartyMembers.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/AllDebuffsOnPartyMembers.lua
@@ -7,8 +7,6 @@ UI
 @section UI
 ]]
 
-local L = LibStub("AceLocale-3.0"):GetLocale("MyDungeonsBook");
-
 --[[--
 Create a frame for All Buffs On Party Members tab (data is taken from `mechanics[ALL-AURAS]`).
 
@@ -17,18 +15,12 @@ Mouse hover/out handler are included.
 @param[type=Frame] parentFrame
 @return[type=Frame] tableWrapper
 ]]
-function MyDungeonsBook:AllDebuffsOnPartyMemberFrame_Create(parentFrame)
-    local ScrollingTable = LibStub("ScrollingTable");
-    local interruptsFrame = CreateFrame("Frame", nil, parentFrame);
-    interruptsFrame:SetWidth(900);
-    interruptsFrame:SetHeight(490);
-    interruptsFrame:SetPoint("TOPLEFT", 0, -120);
-    local tableWrapper = CreateFrame("Frame", nil, interruptsFrame);
-    tableWrapper:SetWidth(600);
-    tableWrapper:SetHeight(450);
-    tableWrapper:SetPoint("TOPLEFT", 0, 0);
-    local cols = self:Table_Headers_GetForSpellsSummary();
-    local table = ScrollingTable:CreateST(cols, 11, 40, nil, tableWrapper);
+function MyDungeonsBook:AllDebuffsOnPartyMemberFrame_Create(parentFrame, challengeId)
+    local allDebuffsOnPartyMemberFrame = self:TabContentWrapperWidget_Create(parentFrame);
+    local data = self:AllDebuffsOnPartyMemberFrame_GetDataForTable(challengeId, "ALL-AURAS", "DEBUFF");
+    local columns = self:Table_Headers_GetForSpellsSummary(challengeId);
+    local table = self:TableWidget_Create(columns, 11, 40, nil, allDebuffsOnPartyMemberFrame, "all-debuffs-on-party-members");
+    table:SetData(data);
     table:RegisterEvents({
         OnEnter = function (_, cellFrame, data, _, _, realrow, column)
             if (realrow) then
@@ -45,8 +37,7 @@ function MyDungeonsBook:AllDebuffsOnPartyMemberFrame_Create(parentFrame)
             end
         end
     });
-    tableWrapper.table = table;
-    return tableWrapper;
+    return allDebuffsOnPartyMemberFrame;
 end
 
 --[[--
@@ -106,18 +97,3 @@ function MyDungeonsBook:AllDebuffsOnPartyMemberFrame_GetDataForTable(challengeId
     end
     return remappedTableData;
 end
-
---[[--
-Update All Buffs On Party Members tab for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:AllDebuffsOnPartyMemberFrame_Update(challengeId)
-    local challenge = self.db.char.challenges[challengeId];
-    if (challenge) then
-        local allDebuffsOnPartyMembersTableData = self:AllDebuffsOnPartyMemberFrame_GetDataForTable(challengeId, "ALL-AURAS", "DEBUFF");
-        self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.allDebuffsOnPartyMembersFrame.table:SetData(allDebuffsOnPartyMembersTableData);
-        self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.allDebuffsOnPartyMembersFrame.table:SetDisplayCols(self:Table_Headers_GetForSpellsSummary(challengeId));
-        self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.allDebuffsOnPartyMembersFrame.table:SortData();
-    end
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/AvoidableDebuffs.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/AvoidableDebuffs.lua
index 2e358e9..873adab 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/AvoidableDebuffs.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/AvoidableDebuffs.lua
@@ -7,28 +7,21 @@ UI
 @section UI
 ]]
 
-local L = LibStub("AceLocale-3.0"):GetLocale("MyDungeonsBook");
-
 --[[--
 Create a frame for Avoidable Debuffs tab (data is taken from `mechanics[**-AVOIDABLE-AURAS]`).
 
 Mouse hover/out handler are included.
 
 @param[type=Frame] parentFrame
+@param[type=number] challengeId
 @return[type=Frame] tableWrapper
 ]]
-function MyDungeonsBook:AvoidableDebuffsFrame_Create(parentFrame)
-	local ScrollingTable = LibStub("ScrollingTable");
-	local interruptsFrame = CreateFrame("Frame", nil, parentFrame);
-	interruptsFrame:SetWidth(900);
-	interruptsFrame:SetHeight(490);
-	interruptsFrame:SetPoint("TOPLEFT", 0, -120);
-	local tableWrapper = CreateFrame("Frame", nil, interruptsFrame);
-	tableWrapper:SetWidth(600);
-	tableWrapper:SetHeight(450);
-	tableWrapper:SetPoint("TOPLEFT", 0, 0);
-	local cols = self:Table_Headers_GetForSpellsSummary();
-	local table = ScrollingTable:CreateST(cols, 11, 40, nil, tableWrapper);
+function MyDungeonsBook:AvoidableDebuffsFrame_Create(parentFrame, challengeId)
+	local avoidableDebuffsFrame = self:TabContentWrapperWidget_Create(parentFrame);
+	local data = self:AvoidableDebuffsFrame_GetDataForTable(challengeId, self:GetMechanicsPrefixForChallenge(challengeId) .. "-AVOIDABLE-AURAS");
+	local columns = self:Table_Headers_GetForSpellsSummary(challengeId);
+	local table = self:TableWidget_Create(columns, 11, 40, nil, avoidableDebuffsFrame, "avoidable-debuffs");
+	table:SetData(data);
 	table:RegisterEvents({
 		OnEnter = function (_, cellFrame, data, _, _, realrow, column)
 			if (realrow) then
@@ -36,17 +29,16 @@ function MyDungeonsBook:AvoidableDebuffsFrame_Create(parentFrame)
 					self:Table_Cell_SpellMouseHover(cellFrame, data[realrow].cols[1].value);
 				end
 			end
-	    end,
+		end,
 		OnLeave = function (_, _, _, _, _, realrow, column)
 			if (realrow) then
 				if (column == 2 or column == 3) then
 					self:Table_Cell_MouseOut();
 				end
 			end
-	    end
+		end
 	});
-	tableWrapper.table = table;
-	return tableWrapper;
+	return avoidableDebuffsFrame;
 end
 
 --[[--
@@ -109,18 +101,3 @@ function MyDungeonsBook:AvoidableDebuffsFrame_GetDataForTable(challengeId, key)
 	end
 	return remappedTableData;
 end
-
---[[--
-Update Avoidable Damage-tab for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:AvoidableDebuffsFrame_Update(challengeId)
-	local challenge = self.db.char.challenges[challengeId];
-	if (challenge) then
-		local avoidableDebuffsTableData = self:AvoidableDebuffsFrame_GetDataForTable(challengeId, self:GetMechanicsPrefixForChallenge(challengeId) .. "-AVOIDABLE-AURAS");
-		self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.avoidableDebuffsFrame.table:SetData(avoidableDebuffsTableData);
-		self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.avoidableDebuffsFrame.table:SetDisplayCols(self:Table_Headers_GetForSpellsSummary(challengeId));
-		self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.avoidableDebuffsFrame.table:SortData();
-	end
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/BuffsOrDebuffsOnPartyMembers.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/BuffsOrDebuffsOnPartyMembers.lua
index 2911cda..d2cf2bc 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/BuffsOrDebuffsOnPartyMembers.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/BuffsOrDebuffsOnPartyMembers.lua
@@ -7,46 +7,41 @@ UI
 @section UI
 ]]
 
-local L = LibStub("AceLocale-3.0"):GetLocale("MyDungeonsBook");
-
 --[[--
 Create a frame for Buff Or Debuffs On Party Members tab (data is taken from `mechanics[**-BUFFS-OR-DEBUFFS-ON-PARTY-MEMBERS]`).
 
 Mouse hover/out handler are included.
 
 @param[type=Frame] parentFrame
+@oaram[type=number] challengeId
 @return[type=Frame] tableWrapper
 ]]
-function MyDungeonsBook:BuffsOrDebuffsOnPartyMembersFrame_Create(parentFrame)
-	local ScrollingTable = LibStub("ScrollingTable");
-	local cols = self:Table_Headers_GetForSpellsSummary();
-	local buffsOrDebuffsOnPartyMembersFrame = CreateFrame("Frame", nil, parentFrame);
-	buffsOrDebuffsOnPartyMembersFrame:SetWidth(900);
-	buffsOrDebuffsOnPartyMembersFrame:SetHeight(490);
-	buffsOrDebuffsOnPartyMembersFrame:SetPoint("TOPLEFT", 0, -120);
-	local tableWrapper = CreateFrame("Frame", nil, buffsOrDebuffsOnPartyMembersFrame);
-	tableWrapper:SetWidth(600);
-	tableWrapper:SetHeight(450);
-	tableWrapper:SetPoint("TOPLEFT", 0, 0);
-	local table = ScrollingTable:CreateST(cols, 11, 40, nil, tableWrapper);
-	table:RegisterEvents({
-		OnEnter = function (_, cellFrame, data, _, _, realrow, column)
-			if (realrow) then
-				if (column == 2 or column == 3) then
-					self:Table_Cell_SpellMouseHover(cellFrame, data[realrow].cols[1].value);
+function MyDungeonsBook:BuffsOrDebuffsOnPartyMembersFrame_Create(parentFrame, challengeId)
+	local buffsOrDebuffsOnPartyMembersFrame = self:TabContentWrapperWidget_Create(parentFrame);
+	local challenge = self.db.char.challenges[challengeId];
+	if (challenge) then
+		local data = self:BuffsOrDebuffsOnPartyMembersFrame_GetDataForTable(challengeId, self:GetMechanicsPrefixForChallenge(challengeId) .. "-BUFFS-OR-DEBUFFS-ON-PARTY-MEMBERS");
+		local columns = self:Table_Headers_GetForSpellsSummary(challengeId);
+		local table = self:TableWidget_Create(columns, 11, 40, nil, buffsOrDebuffsOnPartyMembersFrame, "buffs-or-debuffs-on-party-members");
+		table:SetData(data);
+		table:RegisterEvents({
+			OnEnter = function (_, cellFrame, data, _, _, realrow, column)
+				if (realrow) then
+					if (column == 2 or column == 3) then
+						self:Table_Cell_SpellMouseHover(cellFrame, data[realrow].cols[1].value);
+					end
 				end
-			end
-	    end,
-		OnLeave = function (_, _, _, _, _, realrow, column)
-			if (realrow) then
-				if (column == 2 or column == 3) then
-					self:Table_Cell_MouseOut();
+			end,
+			OnLeave = function (_, _, _, _, _, realrow, column)
+				if (realrow) then
+					if (column == 2 or column == 3) then
+						self:Table_Cell_MouseOut();
+					end
 				end
 			end
-	    end
-	});
-	tableWrapper.table = table;
-	return tableWrapper;
+		});
+	end
+	return buffsOrDebuffsOnPartyMembersFrame;
 end
 
 --[[--
@@ -93,18 +88,3 @@ function MyDungeonsBook:BuffsOrDebuffsOnPartyMembersFrame_GetDataForTable(challe
 	end
 	return tableData;
 end
-
---[[--
-Update Buff Or Debuffs On Party Members tab for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:BuffsOrDebuffsOnPartyMembersFrame_Update(challengeId)
-	local challenge = self.db.char.challenges[challengeId];
-	if (challenge) then
-		local buffsOrDebuffsOnPartyMembersTableData = self:BuffsOrDebuffsOnPartyMembersFrame_GetDataForTable(challengeId, self:GetMechanicsPrefixForChallenge(challengeId) .. "-BUFFS-OR-DEBUFFS-ON-PARTY-MEMBERS");
-		self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.buffsOrDebuffsOnPartyMembersFrame.table:SetDisplayCols(self:Table_Headers_GetForSpellsSummary(challengeId));
-		self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.buffsOrDebuffsOnPartyMembersFrame.table:SetData(buffsOrDebuffsOnPartyMembersTableData);
-		self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.buffsOrDebuffsOnPartyMembersFrame.table:SortData();
-	end
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/BuffsOrDebuffsOnUnits.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/BuffsOrDebuffsOnUnits.lua
index a412781..8addfd2 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/BuffsOrDebuffsOnUnits.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/BuffsOrDebuffsOnUnits.lua
@@ -15,20 +15,15 @@ Create a frame for Buff Or Debuffs On Units tab (data is taken from `mechanics[*
 Mouse hover/out handler are included.
 
 @param[type=Frame] parentFrame
+@param[type=number] challengeId
 @return[type=Frame] tableWrapper
 ]]
-function MyDungeonsBook:BuffsOrDebuffsOnUnitsFrame_Create(parentFrame)
-	local ScrollingTable = LibStub("ScrollingTable");
-	local cols = self:BuffsOrDebuffsOnUnitsFrame_GetHeadersForTable();
-	local buffsOrDebuffsOnUnitsFrame = CreateFrame("Frame", nil, parentFrame);
-	buffsOrDebuffsOnUnitsFrame:SetWidth(900);
-	buffsOrDebuffsOnUnitsFrame:SetHeight(490);
-	buffsOrDebuffsOnUnitsFrame:SetPoint("TOPLEFT", 0, -120);
-	local tableWrapper = CreateFrame("Frame", nil, buffsOrDebuffsOnUnitsFrame);
-	tableWrapper:SetWidth(320);
-	tableWrapper:SetHeight(450);
-	tableWrapper:SetPoint("TOPLEFT", 0, 0);
-	local table = ScrollingTable:CreateST(cols, 11, 40, nil, tableWrapper);
+function MyDungeonsBook:BuffsOrDebuffsOnUnitsFrame_Create(parentFrame, challengeId)
+	local buffsOrDebuffsOnUnitsFrame = self:TabContentWrapperWidget_Create(parentFrame);
+	local data = self:BuffsOrDebuffsOnUnitsFrame_GetDataForTable(challengeId, self:GetMechanicsPrefixForChallenge(challengeId) .. "-BUFFS-OR-DEBUFFS-ON-UNIT");
+	local columns = self:BuffsOrDebuffsOnUnitsFrame_GetHeadersForTable();
+	local table = self:TableWidget_Create(columns, 11, 40, nil, buffsOrDebuffsOnUnitsFrame, "buffs-or-debuffs-on-units");
+	table:SetData(data);
 	table:RegisterEvents({
 		OnEnter = function (_, cellFrame, data, _, _, realrow, column)
 			if (realrow) then
@@ -36,17 +31,16 @@ function MyDungeonsBook:BuffsOrDebuffsOnUnitsFrame_Create(parentFrame)
 					self:Table_Cell_SpellMouseHover(cellFrame, data[realrow].cols[1].value);
 				end
 			end
-	    end,
+		end,
 		OnLeave = function (_, _, _, _, _, realrow, column)
 			if (realrow) then
 				if (column == 3 or column == 4) then
 					self:Table_Cell_MouseOut();
 				end
 			end
-	    end
+		end
 	});
-	tableWrapper.table = table;
-	return tableWrapper;
+	return buffsOrDebuffsOnUnitsFrame;
 end
 
 --[[--
@@ -127,17 +121,3 @@ function MyDungeonsBook:BuffsOrDebuffsOnUnitsFrame_GetDataForTable(challengeId,
 	end
 	return tableData;
 end
-
---[[--
-Update Buff Or Debuffs On Units tab for challenge with id `challengeId`
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:BuffsOrDebuffsOnUnitsFrame_Update(challengeId)
-	local challenge = self.db.char.challenges[challengeId];
-	if (challenge) then
-		local buffsOrDebuffsOnUnitsTableData = self:BuffsOrDebuffsOnUnitsFrame_GetDataForTable(challengeId, self:GetMechanicsPrefixForChallenge(challengeId) .. "-BUFFS-OR-DEBUFFS-ON-UNIT");
-		self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.buffsOrDebuffsOnUnitsFrame.table:SetData(buffsOrDebuffsOnUnitsTableData);
-		self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.buffsOrDebuffsOnUnitsFrame.table:SortData();
-	end
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/Dispels.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/Dispels.lua
index 4911c17..60b2bd2 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/Dispels.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/EffectsAndAuras/Tabs/Dispels.lua
@@ -12,20 +12,15 @@ local L = LibStub("AceLocale-3.0"):GetLocale("MyDungeonsBook");
 Creates a frame for Dispels tab.
 
 @param[type=Frame] parentFrame
+@param[type=number] challengeId
 @return[type=Frame]
 ]]
-function MyDungeonsBook:DispelsFrame_Create(parentFrame)
-	local ScrollingTable = LibStub("ScrollingTable");
-	local interruptsFrame = CreateFrame("Frame", nil, parentFrame);
-	interruptsFrame:SetWidth(900);
-	interruptsFrame:SetHeight(490);
-	interruptsFrame:SetPoint("TOPLEFT", 0, -110);
-	local cols = self:Table_Headers_GetForSpellsSummary();
-	local tableWrapper = CreateFrame("Frame", nil, interruptsFrame);
-	tableWrapper:SetWidth(580);
-	tableWrapper:SetHeight(240);
-	tableWrapper:SetPoint("TOPLEFT", 0, 0);
-	local table = ScrollingTable:CreateST(cols, 6, 40, nil, tableWrapper);
+function MyDungeonsBook:DispelsFrame_Create(parentFrame, challengeId)
+	local dispelsFrame = self:TabContentWrapperWidget_Create(parentFrame);
+	local data = self:DispelsFrame_GetDataForTable(challengeId);
+	local columns = self:Table_Headers_GetForSpellsSummary(challengeId);
+	local table = self:TableWidget_Create(columns, 5, 40, nil, dispelsFrame, "dispels");
+	table:SetData(data);
 	table:RegisterEvents({
 		OnEnter = function (_, cellFrame, data, _, _, realrow, column)
 			if (realrow) then
@@ -33,22 +28,20 @@ function MyDungeonsBook:DispelsFrame_Create(parentFrame)
 					self:Table_Cell_SpellMouseHover(cellFrame, data[realrow].cols[1].value);
 				end
 			end
-	    end,
+		end,
 		OnLeave = function (_, _, _, _, _, realrow, column)
 			if (realrow) then
 				if (column == 2 or column == 3) then
 					self:Table_Cell_MouseOut();
 				end
 			end
-	    end
+		end
 	});
-	interruptsFrame.table = table;
-	local summaryWrapper = CreateFrame("Frame", nil, interruptsFrame);
-	summaryWrapper:SetWidth(290);
-	summaryWrapper:SetHeight(250);
-	summaryWrapper:SetPoint("TOPLEFT", 0, -285);
-	local cols = self:DispelsFrame_GetHeadersForSummaryTable();
-	local summaryTable = ScrollingTable:CreateST(cols, 5, 40, nil, summaryWrapper);
+	local summaryData = self:DispelsFrame_GetDataForSummaryTable(challengeId);
+	local summaryColumns = self:DispelsFrame_GetHeadersForSummaryTable(challengeId);
+	local summaryTable = self:TableWidget_Create(summaryColumns, 5, 40, nil, dispelsFrame, "dispels-summary");
+	summaryTable:SetData(summaryData);
+	summaryTable.frame:SetPoint("TOPLEFT", 0, -280);
 	summaryTable:RegisterEvents({
 		OnEnter = function (_, cellFrame, data, _, _, realrow, column)
 			if (realrow) then
@@ -56,17 +49,16 @@ function MyDungeonsBook:DispelsFrame_Create(parentFrame)
 					self:Table_Cell_SpellMouseHover(cellFrame, data[realrow].cols[1].value);
 				end
 			end
-	    end,
+		end,
 		OnLeave = function (_, _, _, _, _, realrow, column)
 			if (realrow) then
 				if (column == 3 or column == 4) then
 					self:Table_Cell_MouseOut();
 				end
 			end
-	    end
+		end
 	});
-	interruptsFrame.summaryTable = summaryTable;
-	return interruptsFrame;
+	return dispelsFrame;
 end
 
 --[[--
@@ -215,21 +207,3 @@ function MyDungeonsBook:DispelsFrame_GetDataForSummaryTable(challengeId)
 	end
 	return tableData;
 end
-
---[[--
-Update Dispels-tab for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:DispelsFrame_Update(challengeId)
-	local challenge = self.db.char.challenges[challengeId];
-	if (challenge) then
-		local dispelsTableData = self:DispelsFrame_GetDataForTable(challengeId);
-		self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.dispelsFrame.table:SetData(dispelsTableData or {});
-		self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.dispelsFrame.table:SetDisplayCols(self:Table_Headers_GetForSpellsSummary(challengeId));
-		local dispelsSummaryTableData = self:DispelsFrame_GetDataForSummaryTable(challengeId);
-		if (dispelsSummaryTableData) then
-			self.challengeDetailsFrame.mechanicsFrame.effectsAndAurasFrame.dispelsFrame.summaryTable:SetData(dispelsSummaryTableData);
-		end
-	end
-end
diff --git a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/UsedItems.lua b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/UsedItems.lua
index 95d450d..f74b15b 100644
--- a/UI/ChallengeDetails/Tabs/Mechanics/Tabs/UsedItems.lua
+++ b/UI/ChallengeDetails/Tabs/Mechanics/Tabs/UsedItems.lua
@@ -17,14 +17,12 @@ Mouse hover/out handler are included.
 @param[type=Frame] parentFrame
 @return[type=Frame] tableWrapper
 ]]
-function MyDungeonsBook:UsedItemsFrame_Create(parentFrame)
-	local ScrollingTable = LibStub("ScrollingTable");
-	local cols = self:UsedItemsFrame_GetHeadersForTable();
-	local tableWrapper = CreateFrame("Frame", nil, parentFrame);
-	tableWrapper:SetWidth(600);
-	tableWrapper:SetHeight(450);
-	tableWrapper:SetPoint("TOPLEFT", 0, -120);
-	local table = ScrollingTable:CreateST(cols, 12, 40, nil, tableWrapper);
+function MyDungeonsBook:UsedItemsFrame_Create(parentFrame, challengeId)
+	local usedItemsFrame = self:TabContentWrapperWidget_Create(parentFrame);
+	local data = self:UsedItemsFrame_GetDataForTable(challengeId, self:GetMechanicsPrefixForChallenge(challengeId) .. "-ITEM-USED-BY-PARTY-MEMBERS");
+	local columns = self:UsedItemsFrame_GetColumnsForTable(challengeId);
+	local table = self:TableWidget_Create(columns, 12, 40, nil, usedItemsFrame, "used-items");
+	table:SetData(data);
 	table:RegisterEvents({
 		OnEnter = function (_, cellFrame, data, _, _, realrow, column)
 			if (realrow) then
@@ -32,17 +30,16 @@ function MyDungeonsBook:UsedItemsFrame_Create(parentFrame)
 					self:Table_Cell_ItemMouseHover(cellFrame, data[realrow].cols[1].value);
 				end
 			end
-	    end,
+		end,
 		OnLeave = function (_, _, _, _, _, realrow, column)
 			if (realrow) then
 				if (column == 2 or column == 3) then
 					self:Table_Cell_MouseOut();
 				end
 			end
-	    end
+		end
 	});
-	tableWrapper.table = table;
-	return tableWrapper;
+	return usedItemsFrame;
 end
 
 --[[--
@@ -53,7 +50,7 @@ Depending on `challengeId` real player names will be used or simple placeholders
 @param[type=number] challengeId
 @return[type=table]
 ]]
-function MyDungeonsBook:UsedItemsFrame_GetHeadersForTable(challengeId)
+function MyDungeonsBook:UsedItemsFrame_GetColumnsForTable(challengeId)
 	local challenge = self.db.char.challenges[challengeId];
 	local player = "Player";
 	local party1 = "Party1";
@@ -177,18 +174,3 @@ function MyDungeonsBook:UsedItemsFrame_GetDataForTable(challengeId, key)
 	end
 	return tableData;
 end
-
---[[--
-Update Special Casts-tab for challenge with id `challengeId`.
-
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:UsedItemsFrame_Update(challengeId)
-	local challenge = self.db.char.challenges[challengeId];
-	if (challenge) then
-		local usedItemsTableData = self:UsedItemsFrame_GetDataForTable(challengeId, self:GetMechanicsPrefixForChallenge(challengeId) .. "-ITEM-USED-BY-PARTY-MEMBERS");
-		self.challengeDetailsFrame.mechanicsFrame.usedItemsFrame.table:SetData(usedItemsTableData);
-		self.challengeDetailsFrame.mechanicsFrame.usedItemsFrame.table:SetDisplayCols(self:UsedItemsFrame_GetHeadersForTable(challengeId));
-		self.challengeDetailsFrame.mechanicsFrame.usedItemsFrame.table:SortData();
-	end
-end
diff --git a/UI/ChallengeDetails/Tabs/Roster.lua b/UI/ChallengeDetails/Tabs/Roster.lua
index 4dfa845..74e25ba 100644
--- a/UI/ChallengeDetails/Tabs/Roster.lua
+++ b/UI/ChallengeDetails/Tabs/Roster.lua
@@ -8,59 +8,46 @@ UI
 ]]
 
 local L = LibStub("AceLocale-3.0"):GetLocale("MyDungeonsBook");
-
-local ScrollPaneBackdrop = {
-	bgFile = "Interface\\ChatFrame\\ChatFrameBackground",
-	edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-	tile = true,
-	tileSize = 16,
-	edgeSize = 16,
-	insets = {
-		left = 3,
-		right = 3,
-		top = 5,
-		bottom = 3
-	}
-};
+local AceGUI = LibStub("AceGUI-3.0");
 
 --[[--
 Creates a frame for Roster tab
 
 @param[type=Frame] parentFrame
-@return[type=Frame] challengeRosterFrame
+@param[type=number] challengeId
+@return[type=Frame] rosterFrame
 ]]
-function MyDungeonsBook:RosterFrame_Create(parentFrame)
-	local challengeRosterFrame = CreateFrame("Frame", nil, parentFrame);
-	challengeRosterFrame:SetPoint("TOPLEFT", 0, -90);
-	challengeRosterFrame:SetWidth(690);
-	challengeRosterFrame:SetHeight(480);
-	for i, unit in pairs(self:GetPartyRoster()) do
-		challengeRosterFrame[unit .. "DetailsFrame"] = self:RosterFrame_PartyMemberFrame_Create(challengeRosterFrame, 0, -10 + (i - 1) * -90, unit);
+function MyDungeonsBook:RosterFrame_Create(parentFrame, challengeId)
+	local rosterFrame = self:TabContentWrapperWidget_Create(parentFrame);
+	local challenge = self.db.char.challenges[challengeId];
+    if (challenge) then
+        for _, unit in pairs(self:GetPartyRoster()) do
+            self:RosterFrame_PartyMemberFrame_Create(rosterFrame, unit, challengeId);
+        end
 	end
-	return challengeRosterFrame;
+	return rosterFrame;
 end
 
 --[[--
 Creates a row for unit `unitId` with data about his name, role, class, realm and equipment
 
-@param[type=Frame] challengeRosterFrame
-@param[type=number] x
-@param[type=number] y
+@param[type=Frame] rosterFrame
 @param[type=unitId] unitId
+@param[type=number] challengeId
 @return[type=Frame] partyMemberFrame
 ]]
-function MyDungeonsBook:RosterFrame_PartyMemberFrame_Create(challengeRosterFrame, x, y, unitId)
-	local partyMemberFrame = CreateFrame("Frame", nil, challengeRosterFrame, BackdropTemplateMixin and "BackdropTemplate");
-	partyMemberFrame:SetBackdrop(ScrollPaneBackdrop);
-	partyMemberFrame:SetBackdropColor(0.1, 0.1, 0.1);
-	partyMemberFrame:SetPoint("TOPLEFT", x, y);
-	partyMemberFrame:SetHeight(90);
-	partyMemberFrame:SetWidth(690);
-	partyMemberFrame.class = self:RosterFrame_PartyMemberFrame_ClassIcon_Create(partyMemberFrame, 5, -5, unitId);
-	partyMemberFrame.spec = self:RosterFrame_PartyMemberFrame_SpecIcon_Create(partyMemberFrame, 45, -5, unitId);
-	partyMemberFrame.nameAndRealmText = self:RosterFrame_PartyMemberFrame_NameAndRealmText_Create(partyMemberFrame, 90, -5);
-	partyMemberFrame.ilvlText = self:RosterFrame_PartyMemberFrame_IlvlText_Create(partyMemberFrame, 195, -5);
-	partyMemberFrame.equipment = self:RosterFrame_PartyMemberFrame_Equipment_Create(partyMemberFrame, 5, -45, unitId);
+function MyDungeonsBook:RosterFrame_PartyMemberFrame_Create(rosterFrame, unitId, challengeId)
+	local partyMemberFrame = AceGUI:Create("InlineGroup");
+	partyMemberFrame:SetLayout("Flow");
+	partyMemberFrame:SetFullWidth(true);
+	partyMemberFrame:SetAutoAdjustHeight(false);
+	partyMemberFrame:SetHeight(110);
+	rosterFrame:AddChild(partyMemberFrame);
+	local challenge = self.db.char.challenges[challengeId];
+	partyMemberFrame:SetTitle(self:GetUnitNameRealmRoleStr(challenge.players[unitId]) or L["Not Found"]);
+	self:RosterFrame_PartyMemberFrame_ClassIcon_Create(partyMemberFrame, unitId, challengeId);
+	self:RosterFrame_PartyMemberFrame_SpecIcon_Create(partyMemberFrame, unitId, challengeId);
+	self:RosterFrame_PartyMemberFrame_Equipment_Create(partyMemberFrame, unitId, challengeId);
 	return partyMemberFrame;
 end
 
@@ -68,27 +55,25 @@ end
 Creates a frame with class icon for `unitId`
 
 @param[type=Frame] parentFrame
-@param[type=number] x
-@param[type=number] y
 @param[type=unitId] unitId
+@param[type=number] challengeId
 @return[type=Frame] classFrame
 ]]
-function MyDungeonsBook:RosterFrame_PartyMemberFrame_ClassIcon_Create(parentFrame, x, y, unitId)
-	local classFrame = CreateFrame("Frame", 0, parentFrame);
-	classFrame:SetWidth(40);
-	classFrame:SetHeight(40);
-	classFrame:SetPoint("TOPLEFT", parentFrame, "TOPLEFT", x, y);
-	classFrame:SetScript("OnEnter", function(frame)
-		self:RosterFrame_TableClassHover(frame, unitId);
+function MyDungeonsBook:RosterFrame_PartyMemberFrame_ClassIcon_Create(parentFrame, unitId, challengeId)
+    local challenge = self.db.char.challenges[challengeId];
+	local classFrame = AceGUI:Create("InteractiveLabel");
+	parentFrame:AddChild(classFrame);
+    classFrame:SetWidth(35);
+	classFrame.label:SetHeight(40);
+	classFrame:SetCallback("OnEnter", function()
+		self:RosterFrame_TableClassHover(classFrame, unitId);
 	end);
-	classFrame:SetScript("OnLeave", function()
+	classFrame:SetCallback("OnLeave", function()
 		self:Table_Cell_MouseOut();
 	end);
-	local text = classFrame:CreateFontString(nil, "ARTWORK");
-	text:SetFontObject(GameFontNormal);
-	text:SetTextColor(0.6, 0.6, 0.6);
-	text:SetAllPoints(classFrame);
-	classFrame.text = text;
+    if (challenge.players[unitId].class) then
+        classFrame:SetText("|T" .. self:GetClassIconByIndex(challenge.players[unitId].class) .. ":30:30:0:0:64:64:5:59:5:59|t");
+    end
 	return classFrame;
 end
 
@@ -96,96 +81,74 @@ end
 Creates a frame with spec icon for `unitId`
 
 @param[type=Frame] parentFrame
-@param[type=number] x
-@param[type=number] y
 @param[type=unitId] unitId
 @return[type=Frame] specFrame
 ]]
-function MyDungeonsBook:RosterFrame_PartyMemberFrame_SpecIcon_Create(parentFrame, x, y, unitId)
-	local specFrame = CreateFrame("Frame", 0, parentFrame);
-	specFrame:SetWidth(40);
-	specFrame:SetHeight(40);
-	specFrame:SetPoint("TOPLEFT", parentFrame, "TOPLEFT", x, y);
-	specFrame:SetScript("OnEnter", function(frame)
-		self:RosterFrame_TableSpecHover(frame, unitId);
+function MyDungeonsBook:RosterFrame_PartyMemberFrame_SpecIcon_Create(parentFrame, unitId, challengeId)
+    local challenge = self.db.char.challenges[challengeId];
+	local specFrame = AceGUI:Create("InteractiveLabel");
+	parentFrame:AddChild(specFrame);
+    specFrame:SetWidth(35);
+	specFrame.label:SetHeight(40);
+	specFrame:SetCallback("OnEnter", function()
+		self:RosterFrame_TableSpecHover(specFrame, unitId);
 	end);
-	specFrame:SetScript("OnLeave", function()
+	specFrame:SetCallback("OnLeave", function()
 		self:Table_Cell_MouseOut();
 	end);
-	local text = specFrame:CreateFontString(nil, "ARTWORK");
-	text:SetFontObject(GameFontNormal);
-	text:SetTextColor(0.6, 0.6, 0.6);
-	text:SetAllPoints(specFrame);
-	specFrame.text = text;
+    if (challenge.players[unitId].spec) then
+        local _, _, _, icon = GetSpecializationInfoByID(challenge.players[unitId].spec);
+        if (icon) then
+            specFrame:SetText("|T" .. icon .. ":30:30:0:0:64:64:5:59:5:59|t");
+        end
+    end
 	return specFrame;
 end
 
---[[--
-Creates a frame with name and realm for unit
-
-@param[type=Frame] parentFrame
-@param[type=number] x
-@param[type=number] y
-@return[type=Frame] nameAndRealmText
-]]
-function MyDungeonsBook:RosterFrame_PartyMemberFrame_NameAndRealmText_Create(parentFrame, x, y)
-	local nameAndRealmText = parentFrame:CreateFontString(nil, "ARTWORK");
-	nameAndRealmText:SetFontObject(GameFontNormal);
-	nameAndRealmText:SetTextColor(0.6, 0.6, 0.6);
-	nameAndRealmText:SetPoint("TOPLEFT", parentFrame, "TOPLEFT", x, y);
-	nameAndRealmText:SetHeight(40);
-	nameAndRealmText:SetJustifyH("LEFT");
-	return nameAndRealmText;
-end
-
---[[--
-Creates a frame with ilvl for unit
-
-@param[type=Frame] parentFrame
-@param[type=number] x
-@param[type=number] y
-@return[type=Frame] ilvlText
-]]
-function MyDungeonsBook:RosterFrame_PartyMemberFrame_IlvlText_Create(parentFrame, x, y)
-	local ilvlText = parentFrame:CreateFontString(nil, "ARTWORK");
-	ilvlText:SetFontObject(GameFontNormal);
-	ilvlText:SetTextColor(0.6, 0.6, 0.6);
-	ilvlText:SetPoint("TOPLEFT", parentFrame, "TOPLEFT", x, y);
-	ilvlText:SetWidth(40);
-	ilvlText:SetHeight(40);
-	ilvlText:SetJustifyH("RIGHT");
-	return ilvlText;
-end
-
 --[[--
 Creates a frame with equipment for `unitId`.
 
 @param[type=Frame] parentFrame
-@param[type=number] x
-@param[type=number] y
 @param[type=unitId] unitId
+@param[type=number] challengeId
 @return[type=Frame] itemFrames
 ]]
-function MyDungeonsBook:RosterFrame_PartyMemberFrame_Equipment_Create(parentFrame, x, y, unitId)
+function MyDungeonsBook:RosterFrame_PartyMemberFrame_Equipment_Create(parentFrame, unitId, challengeId)
+    local challenge = self.db.char.challenges[challengeId];
 	local itemFrames = {};
+	local itemsRow = AceGUI:Create("SimpleGroup");
+	itemsRow:SetLayout("Flow");
+	itemsRow:SetFullWidth(true);
+	itemsRow:SetHeight(40);
+	itemsRow:SetAutoAdjustHeight(false);
+	parentFrame:AddChild(itemsRow);
 	for i = 1, 16 do
-		local itemFrame = CreateFrame("Frame", 0, parentFrame);
-		itemFrame:SetWidth(40);
-		itemFrame:SetHeight(40);
-		itemFrame:SetPoint("TOPLEFT", x + 40 * (i - 1), y);
-		itemFrame:SetScript("OnEnter", function(frame)
+		local itemFrame = AceGUI:Create("InteractiveLabel");
+		itemsRow:AddChild(itemFrame);
+		itemFrame:SetWidth(35);
+		itemFrame.label:SetHeight(40);
+		itemFrame:SetJustifyV("MIDDLE");
+		itemFrame:SetCallback("OnEnter", function(frame)
 			self:RosterFrame_TableItemHover(frame, unitId, i);
 		end);
-		itemFrame:SetScript("OnLeave", function()
+		itemFrame:SetCallback("OnLeave", function()
 			self:Table_Cell_MouseOut();
 		end);
-		local text = itemFrame:CreateFontString(nil, "ARTWORK");
-		text:SetFontObject(GameFontNormal);
-		text:SetTextColor(0.6, 0.6, 0.6);
-		text:SetAllPoints(itemFrame);
-		itemFrame.text = text;
+        local itemFrameIndex;
+        if (i <= 3) then
+            itemFrameIndex = i;
+        else
+            itemFrameIndex = i - 1;
+        end
+        local itemString = challenge.players[unitId] and challenge.players[unitId].items and challenge.players[unitId].items[(i <= 3 and i) or i + 1] or nil;
+        if (itemString) then
+            local _, itemId = strsplit(":", itemString);
+            if (itemId) then
+                itemFrame:SetText("|T" .. GetItemIcon(itemId) .. ":30:30:0:0:64:64:5:59:5:59|t");
+            end
+        end
 		tinsert(itemFrames, itemFrame);
-	end
+    end
 	return itemFrames;
 end
 
@@ -206,8 +169,8 @@ function MyDungeonsBook:RosterFrame_TableItemHover(itemFrame, unitId, itemIndex)
 	local player = self.db.char.challenges[self.activeChallengeId].players[unitId];
 	local itemString = player.items and self.db.char.challenges[self.activeChallengeId].players[unitId].items[realItemIndex] or nil;
 	if (itemString) then
-		GameTooltip:SetOwner(itemFrame, "ANCHOR_NONE");
-		GameTooltip:SetPoint("BOTTOMLEFT", itemFrame, "BOTTOMRIGHT");
+		GameTooltip:SetOwner(itemFrame.frame, "ANCHOR_NONE");
+		GameTooltip:SetPoint("BOTTOMLEFT", itemFrame.frame, "BOTTOMRIGHT");
 		GameTooltip:SetHyperlink(self.db.char.challenges[self.activeChallengeId].players[unitId].items[realItemIndex]);
 		GameTooltip:Show();
 	end
@@ -225,8 +188,8 @@ function MyDungeonsBook:RosterFrame_TableSpecHover(specIconFrame, unitId)
 	local spec = self.db.char.challenges[self.activeChallengeId].players[unitId].spec;
 	if (spec) then
 		local _, specName = GetSpecializationInfoByID(self.db.char.challenges[self.activeChallengeId].players[unitId].spec);
-		GameTooltip:SetOwner(specIconFrame, "ANCHOR_NONE");
-		GameTooltip:SetPoint("BOTTOMLEFT", specIconFrame, "BOTTOMRIGHT");
+		GameTooltip:SetOwner(specIconFrame.frame, "ANCHOR_NONE");
+		GameTooltip:SetPoint("BOTTOMLEFT", specIconFrame.frame, "BOTTOMRIGHT");
 		GameTooltip:AddLine(specName, 1, 1, 1);
 		GameTooltip:Show();
 	end
@@ -244,102 +207,9 @@ function MyDungeonsBook:RosterFrame_TableClassHover(classIconFrame, unitId)
 	local class = self.db.char.challenges[self.activeChallengeId].players[unitId].class;
 	if (class) then
 		local className = GetClassInfo(self.db.char.challenges[self.activeChallengeId].players[unitId].class)
-		GameTooltip:SetOwner(classIconFrame, "ANCHOR_NONE");
-		GameTooltip:SetPoint("BOTTOMLEFT", classIconFrame, "BOTTOMRIGHT");
+		GameTooltip:SetOwner(classIconFrame.frame, "ANCHOR_NONE");
+		GameTooltip:SetPoint("BOTTOMLEFT", classIconFrame.frame, "BOTTOMRIGHT");
 		GameTooltip:AddLine(className, 1, 1, 1);
 		GameTooltip:Show();
 	end
 end
-
---[[
-@param[type=number] challengeId
-]]
-function MyDungeonsBook:RosterFrame_Update(challengeId)
-	local challenge = self.db.char.challenges[challengeId];
-	if (challenge) then
-		for _, unit in pairs(self:GetPartyRoster()) do
-			if (challenge.players[unit]) then
-				self.challengeDetailsFrame.challengeRosterFrame[unit .. "DetailsFrame"].nameAndRealmText:SetText(self:GetUnitNameRealmRoleStr(challenge.players[unit]) or L["Not Found"]);
-				self.challengeDetailsFrame.challengeRosterFrame[unit .. "DetailsFrame"].spec.text:SetText("");
-				self.challengeDetailsFrame.challengeRosterFrame[unit .. "DetailsFrame"].class.text:SetText("");
-				--self:RosterFrame_Update_Ilvl(challenge, unit);
-				if (challenge.players[unit].class) then
-					self.challengeDetailsFrame.challengeRosterFrame[unit .. "DetailsFrame"].class.text:SetText("|T" .. self:GetClassIconByIndex(challenge.players[unit].class) .. ":30:30:0:0:64:64:5:59:5:59|t");
-				end
-				if (challenge.players[unit].spec) then
-					local _, _, _, icon = GetSpecializationInfoByID(challenge.players[unit].spec);
-					if (icon) then
-						self.challengeDetailsFrame.challengeRosterFrame[unit .. "DetailsFrame"].spec.text:SetText("|T" .. icon .. ":30:30:0:0:64:64:5:59:5:59|t");
-					end
-				end
-				for i = 1, 17 do
-					local itemFrameIndex;
-					if (i <= 3) then
-						itemFrameIndex = i;
-					else
-						itemFrameIndex = i - 1;
-					end
-					if (i ~= 4) then
-						self:RosterFrame_Update_EquipedItem(challenge, unit, itemFrameIndex, i);
-					end
-				end
-			else
-				self:DebugPrint(string.format("%s not found", unit));
-			end
-		end
-	else
-		self:DebugPrint(string.format("Challenge #%s not found", challengeId));
-	end
-end
-
---[[--
-Update an item slot for party member (`unit`) in the `challenge`.
-
-`itemFrameIndex` and `itemIndex` will be different if item slot is after 4.
-
-@local
-@param[type=table] challenge
-@param[type=unitId] unit
-@param[type=number] itemFrameIndex
-@param[type=number] itemIndex
-]]
-function MyDungeonsBook:RosterFrame_Update_EquipedItem(challenge, unit, itemFrameIndex, itemIndex)
-	self.challengeDetailsFrame.challengeRosterFrame[unit .. "DetailsFrame"].equipment[itemFrameIndex].text:SetText("");
-	local itemString = challenge.players[unit].items and challenge.players[unit].items[itemIndex] or nil;
-	if (itemString) then
-		local _, itemId = strsplit(":", itemString);
-		if (itemId) then
-			self.challengeDetailsFrame.challengeRosterFrame[unit .. "DetailsFrame"].equipment[itemFrameIndex].text:SetText("|T" .. GetItemIcon(itemId) .. ":30:30:0:0:64:64:5:59:5:59|t");
-		end
-	end
-end
-
---[[--
-TODO should be calculated right after players parsing.
-
-Update average items level for party member (`unit`) in the `challenge`.
-
-@local
-@param[type=table] challenge
-@param[type=unitId] unit
-]]
-function MyDungeonsBook:RosterFrame_Update_Ilvl(challenge, unit)
-	self.challengeDetailsFrame.challengeRosterFrame[unit .. "DetailsFrame"].ilvlText:SetText("");
-	local sum = 0;
-	local itemsCount = 0;
-	for i = 1, 17 do
-		if (i ~= 4) then
-			local itemLink = challenge.players[unit].items and challenge.players[unit].items[i] or nil;
-			if (itemLink) then
-				local _, _, _, itemLevel = GetItemInfo(itemLink);
-				if (itemLevel) then
-					sum = sum + itemLevel;
-					itemsCount = itemsCount + 1;
-				end
-			end
-		end
-	end
-	if (itemsCount ~= 0) then
-		self.challengeDetailsFrame.challengeRosterFrame[unit .. "DetailsFrame"].ilvlText:SetText(string.format("%.2f", sum / itemsCount));
-	end
-end
diff --git a/UI/Challenges.lua b/UI/Challenges.lua
index 22376f2..251545f 100644
--- a/UI/Challenges.lua
+++ b/UI/Challenges.lua
@@ -8,6 +8,8 @@ UI
 ]]
 
 local L = LibStub("AceLocale-3.0"):GetLocale("MyDungeonsBook");
+local ScrollingTable = LibStub("ScrollingTable");
+local AceGUI = LibStub("AceGUI-3.0");
 
 --[[--
 Create a frame with table containing challenges with current char.
@@ -16,7 +18,6 @@ Create a frame with table containing challenges with current char.
 @return[type=Frame] table with challenges
 ]]
 function MyDungeonsBook:ChallengesFrame_Create(parentFrame)
-	local ScrollingTable = LibStub("ScrollingTable");
 	local cols = {
 		{
 			-- First column is for challenge ID used on row's click-handler to show details for selected challenge
@@ -82,11 +83,12 @@ function MyDungeonsBook:ChallengesFrame_Create(parentFrame)
 			align = "LEFT"
 		}
 	};
-	local tableWrapper = CreateFrame("Frame", nil, parentFrame);
-	tableWrapper:SetWidth(450);
-	tableWrapper:SetHeight(650);
-	tableWrapper:SetPoint("TOPLEFT", 10, -70);
-	local table = ScrollingTable:CreateST(cols, 12, 50, nil, tableWrapper);
+	local challengesFrame = AceGUI:Create("SimpleGroup");
+	challengesFrame:SetLayout("Fill");
+	challengesFrame:SetWidth(500);
+	challengesFrame:SetFullHeight(true);
+	parentFrame:AddChild(challengesFrame);
+	local table = ScrollingTable:CreateST(cols, 15, 40, nil, challengesFrame.frame);
 	table:SetData(self:ChallengesFrame_GetDataForTable());
 	table:SortData();
 	table:RegisterEvents({
@@ -107,6 +109,7 @@ function MyDungeonsBook:ChallengesFrame_Create(parentFrame)
 			end
 	    end
 	});
+	table.frame:SetPoint("TOPLEFT", 5, -40);
 	return table;
 end
 
@@ -207,12 +210,5 @@ end
 function MyDungeonsBook:FormatCellAsChallengeKeyStatus(_, cellFrame, data, _, _, realrow, column)
 	local val = data[realrow].cols[column].value;
 	local text = (val > 0 and string.format("|cff1eff00+%s|r", val)) or "|cffcc3333-1|r";
-	cellFrame.text:SetText(text);
-end
-
---[[--
-Update Challenges table with list of existing challenges
-]]
-function MyDungeonsBook:ChallengesFrame_Update()
-    self.challengesTable:SetData(self:ChallengesFrame_GetDataForTable());
+    cellFrame.text:SetText(text);
 end
diff --git a/UI/Main.lua b/UI/Main.lua
index f62f001..786abf8 100644
--- a/UI/Main.lua
+++ b/UI/Main.lua
@@ -8,20 +8,7 @@ UI
 ]]
 
 local L = LibStub("AceLocale-3.0"):GetLocale("MyDungeonsBook");
-
-local WindowBackdrop = {
-	bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
-	edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
-	tile = true,
-	tileSize = 1,
-	edgeSize = 1,
-	insets = {
-		left = 3,
-		right = 3,
-		top = 3,
-		bottom = 3
-	}
-};
+local AceGUI = LibStub("AceGUI-3.0");
 
 --[[--
 Creates a main frame for addon.
@@ -29,97 +16,38 @@ Creates a main frame for addon.
 @return[type=Frame] frame
 ]]
 function MyDungeonsBook:MainFrame_Create()
-	local frame = CreateFrame("Frame", "MyDungeonsBookFrame", UIParent, BackdropTemplateMixin and "BackdropTemplate");
-	frame:SetWidth(1200);
+    local frame = AceGUI:Create("Frame");
+	frame:SetWidth(1234); -- IDK why it can't be just 1200 :/
 	frame:SetHeight(720);
 	frame:SetPoint("CENTER", UIParent, "CENTER", self.db.profile.display.x, self.db.profile.display.y);
-	frame:SetBackdrop(WindowBackdrop);
-	frame:SetBackdropColor(0, 0, 0, 1);
-	frame:SetBackdropBorderColor(0.4, 0.4, 0.4);
-	
-	frame:EnableMouse();
-	frame:SetMovable(true);
-	frame:SetClampedToScreen(true);
-	frame:SetFrameStrata("HIGH");
-	tinsert(UISpecialFrames, frame:GetName()); -- allows to close it via Esc-press
+	frame:SetTitle(L["My Dungeons Book"]);
+    frame:SetLayout("Fill");
+	frame:EnableResize(false)
+    frame:SetCallback("OnClose", function ()
+        if (self.db.profile.performance.collectgarbage) then
+            collectgarbage("collect");
+        end
+    end)
 	return frame;
 end
 
---[[--
-Creates a frame with title and block that allows to move main frame.
-
-Needed event listeners are defined too.
-
-@param[type=Frame] parentFrame main window frame
-@return[type=Button] closeButton
-]]
-function MyDungeonsBook:MainFrame_CloseButton_Create(parentFrame)
-	local closeButton = CreateFrame("Button", nil, parentFrame, "UIPanelCloseButton");
-	closeButton:SetPoint("TOPRIGHT", 0, 0);
-	closeButton:SetFrameLevel(3);
-	closeButton:SetScript("OnClick", function()
-		parentFrame:Hide();
-		if (self.db.profile.performance.collectgarbage) then
-			collectgarbage("collect");
-		end
-	end);
-	return closeButton;
-end
-
---[[--
-Creates a frame with title and block that allows to move main frame.
-
-Needed event listeners are defined too.
-
-@param[type=Frame] parentFrame main window frame
-@return[type=Frame] titleBar
-]]
-function MyDungeonsBook:MainFrame_TitleBar_Create(parentFrame)
-	local titleBar = parentFrame:CreateTexture(nil, "BACKGROUND");
-	titleBar:SetColorTexture(0.5, 0.5, 0.5);
-	titleBar:SetGradient("HORIZONTAL", 0.6, 0.6, 0.6, 0.3, 0.3, 0.3);
-	titleBar:SetPoint("TOPLEFT", 4, -4);
-	titleBar:SetPoint("BOTTOMRIGHT", parentFrame, "TOPRIGHT", -4, -28);
-
-	local titleText = parentFrame:CreateFontString(nil, "ARTWORK");
-	titleText:SetFontObject(GameFontNormal);
-	titleText:SetTextColor(0.6, 0.6, 0.6);
-	titleText:SetPoint("TOPLEFT", titleBar, "TOPLEFT", 5, 0);
-	titleText:SetPoint("BOTTOMRIGHT", titleBar);
-
-	titleText:SetHeight(40);
-	titleText:SetText(L["My Dungeons Book"]);
-	titleText:SetJustifyH("LEFT");
-	titleText:SetJustifyV("MIDDLE");
-
-	local titleBarFrame = CreateFrame("Frame", nil, parentFrame);
-	titleBarFrame:SetAllPoints(titleBar);
-	titleBarFrame:EnableMouse();
-	titleBarFrame:SetScript("OnMouseDown", function()
-		parentFrame:StartMoving();
-	end);
-	titleBarFrame:SetScript("OnMouseUp", function()
-		parentFrame:StopMovingOrSizing();
-		self:SaveFrameRect(parentFrame);
-	end);
-	return titleBar;
-end
-
 --[[--
 Create (if not exists) a main frame and show it for player
 ]]
 function MyDungeonsBook:MainFrame_Show()
 	if (not self.frame) then
 		local frame = self:MainFrame_Create();
-		self.titleBar = self:MainFrame_TitleBar_Create(frame);
-		self.closeButton = self:MainFrame_CloseButton_Create(frame);
-		self.challengesTable = self:ChallengesFrame_Create(frame);
-		self.challengeDetailsFrame = self:ChallengeDetailsFrame_Create(frame);
+		local grid = AceGUI:Create("SimpleGroup");
+		grid:SetLayout("Flow");
+		frame:AddChild(grid);
+		frame:PauseLayout();
+		self.challengesTable = self:ChallengesFrame_Create(grid);
+		self.challengeDetailsFrame = self:ChallengeDetailsFrame_Create(grid);
 		self.frame = frame;
+		frame:ResumeLayout();
     end
-    self:ChallengesFrame_Update();
-	self.frame:SetScale(self.db.profile.display.scale);
 	self.frame:Show();
+	self.challengesTable:SetData(self:ChallengesFrame_GetDataForTable());
 end
 
 --[[--
diff --git a/Utils/Table.lua b/Utils/Table.lua
index b5892a9..a99100e 100644
--- a/Utils/Table.lua
+++ b/Utils/Table.lua
@@ -9,7 +9,6 @@ UI
 
 local L = LibStub("AceLocale-3.0"):GetLocale("MyDungeonsBook");
 
-
 local function updateCellTextColor(_, cellFrame, data, cols, _, realrow, column)
 	local defaultColor = {
 		r = 1,
@@ -31,8 +30,12 @@ local function updateCellTextColor(_, cellFrame, data, cols, _, realrow, column)
 	end
 	if (not color) then
 		color = defaultColor;
-	end
-	cellFrame.text:SetTextColor(color.r, color.g, color.b, color.a);
+    end
+    if (cellFrame.text) then
+        cellFrame.text:SetTextColor(color.r, color.g, color.b, color.a);
+    else
+        cellFrame:SetColor(color.r, color.g, color.b);
+    end
 end
 
 --[[--
@@ -44,7 +47,7 @@ Params are similar to [ScrollingTable:DoCellUpdate](https://www.wowace.com/proje
 ]]
 function MyDungeonsBook:Table_Cell_FormatAsNumber(rowFrame, cellFrame, data, cols, row, realrow, column, fShow, table)
 	local val = data[realrow].cols[column].value;
-	cellFrame.text:SetText((val and self:FormatNumber(val)) or "-");
+    (cellFrame.text or cellFrame):SetText((val and self:FormatNumber(val)) or "-");
 	updateCellTextColor(rowFrame, cellFrame, data, cols, row, realrow, column, fShow, table);
 end
 
@@ -57,7 +60,7 @@ Params are similar to [ScrollingTable:DoCellUpdate](https://www.wowace.com/proje
 ]]
 function MyDungeonsBook:Table_Cell_FormatAsDate(rowFrame, cellFrame, data, cols, row, realrow, column, fShow, table)
 	local val = data[realrow].cols[column].value;
-	cellFrame.text:SetText((val and date("%Y-%m-%d\n%H:%M", val)) or "-");
+    (cellFrame.text or cellFrame):SetText((val and date("%Y-%m-%d\n%H:%M", val)) or "-");
 	updateCellTextColor(rowFrame, cellFrame, data, cols, row, realrow, column, fShow, table);
 end
 
@@ -70,7 +73,7 @@ Params are similar to [ScrollingTable:DoCellUpdate](https://www.wowace.com/proje
 ]]
 function MyDungeonsBook:Table_Cell_FormatAsTime(rowFrame, cellFrame, data, cols, row, realrow, column, fShow, table)
 	local val = data[realrow].cols[column].value;
-	cellFrame.text:SetText((val > 0 and date("%M:%S", val / 1000)) or "-");
+    (cellFrame.text or cellFrame):SetText((val > 0 and date("%M:%S", val / 1000)) or "-");
 	updateCellTextColor(rowFrame, cellFrame, data, cols, row, realrow, column, fShow, table);
 end
 
@@ -87,18 +90,18 @@ function MyDungeonsBook:Table_Cell_FormatAsSpellIcon(rowFrame, cellFrame, data,
 		if (spellId == -2) then
 			-- Hack to show "fist" icon for swing dmg
 			local itemIcon = "|T999951:30:30:0:0:64:64:5:59:5:59|t";
-			cellFrame.text:SetText(itemIcon);
+			(cellFrame.text or cellFrame):SetText(itemIcon);
 		else
 			if (spellId > 0) then
 				local _, _, icon = GetSpellInfo(spellId);
 				local spellIcon = "|T" .. (icon or "") .. ":30:30:0:0:64:64:5:59:5:59|t";
-				cellFrame.text:SetText(spellIcon);
+				(cellFrame.text or cellFrame):SetText(spellIcon);
 			else
-				cellFrame.text:SetText("");
+				(cellFrame.text or cellFrame):SetText("");
 			end
 		end
 	else
-		cellFrame.text:SetText("");
+		(cellFrame.text or cellFrame):SetText("");
 	end
 	updateCellTextColor(rowFrame, cellFrame, data, cols, row, realrow, column, fShow, table);
 end
@@ -114,17 +117,17 @@ function MyDungeonsBook:Table_Cell_FormatAsSpellLink(rowFrame, cellFrame, data,
 	local spellId = data[realrow].cols[column].value;
 	if (spellId) then
 		if (spellId == -2) then
-			cellFrame.text:SetText(L["Swing Damage"]);
+			(cellFrame.text or cellFrame):SetText(L["Swing Damage"]);
 		else
 			if (spellId > 0) then
 				local spellLink = GetSpellLink(spellId);
-				cellFrame.text:SetText(spellLink);
+				(cellFrame.text or cellFrame):SetText(spellLink);
 			else
-				cellFrame.text:SetText("");
+				(cellFrame.text or cellFrame):SetText("");
 			end
 		end
 	else
-		cellFrame.text:SetText("");
+		(cellFrame.text or cellFrame):SetText("");
 	end
 	updateCellTextColor(rowFrame, cellFrame, data, cols, row, realrow, column, fShow, table);
 end
@@ -141,9 +144,9 @@ function MyDungeonsBook:Table_Cell_FormatAsItemIcon(rowFrame, cellFrame, data, c
 	if (itemId and itemId > 0) then
 		local _, _, _, _, _, _, _, _, _, icon = GetItemInfo(itemId);
 		local itemIcon = "|T" .. (icon or "") .. ":30:30:0:0:64:64:5:59:5:59|t";
-		cellFrame.text:SetText(itemIcon);
+		(cellFrame.text or cellFrame):SetText(itemIcon);
 	else
-		cellFrame.text:SetText("");
+		(cellFrame.text or cellFrame):SetText("");
 	end
 	updateCellTextColor(rowFrame, cellFrame, data, cols, row, realrow, column, fShow, table);
 end
@@ -159,9 +162,9 @@ function MyDungeonsBook:Table_Cell_FormatAsItemLink(rowFrame, cellFrame, data, c
 	local itemId = data[realrow].cols[column].value;
 	if (itemId and itemId > 0) then
 		local _, itemLink = GetItemInfo(itemId);
-		cellFrame.text:SetText(itemLink);
+		(cellFrame.text or cellFrame):SetText(itemLink);
 	else
-		cellFrame.text:SetText("");
+		(cellFrame.text or cellFrame):SetText("");
 	end	
 	updateCellTextColor(rowFrame, cellFrame, data, cols, row, realrow, column, fShow, table);
 end
@@ -299,7 +302,7 @@ Get columns for table that looks like `| spell icon | spell link | party member
 @param[type=?number] challengeId
 @return[type=table]
 ]]
-function MyDungeonsBook:Table_Headers_GetForDamageToPartyMembers(challengeId)
+function MyDungeonsBook:Table_Columns_GetForDamageToPartyMembers(challengeId)
 local challenge = self.db.char.challenges[challengeId];
 	local player = "Player";
 	local party1 = "Party1";
@@ -330,7 +333,7 @@ local challenge = self.db.char.challenges[challengeId];
 		},
 		{
 			name = " ",
-			width = 120,
+			width = 110,
 			align = "LEFT",
 			DoCellUpdate = function(...)
 				self:Table_Cell_FormatAsSpellLink(...);
@@ -338,7 +341,7 @@ local challenge = self.db.char.challenges[challengeId];
 		},
 		{
 			name = player,
-			width = 80,
+			width = 75,
 			align = "RIGHT",
 			DoCellUpdate = function(...)
 				self:Table_Cell_FormatAsNumber(...);
@@ -351,7 +354,7 @@ local challenge = self.db.char.challenges[challengeId];
 		},
 		{
 			name = party1,
-			width = 80,
+			width = 75,
 			align = "RIGHT",
 			DoCellUpdate = function(...)
 				self:Table_Cell_FormatAsNumber(...);
@@ -364,7 +367,7 @@ local challenge = self.db.char.challenges[challengeId];
 		},
 		{
 			name = party2,
-			width = 80,
+			width = 75,
 			align = "RIGHT",
 			DoCellUpdate = function(...)
 				self:Table_Cell_FormatAsNumber(...);
@@ -377,7 +380,7 @@ local challenge = self.db.char.challenges[challengeId];
 		},
 		{
 			name = party3,
-			width = 80,
+			width = 75,
 			align = "RIGHT",
 			DoCellUpdate = function(...)
 				self:Table_Cell_FormatAsNumber(...);
@@ -390,7 +393,7 @@ local challenge = self.db.char.challenges[challengeId];
 		},
 		{
 			name = party4,
-			width = 80,
+			width = 75,
 			align = "RIGHT",
 			DoCellUpdate = function(...)
 				self:Table_Cell_FormatAsNumber(...);
@@ -403,7 +406,7 @@ local challenge = self.db.char.challenges[challengeId];
 		},
 		{
 			name = L["Sum"],
-			width = 70,
+			width = 75,
 			align = "RIGHT",
 			sort = "asc",
 			bgcolor = {
diff --git a/Utils/Tabs.lua b/Utils/Tabs.lua
deleted file mode 100644
index efd58b5..0000000
--- a/Utils/Tabs.lua
+++ /dev/null
@@ -1,58 +0,0 @@
---[[--
-Create a frame with tabs linked to `parentFrame`. Each tab is a value of `tabsDetails`.
-
-It must have two fields - `id` and `title`. `id` must be unique in the scope of `tabsDetails`.
-
-@param[type=Frame] parentFrame
-@param[type=table] tabsDetails
-]]
-function MyDungeonsBook:Tabs_Create(parentFrame, tabsDetails)
-    local tabsButtonsFrame = CreateFrame("Frame", nil, parentFrame);
-    tabsButtonsFrame:SetPoint("TOPLEFT", 0, -40);
-    tabsButtonsFrame:SetWidth(900);
-    tabsButtonsFrame:SetHeight(50);
-    tabsButtonsFrame.tabButtons = {};
-    local previousButton;
-    for _, tabDetails in pairs(tabsDetails) do
-        local currentButton = CreateFrame("Button", nil, tabsButtonsFrame, "TabButtonTemplate");
-        if (previousButton) then
-            currentButton:SetPoint("TOPLEFT", previousButton, "TOPRIGHT", 0, 0);
-        else
-            currentButton:SetPoint("TOPLEFT", 0, 0);
-        end
-        currentButton:SetText(tabDetails.title);
-        currentButton:SetScript("OnClick", function()
-            self:Tab_Click(parentFrame, tabDetails.id);
-        end);
-        PanelTemplates_TabResize(currentButton, 0);
-        tabsButtonsFrame.tabButtons[tabDetails.id] = currentButton;
-        previousButton = currentButton;
-    end
-    return tabsButtonsFrame;
-end
-
---[[--
-Click-handler for tabs. It's called autimatically when user clicks on tab.
-
-To call it manually `parentFrame` should be set to frame where `tabs` and `tabButtons` (result of `Tabs_Create`) are.
-`tabId` should be one of `tabButtons` identifiers.
-
-@param[type=Frame] parentFrame
-@param[type=string] tabId
-]]
-function MyDungeonsBook:Tab_Click(parentFrame, tabId)
-    if (not parentFrame.tabs or not parentFrame.tabButtonsFrame) then
-        self:DebugPrint(string.format("tabs or tabButtons frame is missing. Tab ID is %s", tabId));
-    end
-    for id, tabFrame in pairs(parentFrame.tabs) do
-        local tabButtonFrame = parentFrame.tabButtonsFrame.tabButtons[id];
-        if (id == tabId) then
-            tabButtonFrame:Disable();
-            tabButtonFrame:SetDisabledFontObject(GameFontHighlightSmall);
-            tabFrame:Show();
-        else
-            tabButtonFrame:Enable();
-            tabFrame:Hide();
-        end
-    end
-end
diff --git a/Utils/Utils.lua b/Utils/Utils.lua
index 89a45ad..719007d 100644
--- a/Utils/Utils.lua
+++ b/Utils/Utils.lua
@@ -402,3 +402,9 @@ function MyDungeonsBook:MergeTables(table1, table2)
 	end
 	return table1;
 end
+
+function MyDungeonsBook:HighlightFrame(frame)
+	frame.highlight = frame:CreateTexture(nil, "OVERLAY");
+	frame.highlight:SetAllPoints(frame);
+	frame.highlight:SetColorTexture(0.5, 0.5, 0.5, 0.5);
+end
diff --git a/Widgets/TabContentWrapper.lua b/Widgets/TabContentWrapper.lua
new file mode 100644
index 0000000..b78166c
--- /dev/null
+++ b/Widgets/TabContentWrapper.lua
@@ -0,0 +1,22 @@
+--[[--
+@module MyDungeonsBook
+]]
+
+--[[--
+UI
+@section Widgets
+]]
+
+local AceGUI = LibStub("AceGUI-3.0");
+
+--[[--
+@param[type=Frame] parentFrame
+@return[type=Frame]
+]]
+function MyDungeonsBook:TabContentWrapperWidget_Create(parentFrame)
+    local tabContentWrapperFrame = AceGUI:Create("SimpleGroup");
+    tabContentWrapperFrame:SetLayout("Flow");
+    tabContentWrapperFrame:SetFullWidth(true);
+    parentFrame:AddChild(tabContentWrapperFrame);
+    return tabContentWrapperFrame;
+end
diff --git a/Widgets/Table.lua b/Widgets/Table.lua
new file mode 100644
index 0000000..61b041f
--- /dev/null
+++ b/Widgets/Table.lua
@@ -0,0 +1,41 @@
+--[[--
+@module MyDungeonsBook
+]]
+
+--[[--
+UI
+@section Widgets
+]]
+
+local ScrollingTable = LibStub("ScrollingTable");
+
+local tables = {};
+
+function MyDungeonsBook:TableWidget_Create(cols, numRows, rowHeight, highlight, parentFrame, id)
+    local table = tables[id];
+    if (table) then
+        table.frame:SetParent(parentFrame.frame);
+        table:Show();
+        table:SetDisplayRows(numRows, rowHeight);
+        table:SetDisplayCols(cols);
+    else
+        table = ScrollingTable:CreateST(cols, numRows, rowHeight, highlight, parentFrame.frame);
+        tables[id] = table;
+    end
+    table.frame:SetPoint("TOPLEFT", 0, -40);
+    parentFrame.userdata.tables = parentFrame.userdata.tables or {};
+    tinsert(parentFrame.userdata.tables, id);
+    parentFrame:SetCallback("OnRelease", function()
+        for _, tableId in pairs(parentFrame.userdata.tables) do
+            self:TableWidget_Release(tableId);
+        end
+    end);
+    return table;
+end
+
+function MyDungeonsBook:TableWidget_Release(id)
+    local table = tables[id];
+    if (table) then
+        table:Hide();
+    end
+end
diff --git a/Widgets/Tabs.lua b/Widgets/Tabs.lua
new file mode 100644
index 0000000..32a1f2f
--- /dev/null
+++ b/Widgets/Tabs.lua
@@ -0,0 +1,29 @@
+--[[--
+@module MyDungeonsBook
+]]
+
+--[[--
+UI
+@section Widgets
+]]
+
+local AceGUI = LibStub("AceGUI-3.0");
+
+--[[--
+@param[type=Frame] parentFrame
+@return[type=Frame]
+]]
+function MyDungeonsBook:TabsWidget_Create(parentFrame)
+    local tabsFrame = AceGUI:Create("TabGroup");
+    tabsFrame:SetLayout("Flow");
+    tabsFrame:SetFullWidth(true);
+    tabsFrame.borderoffset = 1;
+    tabsFrame.alignoffset = 1;
+    tabsFrame.content:SetPoint("TOPLEFT", 5, 0);
+    tabsFrame.content:SetPoint("BOTTOMRIGHT", 0, 0);
+    tabsFrame.border:SetPoint("TOPLEFT", 0, 0);
+    tabsFrame.border:SetPoint("BOTTOMRIGHT", 0, 0);
+    tabsFrame:SetAutoAdjustHeight(false);
+    parentFrame:AddChild(tabsFrame);
+    return tabsFrame;
+end
diff --git a/libs/ScrollingTable-4.1/ScrollingTable-4.1.lua b/libs/ScrollingTable-4.1/ScrollingTable-4.1.lua
index 5c732e4..784a3ba 100644
--- a/libs/ScrollingTable-4.1/ScrollingTable-4.1.lua
+++ b/libs/ScrollingTable-4.1/ScrollingTable-4.1.lua
@@ -13,7 +13,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-local MAJOR, MINOR = "ScrollingTable", tonumber("@project-timestamp@") or 40300;
+local MAJOR, MINOR = "ScrollingTable", tonumber("1598736624") or 40300;
 local lib, oldminor = LibStub:NewLibrary(MAJOR, MINOR);
 if not lib then
 	return; -- Already loaded and no upgrade necessary.
@@ -541,17 +541,17 @@ do
 
 			local colorargs = nil;
 			if not color then
-			 	color = cols[column].color;
-			 	if not color then
-			 		color = rowdata.color;
-			 		if not color then
-			 			color = defaultcolor;
-			 		else
-			 			colorargs = rowdata.colorargs;
-			 		end
-			 	else
-			 		colorargs = cols[column].colorargs;
-			 	end
+				color = cols[column].color;
+				if not color then
+					color = rowdata.color;
+					if not color then
+						color = defaultcolor;
+					else
+						colorargs = rowdata.colorargs;
+					end
+				else
+					colorargs = cols[column].colorargs;
+				end
 			else
 				colorargs = celldata.colorargs;
 			end
@@ -644,7 +644,6 @@ do
 		st.Show = Show;
 		st.Hide = Hide;
 		st.SetDisplayRows = SetDisplayRows;
-		st.SetRowHeight = SetRowHeight;
 		st.SetHeight = SetHeight;
 		st.SetWidth = SetWidth;
 		st.SetDisplayCols = SetDisplayCols;