diff --git a/esoui/internalingame/market/keyboard/market_keyboard.xml b/esoui/internalingame/market/keyboard/market_keyboard.xml
index d9aa2cb..d8dd663 100755
--- a/esoui/internalingame/market/keyboard/market_keyboard.xml
+++ b/esoui/internalingame/market/keyboard/market_keyboard.xml
@@ -43,7 +43,7 @@
                     <Anchor point="BOTTOMRIGHT" offsetX="-5" />
 
                     <Controls>
-                        <Backdrop name="$(parent)Search" tier="HIGH" inherits="ZO_EditBackdrop">
+                        <Backdrop name="$(parent)Search" tier="HIGH" inherits="ZO_SingleLineEditBackdrop_Keyboard">
                             <Anchor point="TOPLEFT" offsetX="10" offsetY="26" />
                             <Dimensions x="240"/>
                             <Controls>
@@ -118,16 +118,86 @@
 
                         <Button name="$(parent)BuyCrowns" inherits="ZO_DefaultButton" text="SI_MARKET_BUY_CROWNS">
                             <Dimensions x="200"/>
-                            <Anchor point="TOP" relativeTo="$(parent)Currency" relativePoint="BOTTOM" offsetY="4"/>
+                            <Anchor point="TOP" relativeTo="$(parent)Currency" relativePoint="BOTTOM" offsetY="8"/>
                             <OnClicked>
                                 ZO_MarketCurrencyBuyCrowns_OnClicked(self)
                             </OnClicked>
+                            <Controls>
+                                <Texture name="$(parent)Icon" textureFile="EsoUI/Art/Icons/store_crowns.dds" layer="CONTROLS">
+                                    <Dimensions x="64" y="64" />
+                                    <Anchor point="RIGHT" relativePoint="LEFT" offsetX="32" />
+                                </Texture>
+                            </Controls>
                         </Button>
                         
                         <Label name="$(parent)NoMatchMessage" font="ZoFontWinH4" color="INTERFACE_COLOR_TYPE_TEXT_COLORS:INTERFACE_TEXT_COLOR_SELECTED" text="SI_MARKET_SEARCH_NO_MATCHES" horizontalAlignment="CENTER" hidden="true">
                             <Anchor point="TOP" relativeTo="$(parent)EntryList"/>
                         </Label>
                         
+                        <Control name="$(parent)SubscriptionPage" resizeToFitDescendents="true" hidden="true">
+                            <Anchor point="TOPLEFT" relativeTo="$(parent)EntryList" />
+                            <Anchor point="BOTTOMRIGHT" relativeTo="$(parent)EntryList" />
+                            
+                            <Controls>
+                                <Label name="$(parent)Title" font="ZoFontWinH1" color="INTERFACE_COLOR_TYPE_TEXT_COLORS:INTERFACE_TEXT_COLOR_SELECTED" text="SI_MARKET_SUBSCRIPTION_PAGE_TITLE">
+                                    <Anchor point="TOPLEFT" />
+                                    <Anchor point="TOPRIGHT" />
+                                </Label>
+
+                                <Control name="$(parent)MembershipInfo" resizeToFitDescendents="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)Title" relativePoint="BOTTOMLEFT" offsetY="10" />
+                                    <Anchor point="TOPRIGHT" relativeTo="$(parent)Title" relativePoint="BOTTOMRIGHT" offsetY="10" />
+                                    
+                                    <Controls>
+                                        <Label name="$(parent)Label" font="ZoFontWinH4" color="INTERFACE_COLOR_TYPE_TEXT_COLORS:INTERFACE_TEXT_COLOR_NORMAL" text="SI_MARKET_SUBSCRIPTION_PAGE_SUBSCRIPTION_STATUS_LABEL">
+                                            <Anchor point="TOPLEFT"/>
+                                        </Label>
+
+                                        <Label name="$(parent)Status" font="ZoFontWinH4" color="INTERFACE_COLOR_TYPE_TEXT_COLORS:INTERFACE_TEXT_COLOR_SELECTED">
+                                            <AnchorToBaseline side="RIGHT" relativeToLabel="$(parent)Label" offsetX="5" />
+                                        </Label>
+                                    </Controls>
+                                </Control>
+                                
+                                <Label name="$(parent)Overview" font="ZoFontWinH4" color="INTERFACE_COLOR_TYPE_TEXT_COLORS:INTERFACE_TEXT_COLOR_NORMAL">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)MembershipInfo" relativePoint="BOTTOMLEFT" offsetY="10" />
+                                    <Anchor point="TOPRIGHT" relativeTo="$(parent)MembershipInfo" relativePoint="BOTTOMRIGHT" offsetY="10" />
+                                </Label>
+                                
+                                <Control name="$(parent)Benefits" resizeToFitDescendents="true">
+                                    <Anchor point="TOPLEFT" relativeTo="$(parent)Overview" relativePoint="BOTTOMLEFT" offsetY="40" />
+                                    <Anchor point="TOPRIGHT" relativeTo="$(parent)Overview" relativePoint="BOTTOMRIGHT" offsetY="40" />
+                                    
+                                    <Controls>
+                                        <Texture name="$(parent)Image" hidden="true">
+                                            <!-- Hide the image for now -->
+                                            <Anchor point="TOPLEFT" relativePoint="TOPRIGHT"/>
+                                            <Anchor point="TOPRIGHT" />
+                                        </Texture>
+                                        
+                                        <Label name="$(parent)Title" font="ZoFontWinH1" color="INTERFACE_COLOR_TYPE_TEXT_COLORS:INTERFACE_TEXT_COLOR_SELECTED" text="SI_MARKET_SUBSCRIPTION_PAGE_BENEFITS_TITLE">
+                                            <Anchor point="TOPLEFT" />
+                                            <Anchor point="TOPRIGHT" relativeTo="$(parent)Image" relativePoint="TOPLEFT" offsetX="-5" />
+                                        </Label>
+                                        
+                                        <Label name="$(parent)Text" font="ZoFontWinH4" color="INTERFACE_COLOR_TYPE_TEXT_COLORS:INTERFACE_TEXT_COLOR_NORMAL">
+                                            <Anchor point="TOPLEFT" relativeTo="$(parent)Title" relativePoint="BOTTOMLEFT" offsetY="10" />
+                                            <Anchor point="TOPRIGHT" relativeTo="$(parent)Title" relativePoint="BOTTOMRIGHT" offsetY="10" />
+                                        </Label>
+                                    </Controls>
+                                </Control>
+                                
+                                <Button name="$(parent)SubscribeButton" inherits="ZO_DefaultButton" text="SI_MARKET_SUBSCRIPTION_PAGE_BUY_SUBSCRIPTION">
+                                    <Dimensions x="230" />
+                                    <Anchor point="TOP" relativeTo="$(parent)Benefits" relativePoint="BOTTOM" offsetY="50" />
+
+                                    <OnClicked>
+                                        ZO_MarketCurrencyBuySubscription_OnClicked(self)
+                                    </OnClicked>
+                                </Button>
+                            </Controls>
+                        </Control>
+
                     </Controls>
                 </Control>