diff --git a/Neuron-Startup.lua b/Neuron-Startup.lua
index 34bffde2..948632ae 100644
--- a/Neuron-Startup.lua
+++ b/Neuron-Startup.lua
@@ -105,9 +105,7 @@ function Neuron:RegisterGUI()
 		LOCKBAR = false,
 		TOOLTIPS = true,
 		BINDTEXT = true,
-		RANGEIND = true,
-		CDTEXT = true,
-		CDALPHA = true },
+		COUNTTEXT = true,},
 			false, 65)
 
 
@@ -122,9 +120,7 @@ function Neuron:RegisterGUI()
 		LOCKBAR = false,
 		TOOLTIPS = true,
 		BINDTEXT = true,
-		RANGEIND = true,
-		CDTEXT = true,
-		CDALPHA = true },
+		COUNTTEXT = true,},
 			false, 65)
 
 
@@ -156,11 +152,7 @@ function Neuron:RegisterGUI()
 		UPCLICKS = true,
 		DOWNCLICKS = true,
 		HIDDEN = true,
-		LOCKBAR = false,
-		BINDTEXT = true,
-		RANGEIND = true,
-		CDTEXT = true,
-		CDALPHA = true },
+		LOCKBAR = false, },
 			false, 65)
 
 	--Neuron Menu Bar
diff --git a/Objects/BUTTON.lua b/Objects/BUTTON.lua
index c92eab76..2649791d 100644
--- a/Objects/BUTTON.lua
+++ b/Objects/BUTTON.lua
@@ -242,8 +242,10 @@ function BUTTON:SetCooldownTimer(start, duration, enable, showCountdownTimer, mo
 		if not charges or charges == maxCharges or maxCharges == 1 then --if ability does not support charges then clear the charge cooldown frame
 			CooldownFrame_Clear(self.iconframechargecooldown)
 		end
-
 	end
+
+	--this is important for items like the ExtraActionButton who use Alpha to show and hide itself (to avoid in-combat restrictions). Without it the button would stay visible
+	self:SetObjectVisibility()
 end
 
 
@@ -427,7 +429,6 @@ function BUTTON:SetData(bar)
 		self:SetScale(bar.data.scale)
 	end
 
-	--self:SetFrameLevel(4)
 	self.iconframe:SetFrameLevel(2)
 	self.iconframecooldown:SetFrameLevel(3)
 	self.iconframechargecooldown:SetFrameLevel(3)
diff --git a/Objects/EXTRABTN.lua b/Objects/EXTRABTN.lua
index 8e72f143..65b31a29 100644
--- a/Objects/EXTRABTN.lua
+++ b/Objects/EXTRABTN.lua
@@ -120,11 +120,9 @@ function EXTRABTN:SetObjectVisibility(show)
 
 	if HasExtraActionBar() or show then --set alpha instead of :Show or :Hide, to avoid taint and to allow the button to appear in combat
 		self:SetAlpha(1)
-
 	elseif not Neuron.buttonEditMode and not Neuron.barEditMode and not Neuron.bindingMode then
 		self:SetAlpha(0)
 	end
-
 end