diff --git a/api/unitframes.lua b/api/unitframes.lua
index e11e3100..9be09df5 100644
--- a/api/unitframes.lua
+++ b/api/unitframes.lua
@@ -69,29 +69,32 @@ function pfUI.uf:CreateUnitFrame(unit, id, config, tick)
   f.power.bar:SetAllPoints(f.power)
   f.power.bar:SetMinMaxValues(0, 100)
 
-  f.rightText = f:CreateFontString("Status", "OVERLAY", "GameFontNormal")
-  f.rightText:SetFont(pfUI.font_square, C.global.font_size, "OUTLINE")
-  f.rightText:ClearAllPoints()
-  f.rightText:SetJustifyH("RIGHT")
-  f.rightText:SetFontObject(GameFontWhite)
-  f.rightText:SetParent(f.hp.bar)
-  f.rightText:SetPoint("RIGHT",f.hp.bar, "RIGHT", -10, 0)
-
   f.leftText = f:CreateFontString("Status", "OVERLAY", "GameFontNormal")
   f.leftText:SetFont(pfUI.font_square, C.global.font_size, "OUTLINE")
-  f.leftText:ClearAllPoints()
   f.leftText:SetJustifyH("LEFT")
   f.leftText:SetFontObject(GameFontWhite)
   f.leftText:SetParent(f.hp.bar)
-  f.leftText:SetPoint("LEFT",f.hp.bar, "LEFT", 10, 0)
+  f.leftText:ClearAllPoints()
+  f.leftText:SetPoint("TOPLEFT",f.hp.bar, "TOPLEFT", 2*default_border, -2*default_border)
+  f.leftText:SetPoint("BOTTOMRIGHT",f.hp.bar, "BOTTOMRIGHT", -2*default_border, 2*default_border)
+
+  f.rightText = f:CreateFontString("Status", "OVERLAY", "GameFontNormal")
+  f.rightText:SetFont(pfUI.font_square, C.global.font_size, "OUTLINE")
+  f.rightText:SetJustifyH("RIGHT")
+  f.rightText:SetFontObject(GameFontWhite)
+  f.rightText:SetParent(f.hp.bar)
+  f.rightText:ClearAllPoints()
+  f.rightText:SetPoint("TOPLEFT",f.hp.bar, "TOPLEFT", 2*default_border, -2*default_border)
+  f.rightText:SetPoint("BOTTOMRIGHT",f.hp.bar, "BOTTOMRIGHT", -2*default_border, 2*default_border)
 
   f.centerText = f:CreateFontString("Status", "OVERLAY", "GameFontNormal")
   f.centerText:SetFont(pfUI.font_square, C.global.font_size, "OUTLINE")
-  f.centerText:ClearAllPoints()
   f.centerText:SetJustifyH("CENTER")
   f.centerText:SetFontObject(GameFontWhite)
   f.centerText:SetParent(f.hp.bar)
-  f.centerText:SetAllPoints(f.hp.bar)
+  f.centerText:ClearAllPoints()
+  f.centerText:SetPoint("TOPLEFT",f.hp.bar, "TOPLEFT", 2*default_border, -2*default_border)
+  f.centerText:SetPoint("BOTTOMRIGHT",f.hp.bar, "BOTTOMRIGHT", -2*default_border, 2*default_border)
 
   f:RegisterForClicks('LeftButtonUp', 'RightButtonUp',
     'MiddleButtonUp', 'Button4Up', 'Button5Up')