diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8dae7d9..a32c3aa 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="3c1af1d3-ae57-470d-8daa-a9295703c6fc" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/buy.lua" afterPath="$PROJECT_DIR$/buy.lua" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/buy.xml" afterPath="$PROJECT_DIR$/buy.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core.lua" afterPath="$PROJECT_DIR$/core.lua" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
     </list>
     <ignored path="Aux-Addon.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -100,8 +99,8 @@
       <file leaf-file-name="buy.lua" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/buy.lua">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="12111" max-vertical-offset="15198">
-              <caret line="725" column="77" selection-start-line="725" selection-start-column="77" selection-end-line="725" selection-end-column="77" />
+            <state vertical-scroll-proportion="-13.964286" vertical-offset="9265" max-vertical-offset="15181">
+              <caret line="568" column="63" selection-start-line="568" selection-start-column="63" selection-end-line="568" selection-end-column="63" />
               <folding />
             </state>
           </provider>
@@ -130,8 +129,8 @@
       <file leaf-file-name="buy.xml" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/buy.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.8480447" vertical-offset="669" max-vertical-offset="9673">
-              <caret line="84" column="69" selection-start-line="84" selection-start-column="69" selection-end-line="84" selection-end-column="69" />
+            <state vertical-scroll-proportion="0.5631285" vertical-offset="2012" max-vertical-offset="9826">
+              <caret line="148" column="33" selection-start-line="148" selection-start-column="33" selection-end-line="148" selection-end-column="33" />
               <folding />
             </state>
           </provider>
@@ -188,8 +187,8 @@
         <option value="$PROJECT_DIR$/scan.lua" />
         <option value="$PROJECT_DIR$/info.lua" />
         <option value="$PROJECT_DIR$/list.lua" />
-        <option value="$PROJECT_DIR$/buy.lua" />
         <option value="$PROJECT_DIR$/core.lua" />
+        <option value="$PROJECT_DIR$/buy.lua" />
         <option value="$PROJECT_DIR$/buy.xml" />
       </list>
     </option>
@@ -500,14 +499,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/buy.lua">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="12111" max-vertical-offset="15198">
-          <caret line="725" column="77" selection-start-line="725" selection-start-column="77" selection-end-line="725" selection-end-column="77" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/core.lua">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="920" max-vertical-offset="8602">
@@ -524,10 +515,18 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/buy.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-13.964286" vertical-offset="9265" max-vertical-offset="15181">
+          <caret line="568" column="63" selection-start-line="568" selection-start-column="63" selection-end-line="568" selection-end-column="63" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/buy.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8480447" vertical-offset="669" max-vertical-offset="9673">
-          <caret line="84" column="69" selection-start-line="84" selection-start-column="69" selection-end-line="84" selection-end-column="69" />
+        <state vertical-scroll-proportion="0.5631285" vertical-offset="2012" max-vertical-offset="9826">
+          <caret line="148" column="33" selection-start-line="148" selection-start-column="33" selection-end-line="148" selection-end-column="33" />
           <folding />
         </state>
       </provider>
diff --git a/buy.lua b/buy.lua
index 2c61194..ff41e1b 100644
--- a/buy.lua
+++ b/buy.lua
@@ -565,8 +565,8 @@ function show_dialog(buyout_mode, entry, amount)
 	AuxBuyConfirmation.EnhTooltip_info = entry.EnhTooltip_info
 	
 	AuxBuyConfirmationActionButton:Disable()
-	AuxBuyConfirmationItem:SetNormalTexture(entry.texture)
-	AuxBuyConfirmationItemName:SetText(entry.name)
+	AuxBuyConfirmationItemIconTexture:SetTexture(entry.texture)
+	AuxBuyConfirmationItemName:SetText(entry.tooltip[1][1].text)
 	local color = ITEM_QUALITY_COLORS[entry.quality]
 	AuxBuyConfirmationItemName:SetTextColor(color.r, color.g, color.b)
 
@@ -587,7 +587,6 @@ function show_dialog(buyout_mode, entry, amount)
 		AuxBuyConfirmationBuyoutPrice:Hide()
 		AuxBuyConfirmationBid:Show()
 	end
-	hide_sheet()
 	AuxBuyConfirmation:Show()
 end
 
