diff --git a/modules/Cooldowns/Registry.lua b/modules/Cooldowns/Registry.lua
index 022112f..93df4ae 100644
--- a/modules/Cooldowns/Registry.lua
+++ b/modules/Cooldowns/Registry.lua
@@ -321,7 +321,8 @@ do
 		end
 
 		bar.candyBarDuration:ClearAllPoints()
-		bar.candyBarDuration:SetPoint("RIGHT", bar.candyBarBar, "RIGHT", -2, 0)
+		bar.candyBarDuration:SetPoint("TOPLEFT", bar.candyBarBar, "TOPLEFT", 2, 0)
+		bar.candyBarDuration:SetPoint("BOTTOMRIGHT", bar.candyBarBar, "BOTTOMRIGHT", -2, 0)
 
 		bar.candyBarLabel:ClearAllPoints()
 		bar.candyBarLabel:SetPoint("TOPLEFT", bar.candyBarBar, "TOPLEFT", 2, 0)
@@ -350,7 +351,6 @@ do
 			icon:ClearAllPoints()
 			icon:SetPoint("BOTTOMRIGHT", bar, "BOTTOMLEFT", -5, 0)
 			icon:SetSize(16, 16)
-			icon:Show() -- XXX temp
 			bar:Set("ora3cd:restoreicon", tex)
 
 			local iconBd = bar.candyBarIconFrameBackdrop
@@ -364,15 +364,13 @@ do
 			iconBd:Show()
 		end
 
-		bar.candyBarLabel:SetJustifyH("LEFT")
 		bar.candyBarLabel:ClearAllPoints()
-		bar.candyBarLabel:SetPoint("LEFT", bar, "LEFT", 4, 10)
+		bar.candyBarLabel:SetPoint("LEFT", bar.candyBarBar, "LEFT", 2, 10)
+		bar.candyBarLabel:SetPoint("RIGHT", bar.candyBarBar, "RIGHT", -2, 10)
 
-		bar.candyBarDuration:SetJustifyH("RIGHT")
 		bar.candyBarDuration:ClearAllPoints()
-		bar.candyBarDuration:SetPoint("RIGHT", bar, "RIGHT", -4, 10)
-
-		--bar:SetTexture(media:Fetch("statusbar", "Blizzard"))
+		bar.candyBarDuration:SetPoint("RIGHT", bar.candyBarBar, "RIGHT", -2, 10)
+		bar.candyBarDuration:SetPoint("LEFT", bar.candyBarBar, "LEFT", 2, 10)
 	end
 
 	barStyles.MonoUI = {
@@ -534,7 +532,6 @@ do
 			icon:ClearAllPoints()
 			icon:SetPoint("BOTTOMRIGHT", bar, "BOTTOMLEFT", E and (E.PixelMode and -1 or -5) or -1, 0)
 			icon:SetSize(20, 20)
-			icon:Show() -- XXX temp
 			bar:Set("ora3cd:restoreicon", tex)
 
 			local iconBd = bar.candyBarIconFrameBackdrop