diff --git a/2/3/4/5/6/7/ElvUI/Core/Math.lua b/2/3/4/5/6/7/ElvUI/Core/Math.lua
index cc0de75..2c12aef 100644
--- a/2/3/4/5/6/7/ElvUI/Core/Math.lua
+++ b/2/3/4/5/6/7/ElvUI/Core/Math.lua
@@ -258,8 +258,8 @@ function E:Delay(delay, func, ...)
 		return false
 	end
 	if waitFrame == nil then
-		waitFrame = CreateFrame("Frame","WaitFrame", E.UIParent)
-		waitFrame:SetScript("onUpdate", function()
+		waitFrame = CreateFrame("Frame", "WaitFrame", E.UIParent)
+		waitFrame:SetScript("OnUpdate", function()
 			local waitRecord, waitDelay, waitFunc, waitParams
 			local i, count = 1, getn(waitTable)
 			while i <= count do
diff --git a/2/3/4/5/6/7/ElvUI/Libraries/oUF/elements/tags.lua b/2/3/4/5/6/7/ElvUI/Libraries/oUF/elements/tags.lua
index 898f02f..70c5fc5 100644
--- a/2/3/4/5/6/7/ElvUI/Libraries/oUF/elements/tags.lua
+++ b/2/3/4/5/6/7/ElvUI/Libraries/oUF/elements/tags.lua
@@ -467,11 +467,11 @@ local unitlessEvents = {
 
 local events = {}
 local frame = CreateFrame('Frame')
-frame:SetScript('OnEvent', function(self, event, unit)
+frame:SetScript('OnEvent', function()
 	local strings = events[event]
 	if(strings) then
 		for _, fontstring in next, strings do
-			if(fontstring:IsVisible() and (unitlessEvents[event] or fontstring.parent.unit == unit)) then
+			if(fontstring:IsVisible() and (unitlessEvents[event] or fontstring.parent.unit == arg1)) then
 				fontstring:UpdateTag()
 			end
 		end
diff --git a/2/3/4/5/6/7/ElvUI/Modules/ActionBars/ActionBars.lua b/2/3/4/5/6/7/ElvUI/Modules/ActionBars/ActionBars.lua
index 6da7a05..49f7761 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/ActionBars/ActionBars.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/ActionBars/ActionBars.lua
@@ -223,9 +223,7 @@ function AB:CreateBar(id)
 				end
 
 				bar.buttons = bar.bonusButtons
-		--	ShowBonusActionBar();
-		else
-		--	HideBonusActionBar();
+			else
 				for i = 1, NUM_ACTIONBAR_BUTTONS do
 					bar.buttons[i]:SetParent(E.HiddenFrame)
 				end
diff --git a/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Elements/Health.lua b/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Elements/Health.lua
index ff55092..4d5ead8 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Elements/Health.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Elements/Health.lua
@@ -100,7 +100,6 @@ function UF:Configure_HealthBar(frame)
 	health:ClearAllPoints()
 	if frame.ORIENTATION == "LEFT" then
 		health:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -frame.BORDER - frame.SPACING, -frame.BORDER - frame.SPACING - frame.CLASSBAR_YOFFSET)
-		health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET) - (frame.BORDER + frame.SPACING + frame.BOTTOM_OFFSET))
 
 		if frame.USE_POWERBAR_OFFSET then
 			health:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -frame.BORDER - frame.SPACING - frame.POWERBAR_OFFSET, -frame.BORDER - frame.SPACING - frame.CLASSBAR_YOFFSET)
@@ -108,15 +107,16 @@ function UF:Configure_HealthBar(frame)
 			health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.POWERBAR_OFFSET) - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET))
 		elseif frame.POWERBAR_DETACHED or not frame.USE_POWERBAR or frame.USE_INSET_POWERBAR then
 			health:SetWidth(frame.UNIT_WIDTH - (frame.PORTRAIT_WIDTH + frame.BORDER + frame.SPACING) - (frame.BORDER + frame.SPACING))
+			health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET) - (frame.BORDER + frame.SPACING + frame.BOTTOM_OFFSET))
 		elseif frame.USE_MINI_POWERBAR then