diff --git a/buy.xml b/buy.xml
index 626e122..425865a 100644
--- a/buy.xml
+++ b/buy.xml
@@ -141,6 +141,117 @@
                             </OnLoad>
                         </Scripts>
                     </Frame>
+                    <Frame name="AuxBuyConfirmation" enableMouse="true" frameStrata="FULLSCREEN_DIALOG" inherits="OptionFrameBoxTemplate" hidden="true">
+                        <Anchors>
+                            <Anchor point="TOPLEFT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
+                            <Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
+                        </Anchors>
+                        <Scripts>
+                        </Scripts>
+                        <Frames>
+                            <Frame name="$parentItem">
+                                <Size><AbsDimension x="193" y="37"/></Size>
+                                <Anchors><Anchor point="TOP"><Offset><AbsDimension x="0" y="-100"/></Offset></Anchor></Anchors>
+                                <Layers>
+                                    <Layer level="BORDER">
+                                        <Texture name="$parentIconTexture">
+                                            <Size><AbsDimension x="32" y="32"/></Size>
+                                            <Anchors><Anchor point="LEFT"><Offset><AbsDimension x="2" y="0"/></Offset></Anchor></Anchors>
+                                        </Texture>
+                                        <Texture file="Interface\Buttons\UI-Quickslot2">
+                                            <Size><AbsDimension x="60" y="60"/></Size>
+                                            <Anchors><Anchor point="CENTER" relativeTo="$parentIconTexture"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>
+                                        </Texture>
+                                        <FontString name="$parentCount" inherits="NumberFontNormal" justifyH="RIGHT">
+                                            <Anchors><Anchor point="BOTTOMRIGHT" relativeTo="$parentIconTexture"><Offset><AbsDimension x="-5" y="2"/></Offset></Anchor></Anchors>
+                                        </FontString>
+                                        <FontString name="$parentName" inherits="GameFontNormal" justifyH="LEFT">
+                                            <Anchors>
+                                                <Anchor point="LEFT" relativePoint="RIGHT" relativeTo="$parentIconTexture"><Offset><AbsDimension x="10" y="0"/></Offset></Anchor>
+                                                <Anchor point="RIGHT"><Offset><AbsDimension x="-10" y="0"/></Offset></Anchor>
+                                                <Anchor point="TOP"><Offset><AbsDimension x="0" y="-5"/></Offset></Anchor>
+                                                <Anchor point="BOTTOM"><Offset><AbsDimension x="0" y="5"/></Offset></Anchor>
+                                            </Anchors>
+                                        </FontString>
+                                    </Layer>
+                                    <Layer level="BACKGROUND">
+                                        <Texture name="$parentLeft" file="Interface\AuctionFrame\UI-AuctionItemNameFrame">
+                                            <Size><AbsDimension x="10" y="37"/></Size>
+                                            <Anchors><Anchor point="LEFT" relativePoint="RIGHT" relativeTo="$parentIconTexture"><Offset><AbsDimension x="2" y="0"/></Offset></Anchor></Anchors>
+                                            <TexCoords left="0" right="0.078125" top="0" bottom="1.0"/>
+                                        </Texture>
+                                        <Texture name="$parentRight" file="Interface\AuctionFrame\UI-AuctionItemNameFrame">
+                                            <Size><AbsDimension x="10" y="37"/></Size>
+                                            <Anchors><Anchor point="RIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
+                                            </Anchors>
+                                            <TexCoords left="0.75" right="0.828125" top="0" bottom="1.0"/>
+                                        </Texture>
+                                        <Texture file="Interface\AuctionFrame\UI-AuctionItemNameFrame">
+                                            <Size><AbsDimension x="10" y="37"/></Size>
+                                            <Anchors>
+                                                <Anchor point="LEFT" relativeTo="$parentLeft" relativePoint="RIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
+                                                <Anchor point="RIGHT" relativeTo="$parentRight" relativePoint="LEFT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
+                                            </Anchors>
+                                            <TexCoords left="0.078125" right="0.75" top="0" bottom="1.0"/>
+                                        </Texture>
+                                    </Layer>
+                                </Layers>
+                                <Scripts>
+                                    <OnEnter>
+                                        Aux.info.set_game_tooltip(this, this:GetParent().tooltip, 'ANCHOR_LEFT', this:GetParent().EnhTooltip_info)
+                                    </OnEnter>
+                                    <OnLeave>
+                                        GameTooltip:Hide()
+                                    </OnLeave>
+                                </Scripts>
+                                <HighlightTexture alphaMode="ADD" file="Interface\Buttons\ButtonHilight-Square"/>
+                            </Frame>
+                            <Frame name="$parentBid" inherits="MoneyInputFrameTemplate">
+                                <Anchors><Anchor point="BOTTOM"><Offset><AbsDimension x="30" y="115"/></Offset></Anchor></Anchors>
+                                <Layers>
+                                    <Layer level="OVERLAY">
+                                        <FontString inherits="GameFontNormalLarge" text="Price:" justifyH="RIGHT">
+                                            <Anchors><Anchor point="RIGHT" relativePoint="LEFT"><Offset><AbsDimension x="-10" y="0"/></Offset></Anchor></Anchors>
+                                        </FontString>
+                                    </Layer>
+                                </Layers>
+                            </Frame>
+                            <Frame name="$parentBuyoutPrice" inherits="SmallMoneyFrameTemplate">
+                                <Anchors><Anchor point="BOTTOM"><Offset><AbsDimension x="30" y="130"/></Offset></Anchor></Anchors>
+                                <Scripts>
+                                    <OnLoad>
+                                        SmallMoneyFrame_OnLoad()
+                                        MoneyFrame_SetType("STATIC")
+                                    </OnLoad>
+                                </Scripts>
+                                <Layers>
+                                    <Layer level="OVERLAY">
+                                        <FontString inherits="GameFontNormal" text="Price:" justifyH="RIGHT">
+                                            <Anchors><Anchor point="RIGHT" relativePoint="LEFT"><Offset><AbsDimension x="-5" y="0"/></Offset></Anchor></Anchors>
+                                        </FontString>
+                                    </Layer>
+                                </Layers>
+                            </Frame>
+                            <Button name="$parentActionButton" inherits="UIPanelButtonTemplate" text="Buy" disabled="true">
+                                <Size><AbsDimension x="80" y="21"/>	</Size>
+                                <Anchors><Anchor point="BOTTOMLEFT"><Offset><AbsDimension x="240" y="90"/></Offset></Anchor></Anchors>
+                                <Scripts>
+                                    <OnClick>
+                                        Aux.buy.dialog_action()
+                                    </OnClick>
+                                </Scripts>
+                            </Button>
+                            <Button name="$parentCancelButton" inherits="UIPanelButtonTemplate" text="Cancel">
+                                <Size><AbsDimension x="80" y="21"/></Size>
+                                <Anchors><Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="-240" y="90"/></Offset></Anchor></Anchors>
+                                <Scripts>
+                                    <OnClick>
+                                        Aux.buy.dialog_cancel()
+                                    </OnClick>
+                                </Scripts>
+                            </Button>
+                        </Frames>
+                    </Frame>
                 </Frames>
             </Frame>
 			
