diff --git a/core.lua b/core.lua
index f0f9805..d015987 100644
--- a/core.lua
+++ b/core.lua
@@ -1,4 +1,4 @@
-AuxVersion = '2.2.23'
+AuxVersion = '2.3.0'
 AuxAuthors = 'shirsig; Zerf; Zirco (Auctionator); Nimeral (Auctionator backport)'
 
 local lastRightClickAction = GetTime()
@@ -59,14 +59,32 @@ function Aux_OnLoad()
         end)
     end
 
-    local tab_group = Aux.gui.tab_group(AuxFrame, 'BOTTOM')
-    tab_group:create_tab('Item Search')
-    tab_group:create_tab('Filter Search')
-    tab_group:create_tab('Post')
-    tab_group:create_tab('Auctions')
-    tab_group:create_tab('Bids')
-    tab_group.on_select = Aux.on_tab_click
-    tab_group:set_tab(1)
+    do
+        local tab_group = Aux.gui.tab_group(AuxFrame, 'BOTTOM')
+        tab_group:create_tab('Item Search')
+        tab_group:create_tab('Filter Search')
+        tab_group:create_tab('Post')
+        tab_group:create_tab('Auctions')
+        tab_group:create_tab('Bids')
+        tab_group.on_select = Aux.on_tab_click
+        tab_group:set_tab(1)
+    end
+    do
+        local btn = Aux.gui.button(AuxFrame, 12)
+        btn:SetPoint('RIGHT', AuxCloseButton, 'LEFT')
+        btn:SetWidth(60)
+        btn:SetHeight(17)
+        btn:SetText('Default UI')
+        btn:SetScript('OnClick',function()
+            if AuctionFrame:IsVisible() then
+                Aux.blizzard_ui_shown = false
+                HideUIPanel(AuctionFrame)
+            else
+                Aux.blizzard_ui_shown = true
+                ShowUIPanel(AuctionFrame)
+            end
+        end)
+    end
 
     Aux.item_search_frame.on_load()
     Aux.filter_search_frame.on_load()
diff --git a/core.xml b/core.xml
index 0954fe5..ddff053 100644
--- a/core.xml
+++ b/core.xml
@@ -380,25 +380,25 @@
                     </Anchor>
                 </Anchors>
             </Button>
-            <Button name="AuxAuctionFrameButton" inherits="UIPanelButtonTemplate" text="Default UI">
-                <Size><AbsDimension x="65" y="17"/></Size>
-                <Anchors><Anchor point="RIGHT" relativePoint="LEFT" relativeTo="AuxCloseButton"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>
-                <Scripts>
-                    <OnLoad>
-                        this:SetTextFontObject('GameFontNormalSmall')
-                        this:SetHighlightFontObject('GameFontHighlightSmall')
-                    </OnLoad>
-                    <OnClick>
-                        if AuctionFrame:IsVisible() then
-                            Aux.blizzard_ui_shown = false
-                            HideUIPanel(AuctionFrame)
-                        else
-                        Aux.blizzard_ui_shown = true
-                            ShowUIPanel(AuctionFrame)
-                        end
-                    </OnClick>
-                </Scripts>
-            </Button>
+            <!--<Button name="AuxAuctionFrameButton" inherits="UIPanelButtonTemplate" text="Default UI">-->
+                <!--<Size><AbsDimension x="65" y="17"/></Size>-->
+                <!--<Anchors><Anchor point="RIGHT" relativePoint="LEFT" relativeTo="AuxCloseButton"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>-->
+                <!--<Scripts>-->
+                    <!--<OnLoad>-->
+                        <!--this:SetTextFontObject('GameFontNormalSmall')-->
+                        <!--this:SetHighlightFontObject('GameFontHighlightSmall')-->
+                    <!--</OnLoad>-->
+                    <!--<OnClick>-->
+                        <!--if AuctionFrame:IsVisible() then-->
+                            <!--Aux.blizzard_ui_shown = false-->
+                            <!--HideUIPanel(AuctionFrame)-->
+                        <!--else-->
+                        <!--Aux.blizzard_ui_shown = true-->
+                            <!--ShowUIPanel(AuctionFrame)-->
+                        <!--end-->
+                    <!--</OnClick>-->
+                <!--</Scripts>-->
+            <!--</Button>-->
             <Frame name="AuxLogFrame" inherits="AuxFrameBoxTemplate">
                 <Size><AbsDimension x="400" y="40"/></Size>
                 <Anchors>
