diff --git a/MailCommander.lua b/MailCommander.lua
index 3a5d872..b346055 100644
--- a/MailCommander.lua
+++ b/MailCommander.lua
@@ -196,7 +196,7 @@ local Count={cache={},
 	samefaction=setmetatable({},
 		{__index=function(table,key)
 		  if type(key)=="number" then error("Non doveva essere un numero") end
-		  table[key]=toonTable[key] and toonTable[key].faction==thisFaction or false
+		  table[key]=toonTable[key] or false
 		  return table[key]
 		  end
 		}
@@ -1281,14 +1281,14 @@ function addon:CloseChooser()
 end
 function addon:OnLoad(frame)
 	mcf=frame
-	frame:SetClampedToScreen()
+	frame:SetClampedToScreen(true)
 	--MCF:EnableMouse(true)
 	--MCF:SetMovable(true)
 	frame.Send:SetText(L["Send All"])
 	frame.Send.tooltip="tooltip"
-	frame:RegisterForDrag("LeftButton")
-	frame:SetScript("OnDragStart",function(frame) frame:StartMoving() end)
-	frame:SetScript("OnDragStop",function(frame) frame:StopMovingOrSizing() end)
+	-- frame:RegisterForDrag("LeftButton")
+	-- frame:SetScript("OnDragStart",function(frame) frame:StartMoving() end)
+	-- frame:SetScript("OnDragStop",function(frame) frame:StopMovingOrSizing() end)
 	ButtonFrameTemplate_HidePortrait(frame)
 	UIDropDownMenu_SetWidth(frame.Filter, 150);
 	UIDropDownMenu_Initialize(frame.Filter, function(...) self:InitializeDropDown(...) end );
@@ -1569,18 +1569,18 @@ function addon:RenderButtonList(store,page)
 	if page>0 then
 		mcf.PrevPageButton:SetID(page-1)
 		mcf.PrevPageButton:Enable()
-		mcf.PrevPageButton.Text:SetTextColor(C.Yellow())
+		-- mcf.PrevPageButton.Text:SetTextColor(C.Yellow())
 	else
 		mcf.PrevPageButton:Disable()
-		mcf.PrevPageButton.Text:SetTextColor(C.Silver())
+		-- mcf.PrevPageButton.Text:SetTextColor(C.Silver())
 	end
 	if nextpage then
 		mcf.NextPageButton:SetID(page+1)
 		mcf.NextPageButton:Enable()
-		mcf.NextPageButton.Text:SetTextColor(C.Yellow())
+		-- mcf.NextPageButton.Text:SetTextColor(C.Yellow())
 	else
 		mcf.NextPageButton:Disable()
-		mcf.NextPageButton.Text:SetTextColor(C.Silver())
+		-- mcf.NextPageButton.Text:SetTextColor(C.Silver())
 	end
 end
 function addon:RenderCategoryBox()
@@ -2318,7 +2318,7 @@ function addon:RefreshItemlinks(...)
   refresher=coroutine.wrap(function()
     for i,data in pairs(db.items) do
       UpdateItemInfo(i)
-      C_Timer.After(0.001,refresher)
+    --   C_Timer.After(0.001,refresher)
       coroutine.yield(true)
     end
     addon:Debug("Refreshlink done")
diff --git a/MailCommander.toc b/MailCommander.toc
index 69a4a8b..feb227a 100644
--- a/MailCommander.toc
+++ b/MailCommander.toc
@@ -1,9 +1,9 @@
-## Interface: 90100
+## Interface: 100000
 ## Title: MailCommander 2 @project-version@
 ## Notes: Manages items distribution between multiple toons
 ## Notes-itIT: Gestisce la distribuzione di oggetti fra personaggi multipli
 ## Author: Alar of Daggerspine
-## Version: @project-version@ 90100
+## Version: @project-version@ 100000
 ## X-Revision: @project-abbreviated-hash@
 ## eMail: alar@aspide.it
 ## URL: http://wow.aspide.it
diff --git a/MailCommander.xml b/MailCommander.xml
index e77ef1e..2e4a416 100644
--- a/MailCommander.xml
+++ b/MailCommander.xml
@@ -400,7 +400,7 @@
 				<DisabledTexture file="Interface\Buttons\UI-SpellbookIcon-NextPage-Disabled"/>
 				<HighlightTexture file="Interface\Buttons\UI-Common-MouseHilight" alphaMode="ADD"/>
 			</Button>
-			<Button parentKey="tabNEED" name="$parentTab1" inherits="CharacterFrameTabButtonTemplate" id="1" text="NEED">
+			<Button parentKey="tabNEED" name="$parentTab1" inherits="PanelTabButtonTemplate" id="1" text="NEED">
 				<Anchors>
 					<Anchor point="CENTER" relativePoint="BOTTOMLEFT" x="50" y="-15"/>
 				</Anchors>
@@ -418,7 +418,7 @@
 					</OnLoad>
 				</Scripts>
 			</Button>
-			<Button parentKey="tabSEND" name="$parentTab2" inherits="CharacterFrameTabButtonTemplate" id="2" text="SEND_LABEL">
+			<Button parentKey="tabSEND" name="$parentTab2" inherits="PanelTabButtonTemplate" id="2" text="SEND_LABEL">
 				<Anchors>
 					<Anchor point="LEFT" relativeTo="$parentTab1" relativePoint="RIGHT" x="-16" y="0"/>
 				</Anchors>
@@ -436,7 +436,7 @@
 					</OnLoad>
 				</Scripts>
 			</Button>
-			<Button parentKey="tabFILTER" name="$parentTab3" inherits="CharacterFrameTabButtonTemplate" id="3" text="FILTER">
+			<Button parentKey="tabFILTER" name="$parentTab3" inherits="PanelTabButtonTemplate" id="3" text="FILTER">
 				<Anchors>
 					<Anchor point="LEFT" relativeTo="$parentTab2" relativePoint="RIGHT" x="-16" y="0"/>
 				</Anchors>
@@ -454,7 +454,7 @@
 					</OnLoad>
 				</Scripts>
 			</Button>
-			<Button parentKey="tabCATEGORIES" name="$parentTab4" inherits="CharacterFrameTabButtonTemplate" id="4" text="CATEGORIES">
+			<Button parentKey="tabCATEGORIES" name="$parentTab4" inherits="PanelTabButtonTemplate" id="4" text="CATEGORIES">
 				<Anchors>
 					<Anchor point="LEFT" relativeTo="$parentTab3" relativePoint="RIGHT" x="-16" y="0"/>
 				</Anchors>