From ed6f65277e41c3237fdc89a50de888dee634100e Mon Sep 17 00:00:00 2001
From: Manuel Simon Hirsig <simon.hirsig@gmail.com>
Date: Sun, 24 Jan 2016 17:05:57 +0100
Subject: [PATCH] many gui replacements in the search tabs

---
 core.lua                |   3 +-
 filter_search_frame.lua | 193 ++++++++++++++++++++++++++++++++++-
 filter_search_frame.xml | 218 +---------------------------------------
 gui.lua                 |   4 +-
 item_search_frame.lua   |  23 +++++
 item_search_frame.xml   |  46 ++-------
 post_frame.lua          |   4 +-
 7 files changed, 227 insertions(+), 264 deletions(-)

diff --git a/core.lua b/core.lua
index 25ab2b0..1024951 100644
--- a/core.lua
+++ b/core.lua
@@ -133,7 +133,8 @@ function Aux.place_bid(type, index, bid)
     local money = GetMoney()
     if money >= bid then
         Aux.bid_lock = true
-        Aux.control.as_soon_as(function() return GetMoney() < money end, function()
+        local t0 = GetTime()
+        Aux.control.as_soon_as(function() return GetMoney() < money or GetTime() - t0 > 10 end, function()
             Aux.bid_lock = false
         end)
     end
diff --git a/filter_search_frame.lua b/filter_search_frame.lua
index 9be6bda..91dde2d 100644
--- a/filter_search_frame.lua
+++ b/filter_search_frame.lua
@@ -434,7 +434,7 @@ function public.on_load()
     do
         local btn = Aux.gui.button(AuxFilterSearchFrameFilters, 15, '$parentSearchButton')
         btn:SetPoint('BOTTOMLEFT', 8, 15)
-        btn:SetWidth(75)
+        btn:SetWidth(80)
         btn:SetHeight(24)
         btn:SetText('Search')
         btn:SetScript('OnClick', Aux.filter_search_frame.start_search)
@@ -442,7 +442,7 @@ function public.on_load()
     do
         local btn = Aux.gui.button(AuxFilterSearchFrameFilters, 15, '$parentStopButton')
         btn:SetPoint('BOTTOMLEFT', 8, 15)
-        btn:SetWidth(75)
+        btn:SetWidth(80)
         btn:SetHeight(24)
         btn:SetText('Stop')
         btn:SetScript('OnClick', Aux.filter_search_frame.stop_search)
@@ -474,6 +474,193 @@ function public.on_load()
         btn:Disable()
         private.buyout_button = btn
     end
+    do
+        local editbox = Aux.gui.editbox(AuxFilterSearchFrameFilters, '$parentNameInputBox')
+        editbox:SetPoint('TOPLEFT', 14, -20)
+        editbox:SetWidth(150)
+        editbox:SetScript('OnTabPressed', function()
+            if IsShiftKeyDown() then
+                getglobal(this:GetParent():GetName()..'TooltipInputBox4'):SetFocus()
+            else
+                getglobal(this:GetParent():GetName()..'MinLevel'):SetFocus()
+            end
+        end)
+        editbox:SetScript('OnEnterPressed', function()
+            this:ClearFocus()
+            Aux.filter_search_frame.start_search()
+        end)
+        editbox:SetScript('OnEscapePressed', function()
+            this:ClearFocus()
+        end)
+        local label = Aux.gui.label(editbox, 13)
+        label:SetPoint('BOTTOMLEFT', editbox, 'TOPLEFT', -2, 1)
+        label:SetText('Name')
+    end
+    do
+        local label = Aux.gui.label(AuxFilterSearchFrameFiltersCategoryDropDown, 13)
+        label:SetPoint('BOTTOMLEFT', AuxFilterSearchFrameFiltersCategoryDropDown, 'TOPLEFT', 20, 1)
+        label:SetText('Category')
+    end
+    do
+        local label = Aux.gui.label(AuxFilterSearchFrameFiltersQualityDropDown, 13)
+        label:SetPoint('BOTTOMLEFT', AuxFilterSearchFrameFiltersQualityDropDown, 'TOPLEFT', 20, 1)
+        label:SetText('Rarity')
+    end
+    do
+        local editbox = Aux.gui.editbox(AuxFilterSearchFrameFilters, '$parentMinLevel')
+        editbox:SetNumeric(true)
+        editbox:SetMaxLetters(2)
+        editbox:SetPoint('TOPLEFT', 14, -135)
+        editbox:SetWidth(30)
+        editbox:SetScript('OnTabPressed', function()
+            if IsShiftKeyDown() then
+                getglobal(this:GetParent():GetName()..'NameInputBox'):SetFocus()
+            else
+                getglobal(this:GetParent():GetName()..'MaxLevel'):SetFocus()
+            end
+        end)
+        editbox:SetScript('OnEnterPressed', function()
+            this:ClearFocus()
+            Aux.filter_search_frame.start_search()
+        end)
+        editbox:SetScript('OnEscapePressed', function()
+            this:ClearFocus()
+        end)
+        local label = Aux.gui.label(editbox, 13)
+        label:SetPoint('BOTTOMLEFT', editbox, 'TOPLEFT', -2, 1)
+        label:SetText('Level Range')
+    end
+    do
+        local editbox = Aux.gui.editbox(AuxFilterSearchFrameFilters, '$parentMaxLevel')
+        editbox:SetNumeric(true)
+        editbox:SetMaxLetters(2)
+        editbox:SetPoint('TOPLEFT', 54, -135)
+        editbox:SetWidth(30)
+        editbox:SetScript('OnTabPressed', function()
+            if IsShiftKeyDown() then
+                getglobal(this:GetParent():GetName()..'MinLevel'):SetFocus()
+            else
+                getglobal(this:GetParent():GetName()..'TooltipInputBox1'):SetFocus()
+            end
+        end)
+        editbox:SetScript('OnEnterPressed', function()
+            this:ClearFocus()
+            Aux.filter_search_frame.start_search()
+        end)
+        editbox:SetScript('OnEscapePressed', function()
+            this:ClearFocus()
+        end)
+        local label = Aux.gui.label(editbox, 13)
+        label:SetPoint('RIGHT', editbox, 'LEFT', -2, 0)
+        label:SetText('-')
+    end
+    do
+        local label = Aux.gui.label(AuxFilterSearchFrameFiltersUsableCheckButton, 13)
+        label:SetPoint('BOTTOMLEFT', AuxFilterSearchFrameFiltersUsableCheckButton, 'TOPLEFT', -2, 1)
+        label:SetText('Usable')
+    end
+    do
+        local editbox = Aux.gui.editbox(AuxFilterSearchFrameFilters, '$parentTooltipInputBox1')
+        editbox:SetPoint('TOPLEFT', 14, -170)
+        editbox:SetWidth(150)
+        editbox:SetScript('OnTabPressed', function()
+            if IsShiftKeyDown() then
+                getglobal(this:GetParent():GetName()..'MaxLevel'):SetFocus()
+            else
+                getglobal(this:GetParent():GetName()..'TooltipInputBox2'):SetFocus()
+            end
+        end)
+        editbox:SetScript('OnEnterPressed', function()
+            this:ClearFocus()
+            Aux.filter_search_frame.start_search()
+        end)
+        editbox:SetScript('OnEscapePressed', function()
+            this:ClearFocus()
+        end)
+        local label = Aux.gui.label(editbox, 13)
+        label:SetPoint('BOTTOMLEFT', editbox, 'TOPLEFT', -2, 1)
+        label:SetText('Tooltip')
+    end
+    do
+        local editbox = Aux.gui.editbox(AuxFilterSearchFrameFilters, '$parentTooltipInputBox2')
+        editbox:SetPoint('TOPLEFT', 14, -191)
+        editbox:SetWidth(150)
+        editbox:SetScript('OnTabPressed', function()
+            if IsShiftKeyDown() then
+                getglobal(this:GetParent():GetName()..'TooltipInputBox1'):SetFocus()
+            else
+                getglobal(this:GetParent():GetName()..'TooltipInputBox3'):SetFocus()
+            end
+        end)
+        editbox:SetScript('OnEnterPressed', function()
+            this:ClearFocus()
+            Aux.filter_search_frame.start_search()
+        end)
+        editbox:SetScript('OnEscapePressed', function()
+            this:ClearFocus()
+        end)
+    end
+    do
+        local editbox = Aux.gui.editbox(AuxFilterSearchFrameFilters, '$parentTooltipInputBox3')
+        editbox:SetPoint('TOPLEFT', 14, -212)
+        editbox:SetWidth(150)
+        editbox:SetScript('OnTabPressed', function()
+            if IsShiftKeyDown() then
+                getglobal(this:GetParent():GetName()..'TooltipInputBox2'):SetFocus()
+            else
+                getglobal(this:GetParent():GetName()..'TooltipInputBox4'):SetFocus()
+            end
+        end)
+        editbox:SetScript('OnEnterPressed', function()
+            this:ClearFocus()
+            Aux.filter_search_frame.start_search()
+        end)
+        editbox:SetScript('OnEscapePressed', function()
+            this:ClearFocus()
+        end)
+    end
+    do
+        local editbox = Aux.gui.editbox(AuxFilterSearchFrameFilters, '$parentTooltipInputBox4')
+        editbox:SetPoint('TOPLEFT', 14, -233)
+        editbox:SetWidth(150)
+        editbox:SetScript('OnTabPressed', function()
+            if IsShiftKeyDown() then
+                getglobal(this:GetParent():GetName()..'TooltipInputBox3'):SetFocus()
+            else
+                getglobal(this:GetParent():GetName()..'NameInputBox'):SetFocus()
+            end
+        end)
+        editbox:SetScript('OnEnterPressed', function()
+            this:ClearFocus()
+            Aux.filter_search_frame.start_search()
+        end)
+        editbox:SetScript('OnEscapePressed', function()
+            this:ClearFocus()
+        end)
+    end
+    do
+        local editbox = Aux.gui.editbox(AuxFilterSearchFrameFilters, '$parentPageEditBox')
+        editbox:SetNumeric(true)
+        editbox:EnableMouse(false)
+        editbox:SetAlpha(0.5)
+        editbox:SetPoint('BOTTOMLEFT', 111, 15)
+        editbox:SetWidth(30)
+        editbox:SetScript('OnEnterPressed', function()
+            this:ClearFocus()
+            Aux.filter_search_frame.start_search()
+        end)
+        editbox:SetScript('OnEscapePressed', function()
+            this:ClearFocus()
+        end)
+        local label = Aux.gui.label(editbox, 13)
+        label:SetPoint('BOTTOMLEFT', editbox, 'TOPLEFT', -2, 1)
+        label:SetText('Page')
+    end
+    do
+        local label = Aux.gui.label(AuxFilterSearchFrameFiltersAllPagesCheckButton, 13)
+        label:SetPoint('BOTTOMLEFT', AuxFilterSearchFrameFiltersAllPagesCheckButton, 'TOPLEFT', 1, -3)
+        label:SetText('All')
+    end
 end
 
 function public.stop_search()
@@ -642,7 +829,7 @@ function find_auction(entry, express_mode, buyout_mode)
             if Aux.bid_lock then
                 return
             end
-            
+
             if GetMoney() >= amount then
                 entry.gone = true
             end
diff --git a/filter_search_frame.xml b/filter_search_frame.xml
index 8d0cf54..c3ac49a 100644
--- a/filter_search_frame.xml
+++ b/filter_search_frame.xml
@@ -17,49 +17,12 @@
                 <Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="5" y="-35"/></Offset></Anchor></Anchors>
                 <Scripts>
                     <OnLoad>
-                        getglobal(this:GetName().."Title"):SetText('Filters')
+                        <!--getglobal(this:GetName().."Title"):SetText('Filters')-->
                     </OnLoad>
                 </Scripts>
                 <Frames>
-                    <EditBox name="$parentNameInputBox" autoFocus="false" inherits="AuxInputBoxTemplate">
-                        <Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="16" y="-20"/></Offset></Anchor></Anchors>
-                        <Scripts>
-                            <OnLoad>
-                                getglobal(this:GetName()..'Label'):SetText('Name')
-                                this:SetWidth(150)
-                            </OnLoad>
-                            <OnEnterPressed>
-                                this:ClearFocus()
-                                Aux.filter_search_frame.start_search()
-                            </OnEnterPressed>
-                            <OnEscapePressed>
-                                this:ClearFocus()
-                            </OnEscapePressed>
-                            <OnTabPressed>
-                                if IsShiftKeyDown() then
-                                    getglobal(this:GetParent():GetName()..'TooltipInputBox4'):SetFocus()
-                                else
-                                    getglobal(this:GetParent():GetName()..'MinLevel'):SetFocus()
-                                end
-                            </OnTabPressed>
-                        </Scripts>
-                    </EditBox>
-
                     <Frame name="$parentCategoryDropDown" inherits="UIDropDownMenuTemplate">
                         <Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="-8" y="-55" /></Offset></Anchor></Anchors>
-                        <Layers>
-                            <Layer level="BACKGROUND">
-                                <FontString name="$parentLabel" inherits="GameFontNormalSmall" text="Category">
-                                    <Anchors>
-                                        <Anchor point="BOTTOMLEFT" relativePoint="TOPLEFT">
-                                            <Offset>
-                                                <AbsDimension x="21" y="0"/>
-                                            </Offset>
-                                        </Anchor>
-                                    </Anchors>
-                                </FontString>
-                            </Layer>
-                        </Layers>
                         <Scripts>
                             <OnLoad>
                                 UIDropDownMenu_SetWidth(140)
@@ -82,188 +45,14 @@
                                 UIDropDownMenu_Initialize(this, AuxFilterSearchFrameFiltersQualityDropDown_Initialize)
                             </OnShow>
                         </Scripts>
-                        <Layers>
-                            <Layer level="BACKGROUND">
-                                <FontString name="$parentLabel" inherits="GameFontNormalSmall" text="Rarity">
-                                    <Anchors>
-                                        <Anchor point="BOTTOMLEFT" relativePoint="TOPLEFT">
-                                            <Offset>
-                                                <AbsDimension x="21" y="0"/>
-                                            </Offset>
-                                        </Anchor>
-                                    </Anchors>
-                                </FontString>
-                            </Layer>
-                        </Layers>
                     </Frame>
-
-                    <EditBox name="$parentMinLevel" letters="2" numeric="true" autoFocus="false" inherits="AuxInputBoxTemplate">
-                        <Anchors>
-                            <Anchor point="TOPLEFT"><Offset><AbsDimension x="15" y="-135"/></Offset></Anchor>
-                        </Anchors>
-                        <Layers>
-                            <Layer level="ARTWORK">
-                                <FontString inherits="GameFontHighlightSmall" text="-">
-                                    <Anchors><Anchor point="LEFT" relativePoint="RIGHT"><Offset><AbsDimension x="-1" y="0"/></Offset></Anchor></Anchors>
-                                </FontString>
-                            </Layer>
-                        </Layers>
-                        <Scripts>
-                            <OnLoad>
-                                getglobal(this:GetName()..'Label'):SetText('Level Range')
-                                this:SetWidth(30)
-                            </OnLoad>
-                            <OnEnterPressed>
-                                this:ClearFocus()
-                                Aux.filter_search_frame.start_search()
-                            </OnEnterPressed>
-                            <OnTabPressed>
-                                if IsShiftKeyDown() then
-                                    getglobal(this:GetParent():GetName()..'NameInputBox'):SetFocus()
-                                else
-                                    getglobal(this:GetParent():GetName()..'MaxLevel'):SetFocus()
-                                end
-                            </OnTabPressed>
-                        </Scripts>
-                    </EditBox>
-                    <EditBox name="$parentMaxLevel" letters="2" numeric="true" autoFocus="false" inherits="AuxInputBoxTemplate">
-                        <Anchors>
-                            <Anchor point="LEFT" relativeTo="$parentMinLevel" relativePoint="RIGHT"><Offset><AbsDimension x="8" y="0"/></Offset></Anchor>
-                        </Anchors>
-                        <Scripts>
-                            <OnLoad>
-                                this:SetWidth(30)
-                            </OnLoad>
-                            <OnEnterPressed>
-                                this:ClearFocus()
-                                Aux.filter_search_frame.start_search()
-                            </OnEnterPressed>
-                            <OnTabPressed>
-                                if IsShiftKeyDown() then
-                                    getglobal(this:GetParent():GetName()..'MinLevel'):SetFocus()
-                                else
-                                    getglobal(this:GetParent():GetName()..'TooltipInputBox1'):SetFocus()
-                                end
-                            </OnTabPressed>
-                        </Scripts>
-                    </EditBox>
                     <CheckButton name="$parentUsableCheckButton" inherits="UICheckButtonTemplate">
                         <Size><AbsDimension x="22" y="22"/></Size>
                         <Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="87" y="-135" /></Offset></Anchor></Anchors>
-                        <Layers>
-                            <Layer level="OVERLAY">
-                                <FontString inherits="GameFontNormalSmall" text="Usable" justifyH="LEFT">
-                                    <Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="0" y="9"/></Offset></Anchor></Anchors>
-                                </FontString>
-                            </Layer>
-                        </Layers>
                     </CheckButton>
-
-                    <EditBox name="$parentTooltipInputBox1" autoFocus="false" inherits="AuxInputBoxTemplate">
-                        <Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="15" y="-170"/></Offset></Anchor></Anchors>
-                        <Scripts>
-                            <OnLoad>
-                                getglobal(this:GetName()..'Label'):SetText('Tooltip')
-                                this:SetWidth(150)
-                            </OnLoad>
-                            <OnEnterPressed>
-                                this:ClearFocus()
-                                Aux.filter_search_frame.start_search()
-                            </OnEnterPressed>
-                            <OnTabPressed>
-                                if IsShiftKeyDown() then
-                                    getglobal(this:GetParent():GetName()..'MaxLevel'):SetFocus()
-                                else
-                                    getglobal(this:GetParent():GetName()..'TooltipInputBox2'):SetFocus()
-                                end
-                            </OnTabPressed>
-                        </Scripts>
-                    </EditBox>
-                    
-                    <EditBox name="$parentTooltipInputBox2" autoFocus="false" inherits="AuxInputBoxTemplate">
-                        <Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="15" y="-190"/></Offset></Anchor></Anchors>
-                        <Scripts>
-                            <OnLoad>
-                                this:SetWidth(150)
-                            </OnLoad>
-                            <OnEnterPressed>
-                                this:ClearFocus()
-                                Aux.filter_search_frame.start_search()
-                            </OnEnterPressed>
-                            <OnTabPressed>
-                                if IsShiftKeyDown() then
-                                    getglobal(this:GetParent():GetName()..'TooltipInputBox1'):SetFocus()
-                                else
-                                    getglobal(this:GetParent():GetName()..'TooltipInputBox3'):SetFocus()
-                                end
-                            </OnTabPressed>
-                        </Scripts>
-                    </EditBox>
-                    
-                    <EditBox name="$parentTooltipInputBox3" autoFocus="false" inherits="AuxInputBoxTemplate">
-                        <Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="15" y="-210"/></Offset></Anchor></Anchors>
-                        <Scripts>
-                            <OnLoad>
-                                this:SetWidth(150)
-                            </OnLoad>
-                            <OnEnterPressed>
-                                this:ClearFocus()
-                                Aux.filter_search_frame.start_search()
-                            </OnEnterPressed>
-                            <OnTabPressed>
-                                if IsShiftKeyDown() then
-                                    getglobal(this:GetParent():GetName()..'TooltipInputBox2'):SetFocus()
-                                else
-                                    getglobal(this:GetParent():GetName()..'TooltipInputBox4'):SetFocus()
-                                end
-                            </OnTabPressed>
-                        </Scripts>
-                    </EditBox>
-                    
-                    <EditBox name="$parentTooltipInputBox4" autoFocus="false" inherits="AuxInputBoxTemplate">
-                        <Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="15" y="-230"/></Offset></Anchor></Anchors>
-                        <Scripts>
-                            <OnLoad>
-                                this:SetWidth(150)
-                            </OnLoad>
-                            <OnEnterPressed>
-                                this:ClearFocus()
-                                Aux.filter_search_frame.start_search()
-                            </OnEnterPressed>
-                            <OnTabPressed>
-                                if IsShiftKeyDown() then
-                                    getglobal(this:GetParent():GetName()..'TooltipInputBox3'):SetFocus()
-                                else
-                                    getglobal(this:GetParent():GetName()..'NameInputBox'):SetFocus()
-                                end
-                            </OnTabPressed>
-                        </Scripts>
-                    </EditBox>
-
-                    <EditBox name="$parentPageEditBox" numeric="true" autoFocus="false" inherits="AuxInputBoxTemplate">
-                        <Anchors><Anchor point="BOTTOMLEFT" ><Offset><AbsDimension x="111" y="15"/></Offset></Anchor></Anchors>
-                        <Scripts>
-                            <OnLoad>
-                                getglobal(this:GetName()..'Label'):SetText('Page')
-                                this:SetWidth(30)
-                                this:EnableMouse(false)
-                                this:SetAlpha(0.5)
-                            </OnLoad>
-                            <OnEnterPressed>
-                                this:ClearFocus()
-                            </OnEnterPressed>
-                        </Scripts>
-                    </EditBox>
                     <CheckButton name="$parentAllPagesCheckButton" inherits="UICheckButtonTemplate" checked="true">
                         <Size><AbsDimension x="22" y="22"/></Size>
                         <Anchors><Anchor point="BOTTOMLEFT" ><Offset><AbsDimension x="144" y="15"/></Offset></Anchor></Anchors>
-                        <Layers>
-                            <Layer level="OVERLAY">
-                                <FontString inherits="GameFontNormalSmall" text="All" justifyH="LEFT">
-                                    <Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="0" y="9"/></Offset></Anchor></Anchors>
-                                </FontString>
-                            </Layer>
-                        </Layers>
                         <Scripts>
                             <OnClick>
                                 AuxFilterSearchFrameFiltersPageEditBox:EnableMouse(not this:GetChecked())
@@ -279,11 +68,6 @@
                     <AbsDimension x="655" y="326"/>
                 </Size>
                 <Anchors><Anchor point="TOPLEFT" relativePoint="TOPRIGHT" relativeTo="$parentFilters"><Offset><AbsDimension x="3" y="0"/></Offset></Anchor></Anchors>
-                <Scripts>
-                    <OnLoad>
-                        <!--getglobal(this:GetName().."Title"):SetText('Search Results')-->
-                    </OnLoad>
-                </Scripts>
                 <Frames>
                     <Frame name="$parentBuyListing" hidden="true">
                         <Anchors>
diff --git a/gui.lua b/gui.lua
index 1caa1f4..71ca659 100644
--- a/gui.lua
+++ b/gui.lua
@@ -295,7 +295,7 @@ function m.status_bar(parent)
         local text_frame = CreateFrame('Frame', nil, self)
         text_frame:SetFrameLevel(level + 4)
         text_frame:SetAllPoints(self)
-        local text = m.create_label(text_frame)
+        local text = m.label(text_frame)
         text:SetTextColor(unpack(m.config.text_color.enabled))
         text:SetPoint('CENTER', 0, 0)
         self.text = text
@@ -327,7 +327,7 @@ function m.status_bar(parent)
     return self
 end
 
-function m.create_label(parent, size)
+function m.label(parent, size)
     local label = parent:CreateFontString()
     label:SetFont(m.config.content_font, size or m.config.normal_font_size)
     label:SetTextColor(unpack(m.config.label_color.enabled))
diff --git a/item_search_frame.lua b/item_search_frame.lua
index 09eeac0..c759a81 100644
--- a/item_search_frame.lua
+++ b/item_search_frame.lua
@@ -461,6 +461,29 @@ function public.on_load()
         btn:Disable()
         private.buyout_button = btn
     end
+    do
+        local editbox = Aux.gui.editbox(AuxItemSearchFrameItem, '$parentPageEditBox')
+        editbox:SetNumeric(true)
+        editbox:EnableMouse(false)
+        editbox:SetAlpha(0.5)
+        editbox:SetPoint('BOTTOMLEFT', 111, 15)
+        editbox:SetWidth(30)
+        editbox:SetScript('OnEnterPressed', function()
+            this:ClearFocus()
+            Aux.filter_search_frame.start_search()
+        end)
+        editbox:SetScript('OnEscapePressed', function()
+            this:ClearFocus()
+        end)
+        local label = Aux.gui.label(editbox, 13)
+        label:SetPoint('BOTTOMLEFT', editbox, 'TOPLEFT', -2, 1)
+        label:SetText('Page')
+    end
+    do
+        local label = Aux.gui.label(AuxItemSearchFrameItemAllPagesCheckButton, 13)
+        label:SetPoint('BOTTOMLEFT', AuxItemSearchFrameItemAllPagesCheckButton, 'TOPLEFT', 1, -3)
+        label:SetText('All')
+    end
 end
 
 function public.stop_search()
diff --git a/item_search_frame.xml b/item_search_frame.xml
index 451367c..dda8219 100644
--- a/item_search_frame.xml
+++ b/item_search_frame.xml
@@ -15,11 +15,11 @@
             <Frame name="$parentItem" inherits="AuxFrameBoxTemplate">
                 <Size><AbsDimension x="213" y="120"/></Size>
                 <Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="5" y="-35"/></Offset></Anchor></Anchors>
-                <Scripts>
-                    <OnLoad>
-                        getglobal(this:GetName().."Title"):SetText('Item')
-                    </OnLoad>
-                </Scripts>
+                <!--<Scripts>-->
+                    <!--<OnLoad>-->
+                        <!--getglobal(this:GetName().."Title"):SetText('Item')-->
+                    <!--</OnLoad>-->
+                <!--</Scripts>-->
                 <Frames>
                     <Button name="$parentItem" inherits="AuxItemTemplate">
                         <Anchors><Anchor point="TOP"><Offset><AbsDimension x="0" y="-20"/></Offset></Anchor></Anchors>
@@ -35,30 +35,9 @@
                             </OnClick>
                         </scripts>
                     </Button>
-                    <EditBox name="$parentPageEditBox" numeric="true" autoFocus="false" inherits="AuxInputBoxTemplate">
-                        <Anchors><Anchor point="BOTTOMLEFT" ><Offset><AbsDimension x="111" y="15"/></Offset></Anchor></Anchors>
-                        <Scripts>
-                            <OnLoad>
-                                getglobal(this:GetName()..'Label'):SetText('Page')
-                                this:SetWidth(30)
-                                this:EnableMouse(false)
-                                this:SetAlpha(0.5)
-                            </OnLoad>
-                            <OnEnterPressed>
-                                this:ClearFocus()
-                            </OnEnterPressed>
-                        </Scripts>
-                    </EditBox>
                     <CheckButton name="$parentAllPagesCheckButton" inherits="UICheckButtonTemplate" checked="true">
                         <Size><AbsDimension x="22" y="22"/></Size>
                         <Anchors><Anchor point="BOTTOMLEFT" ><Offset><AbsDimension x="144" y="15"/></Offset></Anchor></Anchors>
-                        <Layers>
-                            <Layer level="OVERLAY">
-                                <FontString inherits="GameFontNormalSmall" text="All" justifyH="LEFT">
-                                    <Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="0" y="9"/></Offset></Anchor></Anchors>
-                                </FontString>
-                            </Layer>
-                        </Layers>
                         <Scripts>
                             <OnClick>
                                 AuxItemSearchFrameItemPageEditBox:EnableMouse(not this:GetChecked())
@@ -71,15 +50,9 @@
             </Frame>
             <Frame name="$parentRecentlySearched" inherits="AuxFrameBoxTemplate">
                 <Size>
-                    <AbsDimension x="213" y="186"/>
+                    <AbsDimension x="213" y="202"/>
                 </Size>
-                <Anchors><Anchor point="TOPLEFT" relativePoint="BOTTOMLEFT" relativeTo="$parentItem"><Offset><AbsDimension x="0" y="-20"/></Offset></Anchor></Anchors>
-                <Anchors><Anchor point="BOTTOM" relativePoint="BOTTOM" relativeTo="$parentAuctions"><Offset><AbsDimension x="0" y="-20"/></Offset></Anchor></Anchors>
-                <Scripts>
-                    <OnLoad>
-                        getglobal(this:GetName().."Title"):SetText('Recently Searched')
-                    </OnLoad>
-                </Scripts>
+                <Anchors><Anchor point="TOPLEFT" relativePoint="BOTTOMLEFT" relativeTo="$parentItem"><Offset><AbsDimension x="0" y="-4"/></Offset></Anchor></Anchors>
                 <Frames>
                     <Frame name="$parentListing">
                         <Anchors>
@@ -94,11 +67,6 @@
                     <AbsDimension x="620" y="326"/>
                 </Size>
                 <Anchors><Anchor point="TOPLEFT" relativePoint="TOPRIGHT" relativeTo="$parentItem"><Offset><AbsDimension x="3" y="0"/></Offset></Anchor></Anchors>
-                <Scripts>
-                    <OnLoad>
-                        <!--getglobal(this:GetName().."Title"):SetText('Search Results')-->
-                    </OnLoad>
-                </Scripts>
                 <Frames>
                     <Frame name="$parentBuyListing" hidden="true">
                         <Anchors>
diff --git a/post_frame.lua b/post_frame.lua
index 2356342..6309ec2 100644
--- a/post_frame.lua
+++ b/post_frame.lua
@@ -227,7 +227,7 @@ function public.on_load()
     do
         local btn = Aux.gui.button(AuxSellParameters, 15, '$parentPostButton')
         btn:SetPoint('BOTTOMLEFT', 8, 15)
-        btn:SetWidth(75)
+        btn:SetWidth(80)
         btn:SetHeight(24)
         btn:SetText('Post')
         btn:SetScript('OnClick', private.post_auctions)
@@ -235,7 +235,7 @@ function public.on_load()
     do
         local btn = Aux.gui.button(AuxSellParameters, 15, '$parentRefreshButton')
         btn:SetPoint('LEFT', AuxSellParametersPostButton,'RIGHT', 5, 0)
-        btn:SetWidth(75)
+        btn:SetWidth(80)
         btn:SetHeight(24)
         btn:SetText('Refresh')
         btn:SetScript('OnClick', private.refresh)