Merge remote-tracking branch 'upstream/master'

diff --git a/IIfA/CharCurrencyTooltip.lua b/IIfA/CharCurrencyTooltip.lua
index 88ffb4f..f73b757 100644
--- a/IIfA/CharCurrencyTooltip.lua
+++ b/IIfA/CharCurrencyTooltip.lua
@@ -118,7 +118,7 @@ function CharCurrencyFrame:Initialize(objectForAssets)

 	for i=1, GetNumCharacters() do
 		local charName, _, _, _, _, alliance, charId, _ = GetCharacterInfo(i)
-		charName = charName:sub(1, charName:find("%^") - 1)
+		charName = zo_strformat(SI_UNIT_NAME, charName)
 		tControl = CreateControlFromVirtual("IIFA_GUI_AssetsGrid_Row_" .. i, self.frame, "IIFA_CharCurrencyRow")
 		if i == 1 then
 			tControl:SetAnchor(TOPLEFT, prevControl:GetNamedChild("_Title"), BOTTOMLEFT, 0, 26)
diff --git a/IIfA/IIfA.xml b/IIfA/IIfA.xml
index f78be9a..1cb4db0 100644
--- a/IIfA/IIfA.xml
+++ b/IIfA/IIfA.xml
@@ -5,14 +5,15 @@
 			<Anchor point="TOPRIGHT" relativeTo="GUI_ROOT" relativePoint="TOPRIGHT" offsetX="-25" offsetY="40" />

 			<OnMoveStop>IIfA:SaveFrameInfo("onMoveStop")</OnMoveStop>
+			<OnResizeStart> IIfA:onResizeStart() </OnResizeStart>
 			<OnResizeStop>IIfA:onResizeStop()</OnResizeStop>
-
+
 			<Controls>
-				<Backdrop name="$(parent)_BG" inherits="ZO_DefaultBackdrop" ></Backdrop>
+				<Backdrop name="$(parent)_BG" inherits="ZO_DefaultBackdrop" > <AnchorFill/> </Backdrop>

 				<Control name="$(parent)_Header" hidden="false" resizeToFitDescendents="false" >
-					<Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT"/>
-					<Anchor point="TOPRIGHT" relativeTo="$(parent)" relativePoint="TOPRIGHT" offsetX="-10" />
+					<Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetY="10" offsetX="10"/>
+					<Anchor point="TOPRIGHT" relativeTo="$(parent)" relativePoint="TOPRIGHT" offsetX="-10" offsetY="10" />

 					<Controls>
 <!-- Lock/Unlock buttons -->
@@ -72,7 +73,7 @@
 						</Label>

 						<Button name="$(parent)_Hide">
-							<Anchor point="TOPRIGHT" relativeTo="IIFA_GUI" relativePoint="TOPRIGHT" offsetX="0" offsetY="3"/>
+							<Anchor point="TOPRIGHT" relativeTo="IIFA_GUI" relativePoint="TOPRIGHT" offsetX="-10" offsetY="13"/>
 							<OnMouseEnter>IIfA:GuiShowTooltip(self, "Hide window")</OnMouseEnter>
 							<OnMouseExit>IIfA:GuiHideTooltip(self)</OnMouseExit>
 							<OnMouseUp>IIfA:GUIButtonHideOnMouseUp()</OnMouseUp>
@@ -144,7 +145,7 @@
 						<Control name="$(parent)_Dropdown_Quality" inherits="ZO_ComboBox" mouseEnabled="true" >
 							<Dimensions y="29" />
 							<Anchor point="TOPLEFT" relativeTo="$(parent)_Dropdown" relativePoint="TOPRIGHT" offsetX="10" />
-							<Anchor point="TOPRIGHT" relativeTo="$(parent)" relativePoint="TOPRIGHT" offsetX="0" offsetY= "45"/>
+							<Anchor point="TOPRIGHT" relativeTo="$(parent)" relativePoint="TOPRIGHT" offsetX="-7" offsetY= "45"/>
 							<OnShow>IIfA:GuiSetupQualityDropdown(self)</OnShow>
 							<OnMouseEnter>IIfA:GuiShowTooltip(self, "Select quality")</OnMouseEnter>
 							<OnMouseExit>IIfA:GuiHideTooltip(self)</OnMouseExit>
@@ -913,7 +914,7 @@
 				<Control name="$(parent)_ListHolder" mouseEnabled="true" resizeToFitDescendents="false">
 					<DimensionConstraints  minY="52"/>
 					<Anchor point="TOPLEFT" relativeTo="$(parent)_Header_SortBar" relativePoint="BOTTOMLEFT" offsetX="10"/>
-					<Anchor point="BOTTOMRIGHT" relativeTo="$(parent)" relativePoint="BOTTOMRIGHT" offsetX="-27" offsetY="-45"/>
+					<Anchor point="BOTTOMRIGHT" relativeTo="$(parent)" relativePoint="BOTTOMRIGHT" offsetX="-35" offsetY="-60"/>
 					<OnMouseWheel>IIfA:GuiOnScroll(self, delta)</OnMouseWheel>

 					<Controls>
@@ -948,8 +949,8 @@

 				<Control name="$(parent)_Search" mouseEnabled="true" resizeToFitDescendents="false">

-					<Anchor point="BOTTOMLEFT" relativeTo="$(parent)" relativePoint="BOTTOMLEFT" offsetX="16" offsetY="-10"/>
-					<Anchor point="BOTTOMRIGHT" relativeTo="$(parent)" relativePoint="BOTTOMRIGHT" offsetX="-56" offsetY="-10"/>
+					<Anchor point="BOTTOMLEFT" relativeTo="$(parent)" relativePoint="BOTTOMLEFT" offsetX="22" offsetY="-20"/>
+					<Anchor point="BOTTOMRIGHT" relativeTo="$(parent)" relativePoint="BOTTOMRIGHT" offsetX="-60" offsetY="-20"/>
 					<Dimensions y="36" />
 					<Controls>
 						<EditBox name="$(parent)Box"  inherits="ZO_InventorySearchBox" >
diff --git a/IIfA/IIfA_xml_adapter.lua b/IIfA/IIfA_xml_adapter.lua
index 1df3b92..51f7818 100644
--- a/IIfA/IIfA_xml_adapter.lua
+++ b/IIfA/IIfA_xml_adapter.lua
@@ -440,9 +440,16 @@ function IIfA:GuiResizeLines()
 	end
 end

+function IIfA:onResizeStart()
+	EVENT_MANAGER:RegisterForUpdate(IIfA.name.."OnWindowResize", 50,function() IIfA:GuiResizeScroll() if not IIfA:GetSceneSettings().docked then
+		IIfA:UpdateInventoryScroll()
+	end end)
+end
+
 function IIfA:onResizeStop()
 	-- if you resize the box, you need to resize the list to go with it
 	-- local sceneName = IIfA:GetCurrentSceneName()
+	EVENT_MANAGER:UnregisterForUpdate(IIfA.name.."OnWindowResize")
 	local settings = IIfA:GetSceneSettings()

 	IIfA:SaveFrameInfo("onResizeStop")
@@ -453,8 +460,6 @@ function IIfA:onResizeStop()
 	end
 end

-
-
 -- put separate dock/minimize/restore sizing code into unified function so all resizing gets done in one place, one time
 function IIfA:RePositionFrame(settings)
 	--[[