--- a/StanceButton.lua	Wed May 11 09:53:48 2011 -0700
+++ b/StanceButton.lua	Sat Jun 11 10:57:00 2011 -0700
@@ -1,5 +1,5 @@
-local addonName, addonTable = ...
-local ReAction = addonTable.ReAction
+local _, ns = ...
+local ReAction = ns.ReAction
 local L = ReAction.L
 local _G = _G
 local CreateFrame = CreateFrame
@@ -53,9 +53,7 @@
 ReAction:RegisterBarType(Stance)
 
 function Stance:New( config, bar, idx, idHint )
-  local name = format("ReAction_%s_Stance_%d",bar:GetName(),idx)
- 
-  self = Super.New(self, name, config, bar, idx, "SecureActionButtonTemplate, ActionButtonTemplate" )
+  self = Super.New(self, config, bar, idx, "SecureActionButtonTemplate, ActionButtonTemplate" )
 
   local f = self:GetFrame()
   local barFrame = bar:GetFrame()
@@ -113,7 +111,7 @@
     self.updatePending = false
     local idx = self:GetActionID()
     local f = self:GetFrame()
-    if idx > GetNumShapeshiftForms() then
+    if idx > GetNumShapeshiftForms() and not ReAction:GetConfigMode() then
       f:Hide()
     else
       f:SetAttribute("spell", select(2,GetShapeshiftFormInfo(idx)))