-			health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET) - (frame.SPACING + (frame.POWERBAR_HEIGHT/2)))
 			health:SetWidth(frame.UNIT_WIDTH - (frame.PORTRAIT_WIDTH + frame.BORDER + frame.SPACING) - (frame.BORDER + frame.SPACING))
+			health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET) - (frame.SPACING + (frame.POWERBAR_HEIGHT/2)))
 		else
 			health:SetWidth(frame.UNIT_WIDTH - (frame.PORTRAIT_WIDTH + frame.BORDER + frame.SPACING) - (frame.BORDER + frame.SPACING))
+			health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET) - (frame.BORDER + frame.SPACING + frame.BOTTOM_OFFSET))
 		end
 	elseif frame.ORIENTATION == "RIGHT" then
 		health:SetPoint("TOPLEFT", frame, "TOPLEFT", frame.BORDER + frame.SPACING, -frame.BORDER - frame.SPACING - frame.CLASSBAR_YOFFSET)
-		health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET) - (frame.BORDER + frame.SPACING + frame.BOTTOM_OFFSET))
 
 		if frame.USE_POWERBAR_OFFSET then
 			health:SetPoint("TOPLEFT", frame, "TOPLEFT", frame.BORDER + frame.SPACING + frame.POWERBAR_OFFSET, -frame.BORDER - frame.SPACING - frame.CLASSBAR_YOFFSET)
@@ -124,15 +124,16 @@ function UF:Configure_HealthBar(frame)
 			health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.POWERBAR_OFFSET) - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET))
 		elseif frame.POWERBAR_DETACHED or not frame.USE_POWERBAR or frame.USE_INSET_POWERBAR then
 			health:SetWidth(frame.UNIT_WIDTH - (frame.PORTRAIT_WIDTH + frame.BORDER + frame.SPACING) - (frame.BORDER + frame.SPACING))
+			health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET) - (frame.BORDER + frame.SPACING + frame.BOTTOM_OFFSET))
 		elseif frame.USE_MINI_POWERBAR then
-			health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET) - (frame.SPACING + (frame.POWERBAR_HEIGHT/2)))
 			health:SetWidth(frame.UNIT_WIDTH - (frame.PORTRAIT_WIDTH + frame.BORDER + frame.SPACING) - (frame.BORDER + frame.SPACING))
+			health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET) - (frame.SPACING + (frame.POWERBAR_HEIGHT/2)))
 		else
 			health:SetWidth(frame.UNIT_WIDTH - (frame.PORTRAIT_WIDTH + frame.BORDER + frame.SPACING) - (frame.BORDER + frame.SPACING))
+			health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET) - (frame.BORDER + frame.SPACING + frame.BOTTOM_OFFSET))
 		end
 	elseif frame.ORIENTATION == "MIDDLE" then
 		health:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -frame.BORDER - frame.SPACING, -frame.BORDER - frame.SPACING - frame.CLASSBAR_YOFFSET)
-		health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET) - (frame.BORDER + frame.SPACING + frame.BOTTOM_OFFSET))
 
 		if frame.USE_POWERBAR_OFFSET then
 			health:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -frame.BORDER - frame.SPACING - frame.POWERBAR_OFFSET, -frame.BORDER - frame.SPACING - frame.CLASSBAR_YOFFSET)
@@ -140,11 +141,13 @@ function UF:Configure_HealthBar(frame)
 			health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.POWERBAR_OFFSET) - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET))
 		elseif frame.POWERBAR_DETACHED or not frame.USE_POWERBAR or frame.USE_INSET_POWERBAR then
 			health:SetWidth(frame.UNIT_WIDTH - (frame.BORDER + frame.SPACING) - (frame.BORDER + frame.SPACING))
+			health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET) - (frame.BORDER + frame.SPACING + frame.BOTTOM_OFFSET))
 		elseif frame.USE_MINI_POWERBAR then
-			health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET) - (frame.SPACING + (frame.POWERBAR_HEIGHT/2)))
 			health:SetWidth(frame.UNIT_WIDTH - (frame.BORDER + frame.SPACING) - (frame.BORDER + frame.SPACING))
+			health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET) - (frame.SPACING + (frame.POWERBAR_HEIGHT/2)))
 		else
 			health:SetWidth(frame.UNIT_WIDTH - (frame.PORTRAIT_WIDTH + frame.BORDER + frame.SPACING) - (frame.BORDER + frame.SPACING))