@@ -456,108 +567,6 @@
 					</OnClick>
 				</Scripts>
 			</Button>
-					
-			<Frame name="AuxBuyConfirmation" hidden="true">
-				<Size><AbsDimension x="634" y="306"/></Size>
-				<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="188" y="-103"/></Offset></Anchor></Anchors>
-				<Frames>
-					<Button name="$parentItem">
-						<Size><AbsDimension x="54" y="54"/></Size>
-						<Anchors><Anchor point="TOP"><Offset><AbsDimension x="-102" y="-80"/></Offset></Anchor></Anchors>
-						<Layers>
-							<Layer level="BACKGROUND">
-								<FontString name="$parentName" inherits="GameFontHighlightLarge" justifyH="LEFT">
-									<Size><AbsDimension x="172" y="46"/></Size>
-									<Anchors><Anchor point="LEFT"><Offset><AbsDimension x="70" y="0"/></Offset></Anchor></Anchors>
-								</FontString>
-								<Texture name="$parentLeft" file="Interface\AuctionFrame\UI-AuctionItemNameFrame">
-									<Size><AbsDimension x="10" y="54"/></Size>
-									<Anchors><Anchor point="LEFT" relativePoint="RIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>
-									<TexCoords left="0" right="0.078125" top="0" bottom="1.0"/>
-								</Texture>
-								<Texture name="$parentRight" file="Interface\AuctionFrame\UI-AuctionItemNameFrame">
-                                    <Size><AbsDimension x="10" y="54"/></Size>
-									<Anchors><Anchor point="RIGHT"><Offset><AbsDimension x="204" y="0"/></Offset></Anchor>
-									</Anchors>
-									<TexCoords left="0.75" right="0.828125" top="0" bottom="1.0"/>
-								</Texture>
-								<Texture file="Interface\AuctionFrame\UI-AuctionItemNameFrame">
-									<Size><AbsDimension x="10" y="54"/></Size>
-									<Anchors>
-										<Anchor point="LEFT" relativeTo="$parentLeft" relativePoint="RIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
-										<Anchor point="RIGHT" relativeTo="$parentRight" relativePoint="LEFT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
-									</Anchors>
-									<TexCoords left="0.078125" right="0.75" top="0" bottom="1.0"/>
-								</Texture>
-							</Layer>
-							<Layer level="OVERLAY">
-								<FontString name="$parentCount" inherits="NumberFontNormalLarge" justifyH="RIGHT" hidden="true">
-									<Anchors><Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="-9" y="3"/></Offset></Anchor></Anchors>
-								</FontString>
-							</Layer>
-						</Layers>
-						<Scripts>
-							<OnEnter>
-								Aux.info.set_game_tooltip(this, this:GetParent().tooltip, 'ANCHOR_LEFT', this:GetParent().EnhTooltip_info)
-							</OnEnter>
-							<OnLeave>
-								GameTooltip:Hide()
-							</OnLeave>
-						</Scripts>
-						<HighlightTexture alphaMode="ADD" file="Interface\Buttons\ButtonHilight-Square"/>
-					</Button>
-					<Frame name="$parentBid" inherits="MoneyInputFrameTemplate">
-						<Anchors><Anchor point="BOTTOM"><Offset><AbsDimension x="30" y="115"/></Offset></Anchor></Anchors>
-						<Layers>
-							<Layer level="OVERLAY">
-								<FontString inherits="GameFontNormalLarge" text="Price:" justifyH="RIGHT">
-									<Anchors><Anchor point="RIGHT" relativePoint="LEFT"><Offset><AbsDimension x="-10" y="0"/></Offset></Anchor></Anchors>
-								</FontString>
-							</Layer>
-						</Layers>
-					</Frame>					
-					<Frame name="$parentBuyoutPrice" inherits="MoneyFrameTemplate">
-						<Anchors><Anchor point="BOTTOM"><Offset><AbsDimension x="30" y="108"/></Offset></Anchor></Anchors>
-						<Scripts>
-							<OnLoad>
-								MoneyFrame_OnLoad()
-								MoneyFrame_SetType("STATIC")
-							</OnLoad>
-						</Scripts>
-						<Layers>
-							<Layer level="OVERLAY">
-								<FontString inherits="GameFontNormalLarge" text="Price:" justifyH="RIGHT">
-									<Anchors><Anchor point="RIGHT" relativePoint="LEFT"><Offset><AbsDimension x="-5" y="0"/></Offset></Anchor></Anchors>
-								</FontString>
-							</Layer>
-						</Layers>
-					</Frame>
-					<Button name="$parentActionButton" inherits="UIPanelButtonTemplate" text="Buy" disabled="true">
-						<Size><AbsDimension x="110" y="30"/>	</Size>
-						<Anchors><Anchor point="BOTTOMLEFT"><Offset><AbsDimension x="190" y="60"/></Offset></Anchor></Anchors>
-						<NormalText inherits="GameFontNormalLarge"/>
-						<DisabledText inherits="GameFontDisableLarge"/>
-						<HighlightText inherits="GameFontHighlightLarge"/>
-						<Scripts>
-							<OnClick>
-								Aux.buy.dialog_action()
-							</OnClick>
-						</Scripts>
-					</Button>
-					<Button name="$parentCancelButton" inherits="UIPanelButtonTemplate" text="Cancel">
-						<Size><AbsDimension x="110" y="30"/></Size>
-						<Anchors><Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="-190" y="60"/></Offset></Anchor></Anchors>
-						<NormalText inherits="GameFontNormalLarge"/>
-						<DisabledText inherits="GameFontDisableLarge"/>
-						<HighlightText inherits="GameFontHighlightLarge"/>
-						<Scripts>
-							<OnClick>
-								Aux.buy.dialog_cancel()
-							</OnClick>
-						</Scripts>
-					</Button>
-				</Frames>
-			</Frame>
 		</Frames>
 	</Frame>
 </Ui>