diff --git a/modules/GlobalCoolDown.lua b/modules/GlobalCoolDown.lua
index 956fdb1..46c6966 100644
--- a/modules/GlobalCoolDown.lua
+++ b/modules/GlobalCoolDown.lua
@@ -17,8 +17,6 @@ function GlobalCoolDown.prototype:Enable(core)
 
 	self:RegisterEvent("ACTIONBAR_UPDATE_COOLDOWN", "CooldownStateChanged")
 
-	local r, g, b = self.settings.backgroundColor.r, self.settings.backgroundColor.g, self.settings.backgroundColor.b
-	self.frame.bg:SetVertexColor(r, g, b, 0.6)
 	self:Show(false)
 
 	self.frame:SetFrameStrata("TOOLTIP")
@@ -73,11 +71,12 @@ end
 function GlobalCoolDown.prototype:CooldownStateChanged()
 	local start, dur = GetSpellCooldown(self:GetSpellId())
 
-	if dur ~= nil and dur > 0 and dur <= 1.5 then
+	if start and dur ~= nil and dur > 0 and dur <= 1.5 then
+		local bRestart = not self.startTime or start > self.startTime + dur
 		self.startTime = start
 		self.duration = dur
 
-		if self.CurrScale < 0.01 or self.CurrScale == 1 then
+		if bRestart then
 			self:SetScale(1, true)
 			self.LastScale = 1
 			self.DesiredScale = 0
@@ -103,5 +102,13 @@ function GlobalCoolDown.prototype:MyOnUpdate()
 	end
 end
 
+function GlobalCoolDown.prototype:CreateFrame()
+	GlobalCoolDown.super.prototype.CreateFrame(self)
+
+	self.barFrame.bar:SetVertexColor(self:GetColor("GlobalCoolDown", 0.8))
+	local r, g, b = self.settings.backgroundColor.r, self.settings.backgroundColor.g, self.settings.backgroundColor.b
+	self.frame.bg:SetVertexColor(r, g, b, 0.6)
+end
+
 -- Load us up
 IceHUD.GlobalCoolDown = GlobalCoolDown:new()
diff --git a/modules/RangeCheck.lua b/modules/RangeCheck.lua
index 42f844d..e16a3a1 100644
--- a/modules/RangeCheck.lua
+++ b/modules/RangeCheck.lua
@@ -126,7 +126,7 @@ function RangeCheck.prototype:CreateFrame(redraw)
 
 	self.frame:SetScale(self.moduleSettings.scale)
 	self.frame:SetFrameStrata("BACKGROUND")
-	self.frame:SetWidth(100)
+	self.frame:SetWidth(200)
 	self.frame:SetHeight(32)
 	self.frame:ClearAllPoints()
 	self.frame:SetPoint("TOP", self.parent, "TOP", self.moduleSettings.hpos, self.moduleSettings.vpos)