+			health:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET) - (frame.BORDER + frame.SPACING + frame.BOTTOM_OFFSET))
 		end
 	end
 
diff --git a/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Elements/Portrait.lua b/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Elements/Portrait.lua
index 6c2e7b3..997169b 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Elements/Portrait.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Elements/Portrait.lua
@@ -49,12 +49,16 @@ function UF:Configure_Portrait(frame, dontHide)
 		portrait.backdrop:ClearAllPoints();
 		if(frame.USE_PORTRAIT_OVERLAY) then
 			if(db.portrait.style == "3D") then
-				portrait:SetFrameLevel(frame.Health:GetFrameLevel());
+				portrait:SetFrameLevel(frame.Health:GetFrameLevel() + 1);
 			else
 				portrait:SetParent(frame.Health);
 			end
 
 			portrait:SetAllPoints(frame.Health);
+
+			portrait:SetPoint("TOPLEFT", frame.Health, "TOPLEFT", - frame.BORDER - frame.SPACING, -(frame.BORDER + frame.SPACING))
+			portrait:SetPoint("BOTTOMLEFT", frame.Health, "BOTTOMLEFT", - frame.BORDER - frame.SPACING, -(frame.BORDER + frame.SPACING))
+	
 			portrait:SetAlpha(0.35);
 			if(not dontHide) then
 				portrait:Show();
diff --git a/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Elements/Power.lua b/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Elements/Power.lua
index 4ff1779..288e642 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Elements/Power.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/UnitFrames/Elements/Power.lua
@@ -132,9 +132,9 @@ function UF:Configure_Power(frame)
 			power.backdrop:SetFrameLevel(49)
 		elseif frame.USE_POWERBAR_OFFSET then
 			if frame.ORIENTATION == "LEFT" then
-				power:SetWidth(frame.UNIT_WIDTH - frame.PORTRAIT_WIDTH - frame.POWERBAR_OFFSET)
-				power:SetHeight(frame.UNIT_HEIGHT - frame.POWERBAR_OFFSET)
 				power:SetPoint("TOPRIGHT", frame.Health, "TOPRIGHT", frame.POWERBAR_OFFSET, -frame.POWERBAR_OFFSET)
+				power:SetWidth(frame.UNIT_WIDTH - (frame.PORTRAIT_WIDTH + frame.BORDER + frame.SPACING) - (frame.BORDER + frame.SPACING + frame.POWERBAR_OFFSET))
+				power:SetHeight(frame.UNIT_HEIGHT - (frame.BORDER + frame.SPACING + frame.POWERBAR_OFFSET) - (frame.BORDER + frame.SPACING + frame.CLASSBAR_YOFFSET))
 			elseif frame.ORIENTATION == "MIDDLE" then
 				power:SetWidth(frame.UNIT_WIDTH - frame.PORTRAIT_WIDTH - ((frame.BORDER + frame.SPACING) * 2))
 				power:SetHeight(frame.UNIT_HEIGHT - (frame.POWERBAR_OFFSET + frame.CLASSBAR_YOFFSET) - frame.BORDER)
@@ -171,9 +171,9 @@ function UF:Configure_Power(frame)
 			power:SetFrameLevel(50)
 			power.backdrop:SetFrameLevel(49)
 		else
-			power:SetWidth(frame.UNIT_WIDTH - frame.PORTRAIT_WIDTH - (frame.BORDER*2))
-			power:SetHeight(frame.POWERBAR_HEIGHT - ((frame.BORDER + frame.SPACING)*2))
 			power:SetPoint("TOPLEFT", frame.Health.backdrop, "BOTTOMLEFT", frame.BORDER, -frame.SPACING*3)
+			power:SetWidth(frame.UNIT_WIDTH - (frame.PORTRAIT_WIDTH + frame.BORDER + frame.SPACING) - (frame.BORDER + frame.SPACING))
+			power:SetHeight(frame.POWERBAR_HEIGHT - ((frame.BORDER + frame.SPACING)*2))
 
 			power:SetFrameLevel(frame.Health:GetFrameLevel() - 5)
 			power.backdrop:SetFrameLevel(frame.Health:GetFrameLevel() - 6)