diff --git a/scan_frame.xml b/scan_frame.xml
index 7ea543a..9bd0c95 100644
--- a/scan_frame.xml
+++ b/scan_frame.xml
@@ -12,25 +12,25 @@
 
     <Frame name="AuxHistoryFrame" hidden="true" parent="AuxFrame" setAllPoints="true">
         <Frames>
-            <Button name="AuxHistoryScanButton" inherits="UIPanelButtonTemplate" text="Scan">
-                <Size><AbsDimension x="90" y="26"/></Size>
-                <Anchors><Anchor point="RIGHT" relativePoint="LEFT" relativeTo="AuxAuctionFrameButton"><Offset><AbsDimension x="-25" y="0"/></Offset></Anchor></Anchors>
-                <Scripts>
-                    <OnClick>
-                        Aux.history.start_scan()
-                    </OnClick>
-                </Scripts>
-            </Button>
+            <!--<Button name="AuxHistoryScanButton" inherits="UIPanelButtonTemplate" text="Scan">-->
+                <!--<Size><AbsDimension x="90" y="26"/></Size>-->
+                <!--<Anchors><Anchor point="RIGHT" relativePoint="LEFT" relativeTo="AuxAuctionFrameButton"><Offset><AbsDimension x="-25" y="0"/></Offset></Anchor></Anchors>-->
+                <!--<Scripts>-->
+                    <!--<OnClick>-->
+                        <!--Aux.history.start_scan()-->
+                    <!--</OnClick>-->
+                <!--</Scripts>-->
+            <!--</Button>-->
 
-            <Button name="AuxHistoryStopButton" inherits="UIPanelButtonTemplate" text="Stop" hidden="true">
-                <Size><AbsDimension x="90" y="26"/></Size>
-                <Anchors><Anchor point="RIGHT" relativePoint="LEFT" relativeTo="AuxAuctionFrameButton"><Offset><AbsDimension x="-25" y="0"/></Offset></Anchor></Anchors>
-                <Scripts>
-                    <OnClick>
-                        Aux.history.stop_scan()
-                    </OnClick>
-                </Scripts>
-            </Button>
+            <!--<Button name="AuxHistoryStopButton" inherits="UIPanelButtonTemplate" text="Stop" hidden="true">-->
+                <!--<Size><AbsDimension x="90" y="26"/></Size>-->
+                <!--<Anchors><Anchor point="RIGHT" relativePoint="LEFT" relativeTo="AuxAuctionFrameButton"><Offset><AbsDimension x="-25" y="0"/></Offset></Anchor></Anchors>-->
+                <!--<Scripts>-->
+                    <!--<OnClick>-->
+                        <!--Aux.history.stop_scan()-->
+                    <!--</OnClick>-->
+                <!--</Scripts>-->
+            <!--</Button>-->
         </Frames>
     </Frame>
 </Ui>
diff --git a/sheet.lua b/sheet.lua
index 9c5ac4e..70298c8 100644
--- a/sheet.lua
+++ b/sheet.lua
@@ -111,10 +111,10 @@ function public.create(params)
 	for i = 1,getn(params.columns) do
 		local button = CreateFrame('Button', nil, content)
 		if i == 1 then
-			button:SetPoint('TOPLEFT', content, 'TOPLEFT', 5, 0)
+			button:SetPoint('TOPLEFT', content, 'TOPLEFT', 5, params.plain and 16 or 0)
 			total_width = total_width + 5
 		else
-			button:SetPoint('TOPLEFT', content, 'TOPLEFT', total_width + 3, 0)
+			button:SetPoint('TOPLEFT', content, 'TOPLEFT', total_width + 3, params.plain and 16 or 0)
 			total_width = total_width + 3
 		end
 		local label = content:CreateFontString(nil, 'OVERLAY', 'GameFontHighlight')
@@ -162,6 +162,12 @@ function public.create(params)
 		label.sort_texture = sort_texture
 		label.background = background
 		labels[i] = label
+
+		if params.plain then
+			for _, obj in ipairs({button, label, texture, sort_texture, background}) do
+				obj:Hide()
+			end
+		end
 	end
 	total_width = total_width + 5
     params.frame:SetWidth(total_width)