From 80ba23ab43809dbdbcf8067519e1d328c2416902 Mon Sep 17 00:00:00 2001
From: Will Strohl <will@upendoventures.com>
Date: Mon, 18 May 2020 20:18:33 -0700
Subject: [PATCH 1/2] Only show product sort when there is more than one option

---
 .../MyViewSet/Views/Shared/_Pager.cshtml            | 13 ++++++++-----
 .../SocialSpokes/Views/Shared/_Pager.cshtml         | 13 ++++++++-----
 .../Hotcakes/CategoryViewer/Settings.ascx           |  8 ++++----
 .../Hotcakes/Core/Controllers/CategoryController.cs |  1 -
 .../SocialSpokes/Views/Shared/_Pager.cshtml         | 13 ++++++++-----
 .../_default/Views/Shared/_Pager.cshtml             | 13 ++++++++-----
 6 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyViewSet/Views/Shared/_Pager.cshtml b/DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyViewSet/Views/Shared/_Pager.cshtml
index e4c6ba41a..25f7c553a 100644
--- a/DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyViewSet/Views/Shared/_Pager.cshtml
+++ b/DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyViewSet/Views/Shared/_Pager.cshtml
@@ -42,11 +42,14 @@
 <div class="clearfix">
 @if (ViewData["sortByList"] != null)
 {
-    <div class="hc-sort">
-        <label>@Localization.GetString("SortBy")</label>
-        @Html.DropDownList("sortOrderSelect", (IEnumerable<SelectListItem>)ViewData["sortByList"], new { onchange = "window.open(this.options[this.selectedIndex].value, '_top')" })
-    </div>
-    
+    var sortList = (IEnumerable<SelectListItem>) ViewData["sortByList"];
+    if (sortList.Count() > 1)
+    {
+        <div class="hc-sort">
+            <label>@Localization.GetString("SortBy")</label>
+            @Html.DropDownList("sortOrderSelect", (IEnumerable<SelectListItem>) ViewData["sortByList"], new {onchange = "window.open(this.options[this.selectedIndex].value, '_top')"})
+        </div>
+    }
 }
 @if (Model.TotalPages > 1)
 {
diff --git a/DevSamples/MyViewSet/Portals/_default/HotcakesViews/SocialSpokes/Views/Shared/_Pager.cshtml b/DevSamples/MyViewSet/Portals/_default/HotcakesViews/SocialSpokes/Views/Shared/_Pager.cshtml
index 0ae2b8572..10bdb79f8 100644
--- a/DevSamples/MyViewSet/Portals/_default/HotcakesViews/SocialSpokes/Views/Shared/_Pager.cshtml
+++ b/DevSamples/MyViewSet/Portals/_default/HotcakesViews/SocialSpokes/Views/Shared/_Pager.cshtml
@@ -42,11 +42,14 @@
 <div class="clearfix">
 @if (ViewData["sortByList"] != null)
 {
-    <div class="hc-sort">
-        <label>@Localization.GetString("SortBy")</label>
-        @Html.DropDownList("sortOrderSelect", (IEnumerable<SelectListItem>)ViewData["sortByList"], new { onchange = "window.open(this.options[this.selectedIndex].value, '_top')" })
-    </div>
-    
+    var sortList = (IEnumerable<SelectListItem>) ViewData["sortByList"];
+    if (sortList.Count() > 1)
+    {
+        <div class="hc-sort">
+            <label>@Localization.GetString("SortBy")</label>
+            @Html.DropDownList("sortOrderSelect", (IEnumerable<SelectListItem>) ViewData["sortByList"], new {onchange = "window.open(this.options[this.selectedIndex].value, '_top')"})
+        </div>
+    }
 }
 @if (Model.TotalPages > 1)
 {
diff --git a/Website/DesktopModules/Hotcakes/CategoryViewer/Settings.ascx b/Website/DesktopModules/Hotcakes/CategoryViewer/Settings.ascx
index 54ff04c76..ab0878a33 100644
--- a/Website/DesktopModules/Hotcakes/CategoryViewer/Settings.ascx
+++ b/Website/DesktopModules/Hotcakes/CategoryViewer/Settings.ascx
@@ -15,11 +15,11 @@
 		</div>
 		<div class="dnnFormItem">
 			<dnn:LabelControl ID="CategorySelectionLabel" ControlName="CategoryComboBox" Suffix=":" runat="server" />
-			<asp:DropDownList ID="CategoryComboBox" runat="server" Width="250px" Height="150px"/>
+			<asp:DropDownList ID="CategoryComboBox" runat="server"/>
 		</div>
 		<div class="dnnFormItem">
 			<dnn:LabelControl ID="ViewSelectionLabel" ControlName="ViewComboBox" Suffix=":" runat="server" />
-			<asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px" />
+			<asp:DropDownList ID="ViewComboBox" runat="server"/>
 		</div>
 		<div class="dnnFormItem">
 			<dnn:LabelControl ID="ProductPageSizeLabel" ControlName="ProductPageSizeTextBox" Suffix=":" runat="server" />
@@ -27,11 +27,11 @@
 		</div>
         <div class="dnnFormItem">
 			<dnn:LabelControl ID="PreContentColumnLabel" ControlName="txtPreContentColumnId" Suffix=":" runat="server" />
-			<asp:DropDownList ID="ddlPreContentColumnId"  runat="server" Width="250px" MaxHeight="150px"/>
+			<asp:DropDownList ID="ddlPreContentColumnId" runat="server"/>
 		</div>	
 		<div class="dnnFormItem">
 			<dnn:LabelControl ID="PostContentColumnLabel" ControlName="txtPostContentColumnId" Suffix=":" runat="server" />
-			<asp:DropDownList ID="ddlPostContentColumnId"  runat="server" Width="250px" MaxHeight="150px"/>
+			<asp:DropDownList ID="ddlPostContentColumnId" runat="server"/>
 		</div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ShowManufactures" controlname="ShowManufacturesCheckBox" suffix=":" runat="server" />
diff --git a/Website/DesktopModules/Hotcakes/Core/Controllers/CategoryController.cs b/Website/DesktopModules/Hotcakes/Core/Controllers/CategoryController.cs
index 0204fe038..826bd60fb 100644
--- a/Website/DesktopModules/Hotcakes/Core/Controllers/CategoryController.cs
+++ b/Website/DesktopModules/Hotcakes/Core/Controllers/CategoryController.cs
@@ -36,7 +36,6 @@
 using Hotcakes.Commerce.Content;
 using Hotcakes.Commerce.Extensions;
 using Hotcakes.Commerce.Search;
-using Hotcakes.Commerce.Social;
 using Hotcakes.Commerce.Storage;
 using Hotcakes.Commerce.Urls;
 using Hotcakes.Commerce.Utilities;
diff --git a/Website/Portals/_default/HotcakesViews/SocialSpokes/Views/Shared/_Pager.cshtml b/Website/Portals/_default/HotcakesViews/SocialSpokes/Views/Shared/_Pager.cshtml
index 0ae2b8572..10bdb79f8 100644
--- a/Website/Portals/_default/HotcakesViews/SocialSpokes/Views/Shared/_Pager.cshtml
+++ b/Website/Portals/_default/HotcakesViews/SocialSpokes/Views/Shared/_Pager.cshtml
@@ -42,11 +42,14 @@
 <div class="clearfix">
 @if (ViewData["sortByList"] != null)
 {
-    <div class="hc-sort">
-        <label>@Localization.GetString("SortBy")</label>
-        @Html.DropDownList("sortOrderSelect", (IEnumerable<SelectListItem>)ViewData["sortByList"], new { onchange = "window.open(this.options[this.selectedIndex].value, '_top')" })
-    </div>
-    
+    var sortList = (IEnumerable<SelectListItem>) ViewData["sortByList"];
+    if (sortList.Count() > 1)
+    {
+        <div class="hc-sort">
+            <label>@Localization.GetString("SortBy")</label>
+            @Html.DropDownList("sortOrderSelect", (IEnumerable<SelectListItem>) ViewData["sortByList"], new {onchange = "window.open(this.options[this.selectedIndex].value, '_top')"})
+        </div>
+    }
 }
 @if (Model.TotalPages > 1)
 {
diff --git a/Website/Portals/_default/HotcakesViews/_default/Views/Shared/_Pager.cshtml b/Website/Portals/_default/HotcakesViews/_default/Views/Shared/_Pager.cshtml
index e4c6ba41a..25f7c553a 100644
--- a/Website/Portals/_default/HotcakesViews/_default/Views/Shared/_Pager.cshtml
+++ b/Website/Portals/_default/HotcakesViews/_default/Views/Shared/_Pager.cshtml
@@ -42,11 +42,14 @@
 <div class="clearfix">
 @if (ViewData["sortByList"] != null)
 {
-    <div class="hc-sort">
-        <label>@Localization.GetString("SortBy")</label>
-        @Html.DropDownList("sortOrderSelect", (IEnumerable<SelectListItem>)ViewData["sortByList"], new { onchange = "window.open(this.options[this.selectedIndex].value, '_top')" })
-    </div>
-    
+    var sortList = (IEnumerable<SelectListItem>) ViewData["sortByList"];
+    if (sortList.Count() > 1)
+    {
+        <div class="hc-sort">
+            <label>@Localization.GetString("SortBy")</label>
+            @Html.DropDownList("sortOrderSelect", (IEnumerable<SelectListItem>) ViewData["sortByList"], new {onchange = "window.open(this.options[this.selectedIndex].value, '_top')"})
+        </div>
+    }
 }
 @if (Model.TotalPages > 1)
 {

From 9bf734f751b7283d9f2c21c4c25bd830708649ca Mon Sep 17 00:00:00 2001
From: Will Strohl <will@upendoventures.com>
Date: Tue, 19 May 2020 12:59:15 -0700
Subject: [PATCH 2/2] Resolved issues w/ radcombobox removal in all settings
 views

---
 .../Hotcakes/Cart/Settings.ascx               |  3 +-
 .../App_LocalResources/Settings.ascx.resx     | 18 ++++++
 .../Hotcakes/CategoryMenu/Settings.ascx       | 31 ++++------
 .../Hotcakes/CategoryMenu/Settings.ascx.cs    |  8 +++
 .../Hotcakes/Checkout/Settings.ascx           |  9 ++-
 .../Hotcakes/ContentBlocks/Settings.ascx      |  4 +-
 .../ProductPicker.ascx.resx                   | 12 ++++
 .../Hotcakes/Core/Controls/ProductPicker.ascx | 42 ++++++-------
 .../Core/Controls/ProductPicker.ascx.cs       | 31 +++++++++-
 .../Hotcakes/FeaturedProducts/Settings.ascx   |  2 +-
 .../Hotcakes/Hotcakes.Modules.csproj          |  1 +
 .../Hotcakes/LastProductsViewed/Settings.ascx |  2 +-
 .../Hotcakes/MiniCart/Settings.ascx           |  2 +-
 .../Hotcakes/OrderHistory/Settings.ascx       |  2 +-
 .../App_LocalResources/Settings.ascx.resx     | 21 +++++++
 .../Hotcakes/ProductGrid/Settings.ascx        | 59 +++++++++----------
 .../Hotcakes/ProductGrid/Settings.ascx.cs     | 23 +++++---
 .../Hotcakes/ProductReviews/Settings.ascx     |  2 +-
 .../Hotcakes/ProductViewer/Settings.ascx      |  4 +-
 .../Hotcakes/Search/Settings.ascx             |  2 +-
 .../Hotcakes/SearchInput/Settings.ascx        |  2 +-
 .../Hotcakes/Top10Products/Settings.ascx      |  2 +-
 .../Hotcakes/TopWeeklySellers/Settings.ascx   |  2 +-
 Website/DesktopModules/Hotcakes/module.css    |  3 +
 24 files changed, 183 insertions(+), 104 deletions(-)
 create mode 100644 Website/DesktopModules/Hotcakes/module.css

diff --git a/Website/DesktopModules/Hotcakes/Cart/Settings.ascx b/Website/DesktopModules/Hotcakes/Cart/Settings.ascx
index d0c48df36..b8da58cc9 100644
--- a/Website/DesktopModules/Hotcakes/Cart/Settings.ascx
+++ b/Website/DesktopModules/Hotcakes/Cart/Settings.ascx
@@ -11,8 +11,7 @@
 		</div>
 		<div class="dnnFormItem">
 			<dnn:LabelControl ID="ViewSelectionLabel" ControlName="ViewComboBox" Suffix=":" runat="server" />
-			<asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px"
-				EnableLoadOnDemand="False" ShowMoreResultsBox="false" EnableVirtualScrolling="false"/>
+			<asp:DropDownList ID="ViewComboBox" runat="server"/>
 		</div>
 	</fieldset>
 </div>
diff --git a/Website/DesktopModules/Hotcakes/CategoryMenu/App_LocalResources/Settings.ascx.resx b/Website/DesktopModules/Hotcakes/CategoryMenu/App_LocalResources/Settings.ascx.resx
index c51f7a636..b719405a8 100644
--- a/Website/DesktopModules/Hotcakes/CategoryMenu/App_LocalResources/Settings.ascx.resx
+++ b/Website/DesktopModules/Hotcakes/CategoryMenu/App_LocalResources/Settings.ascx.resx
@@ -159,4 +159,22 @@
   <data name="ViewSelectionLabel.Text" xml:space="preserve">
     <value>Select a view</value>
   </data>
+  <data name="ModeField_ShowAll.Text" xml:space="preserve">
+    <value>Show All Categories</value>
+  </data>
+  <data name="ModeField_ShowAllParent.Text" xml:space="preserve">
+    <value>Show All Categories for Current Parent</value>
+  </data>
+  <data name="ModeField_ShowChildrenPeerParents.Text" xml:space="preserve">
+    <value>Show Children, Peers, and Parents</value>
+  </data>
+  <data name="ModeField_ShowChildrenSelected.Text" xml:space="preserve">
+    <value>Show Children of Selected Category</value>
+  </data>
+  <data name="ModeField_ShowRootOnly.Text" xml:space="preserve">
+    <value>Show Root Categories Only</value>
+  </data>
+  <data name="ModeField_ShowSelected.Text" xml:space="preserve">
+    <value>Show Selected Categories</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Website/DesktopModules/Hotcakes/CategoryMenu/Settings.ascx b/Website/DesktopModules/Hotcakes/CategoryMenu/Settings.ascx
index 98c03e4a1..8eb219bd8 100644
--- a/Website/DesktopModules/Hotcakes/CategoryMenu/Settings.ascx
+++ b/Website/DesktopModules/Hotcakes/CategoryMenu/Settings.ascx
@@ -12,38 +12,29 @@
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ViewSelectionLabel" controlname="ViewComboBox" suffix=":" runat="server" />
-            <asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px"/>
+            <asp:DropDownList ID="ViewComboBox" runat="server"/>
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="MenuTitleLabel" controlname="TitleField" suffix=":" runat="server" />
-            <asp:TextBox ID="TitleField" runat="server" Width="225px"></asp:TextBox>
+            <asp:TextBox ID="TitleField" runat="server"/>
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ModeFieldLabel" controlname="ModeField" suffix=":" runat="server" />
-            <asp:DropDownList ID="ModeField" runat="server" AutoPostBack="True" Width="225px">
-                <Items>
-                    <asp:ListItem Value="0" Text="Show Root Categories Only" />
-                    <asp:ListItem Value="1" Text="Show All Categories" />
-                    <asp:ListItem Value="2" Text="Show Children, Peers and Parents" />
-                    <asp:ListItem Value="3" Text="Show All Categories for Current Parent" />
-                    <asp:ListItem Value="4" Text="Show Selected Categories" />
-                    <asp:ListItem Value="5" Text="Show Children of Selected Category" />
-                </Items>
-            </asp:DropDownList>
+            <asp:DropDownList ID="ModeField" runat="server" AutoPostBack="True"/>
         </div>
         <asp:Panel ID="pnlSelectedCategories" runat="server" Visible="False">
             <dnn:labelcontrol id="lblSelectCategories" suffix=":" runat="server" />
             <table>
                 <tr>
                     <td>
-                        <asp:Label runat="server" ID="lblAvailableCategories"></asp:Label></td>
+                        <asp:Label runat="server" ID="lblAvailableCategories"/></td>
                     <td></td>
                     <td>
-                        <asp:Label runat="server" ID="lblSelectedCategories"></asp:Label></td>
+                        <asp:Label runat="server" ID="lblSelectedCategories"/></td>
                 </tr>
                 <tr>
                     <td>
-                        <asp:ListBox ID="lstCategories" Width="200px" runat="server" SelectionMode="Multiple"></asp:ListBox>
+                        <asp:ListBox ID="lstCategories" runat="server" SelectionMode="Multiple" CssClass="hcListBox"/>
                     </td>
                     <td>
                         <div class="dnnFormItem">
@@ -54,14 +45,16 @@
                         </div>
                     </td>
                     <td>
-                        <asp:ListBox ID="lstSelectedCategories" Width="200px" runat="server" SelectionMode="Multiple"></asp:ListBox>
+                        <asp:ListBox ID="lstSelectedCategories" runat="server" SelectionMode="Multiple" CssClass="hcListBox"/>
                     </td>
                 </tr>
             </table>
         </asp:Panel>
         <asp:Panel ID="pnlSelectedChildren" runat="server" Visible="False">
-            <dnn:labelcontrol id="lblSelectParent" controlname="ModeField" suffix=":" runat="server" />
-            <asp:DropDownList ID="ddlParentCategories" runat="server" Width="225px" />
+            <div class="dnnFormItem">
+                <dnn:labelcontrol id="lblSelectParent" controlname="ModeField" suffix=":" runat="server" />
+                <asp:DropDownList ID="ddlParentCategories" runat="server"/>
+            </div>
         </asp:Panel>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="HomeLinkFieldLabel" controlname="HomeLinkField" runat="server" />
@@ -77,7 +70,7 @@
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="MaximumDepthLabel" controlname="MaximumDepth" suffix=":" runat="server" />
-            <asp:TextBox ID="MaximumDepth" runat="server"></asp:TextBox>
+            <asp:TextBox ID="MaximumDepth" runat="server"/>
         </div>
     </fieldset>
 </div>
diff --git a/Website/DesktopModules/Hotcakes/CategoryMenu/Settings.ascx.cs b/Website/DesktopModules/Hotcakes/CategoryMenu/Settings.ascx.cs
index f65c3c8be..66cd21204 100644
--- a/Website/DesktopModules/Hotcakes/CategoryMenu/Settings.ascx.cs
+++ b/Website/DesktopModules/Hotcakes/CategoryMenu/Settings.ascx.cs
@@ -74,6 +74,14 @@ private void LoadData()
 
             TitleField.Text = Convert.ToString(ModuleSettings["Title"]);
 
+            ModeField.Items.Clear();
+            ModeField.Items.Add(new ListItem(LocalizeString("ModeField_ShowRootOnly"), "0"));
+            ModeField.Items.Add(new ListItem(LocalizeString("ModeField_ShowAll"), "1"));
+            ModeField.Items.Add(new ListItem(LocalizeString("ModeField_ShowChildrenPeerParents"), "2"));
+            ModeField.Items.Add(new ListItem(LocalizeString("ModeField_ShowAllParent"), "3"));
+            ModeField.Items.Add(new ListItem(LocalizeString("ModeField_ShowSelected"), "4"));
+            ModeField.Items.Add(new ListItem(LocalizeString("ModeField_ShowChildrenSelected"), "5"));
+
             var mode = ModuleSettings["CategoryMenuMode"] != null ? ModuleSettings["CategoryMenuMode"].ToString() : "0";
             if (ModeField.Items.FindByValue(mode) != null)
             {
diff --git a/Website/DesktopModules/Hotcakes/Checkout/Settings.ascx b/Website/DesktopModules/Hotcakes/Checkout/Settings.ascx
index d299c7084..564f2d57e 100644
--- a/Website/DesktopModules/Hotcakes/Checkout/Settings.ascx
+++ b/Website/DesktopModules/Hotcakes/Checkout/Settings.ascx
@@ -11,8 +11,7 @@
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ViewSelectionLabel" controlname="ViewComboBox" suffix=":" runat="server" />
-            <asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px"
-                EnableLoadOnDemand="False" ShowMoreResultsBox="false" EnableVirtualScrolling="false" />
+            <asp:DropDownList ID="ViewComboBox" runat="server"/>
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ReceiptViewLabel" controlname="ReceiptViewContentLabel" suffix=":" runat="server" />
@@ -20,7 +19,7 @@
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ReceiptViewSelectionLabel" controlname="ReceiptViewComboBox" suffix=":" runat="server" />
-            <asp:DropDownList ID="ReceiptViewComboBox" runat="server" Width="250px" Height="150px" />
+            <asp:DropDownList ID="ReceiptViewComboBox" runat="server"/>
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="PaymentErrorViewLabel" controlname="PaymentErrorViewContentLabel" suffix=":" runat="server" />
@@ -28,7 +27,7 @@
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="PaymentErrorViewSelectionLabel" controlname="PaymentErrorViewComboBox" suffix=":" runat="server" />
-            <asp:DropDownList ID="PaymentErrorViewComboBox" runat="server" Width="250px" Height="150px" />
+            <asp:DropDownList ID="PaymentErrorViewComboBox" runat="server"/>
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="PayPalViewLabel" controlname="PayPalViewContentLabel" suffix=":" runat="server" />
@@ -36,7 +35,7 @@
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="PayPalViewSelectionLabel" controlname="PayPalViewComboBox" suffix=":" runat="server" />
-            <asp:DropDownList ID="PayPalViewComboBox" runat="server" Width="250px" Height="150px" />
+            <asp:DropDownList ID="PayPalViewComboBox" runat="server"/>
         </div>
     </fieldset>
 </div>
diff --git a/Website/DesktopModules/Hotcakes/ContentBlocks/Settings.ascx b/Website/DesktopModules/Hotcakes/ContentBlocks/Settings.ascx
index 2543cecd7..be9791790 100644
--- a/Website/DesktopModules/Hotcakes/ContentBlocks/Settings.ascx
+++ b/Website/DesktopModules/Hotcakes/ContentBlocks/Settings.ascx
@@ -11,7 +11,7 @@
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ViewSelectionLabel" controlname="ViewComboBox" suffix=":" runat="server" />
-            <asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px"/>
+            <asp:DropDownList ID="ViewComboBox" runat="server"/>
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ContentBlocksLabel" controlname="ContentBlocksValueLabel" suffix=":" runat="server" />
@@ -19,7 +19,7 @@
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ContentBlocksSelectionLabel" controlname="ContentBlocksComboBox" suffix=":" runat="server" />
-            <asp:DropDownList ID="ContentBlocksComboBox" runat="server" Width="250px" Height="150px"/>
+            <asp:DropDownList ID="ContentBlocksComboBox" runat="server"/>
         </div>
     </fieldset>
 </div>
diff --git a/Website/DesktopModules/Hotcakes/Core/Controls/App_LocalResources/ProductPicker.ascx.resx b/Website/DesktopModules/Hotcakes/Core/Controls/App_LocalResources/ProductPicker.ascx.resx
index 81d1dde35..ae4752f8e 100644
--- a/Website/DesktopModules/Hotcakes/Core/Controls/App_LocalResources/ProductPicker.ascx.resx
+++ b/Website/DesktopModules/Hotcakes/Core/Controls/App_LocalResources/ProductPicker.ascx.resx
@@ -132,4 +132,16 @@
   <data name="VendorLabel.Text" xml:space="preserve">
     <value>Vendor</value>
   </data>
+  <data name="Available.HeaderText" xml:space="preserve">
+    <value>Available for Sale</value>
+  </data>
+  <data name="Name.HeaderText" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="SitePrice.HeaderText" xml:space="preserve">
+    <value>Site Price</value>
+  </data>
+  <data name="SKU.HeaderText" xml:space="preserve">
+    <value>SKU</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Website/DesktopModules/Hotcakes/Core/Controls/ProductPicker.ascx b/Website/DesktopModules/Hotcakes/Core/Controls/ProductPicker.ascx
index ba687770e..101055635 100644
--- a/Website/DesktopModules/Hotcakes/Core/Controls/ProductPicker.ascx
+++ b/Website/DesktopModules/Hotcakes/Core/Controls/ProductPicker.ascx
@@ -15,25 +15,19 @@
 		<fieldset>
 			<div class="dnnFormItem">
 				<dnn:labelcontrol id="SearchLabel" controlname="FilterField" suffix=":" runat="server" />
-				<asp:TextBox ID="FilterField" runat="server" Width="160px"></asp:TextBox>
+				<asp:TextBox ID="FilterField" runat="server" />
             </div>
             <div class="dnnFormItem">
-                    <dnn:labelcontrol id="ManufacturerLabel" controlname="ManufacturerFilter" suffix=":" runat="server" />
-				<asp:DropDownList ID="ManufacturerFilter" runat="server" AutoPostBack="True"
-					OnSelectedIndexChanged="ManufacturerFilter_SelectedIndexChanged">
-				</asp:DropDownList>
+                <dnn:labelcontrol id="ManufacturerLabel" controlname="ManufacturerFilter" suffix=":" runat="server" />
+				<asp:DropDownList ID="ManufacturerFilter" runat="server" AutoPostBack="True" OnSelectedIndexChanged="ManufacturerFilter_SelectedIndexChanged"/>
             </div>
             <div class="dnnFormItem">
                 <dnn:labelcontrol id="VendorLabel" controlname="VendorFilter" suffix=":" runat="server" />
-				<asp:DropDownList ID="VendorFilter" runat="server" AutoPostBack="True"
-					OnSelectedIndexChanged="VendorFilter_SelectedIndexChanged">
-				</asp:DropDownList>
+				<asp:DropDownList ID="VendorFilter" runat="server" AutoPostBack="True" OnSelectedIndexChanged="VendorFilter_SelectedIndexChanged"/>
             </div>
             <div class="dnnFormItem">
                 <dnn:labelcontrol id="CategoryLabel" controlname="CategoryFilter" suffix=":" runat="server" />
-				<asp:DropDownList ID="CategoryFilter" runat="server" AutoPostBack="True"
-					OnSelectedIndexChanged="CategoryFilter_SelectedIndexChanged">
-				</asp:DropDownList>
+				<asp:DropDownList ID="CategoryFilter" runat="server" AutoPostBack="True" OnSelectedIndexChanged="CategoryFilter_SelectedIndexChanged"/>
             </div>
             <div class="dnnFormItem">
                 <dnn:labelcontrol controlname="btnSearch" runat="server" />
@@ -42,11 +36,13 @@
 		</fieldset>
 	</asp:Panel>
 	<div class="right" style="width: 50%">
-		<asp:GridView CellPadding="2" ID="rgProducts" runat="server" AllowPaging="True" PageSize="5" 
-            AutoGenerateColumns="False" Width="450px" AllowCustomPaging="True" GridLines="Horizontal" 
-            OnNeedDataSource="rgProducts_OnNeedDataSource" DataKeyField="Bvin">
+		<asp:GridView ID="rgProducts" runat="server" AllowPaging="True" PageSize="5" CssClass="dnnGrid" Width="100%" 
+            AutoGenerateColumns="False" AllowCustomPaging="True" GridLines="Horizontal" DataKeyNames="Bvin" OnPageIndexChanging="rgProducts_PageIndexChanging">
+            <HeaderStyle CssClass="dnnGridHeader"/>
+            <RowStyle CssClass="dnnGridRow"/>
+            <AlternatingRowStyle CssClass="dnnGridAltRow" />
             <Columns>
-				<asp:TemplateColumn UniqueName="MultiSelect">
+				<asp:TemplateField ItemStyle-Width="10%">
 					<HeaderTemplate>
 						<div class="chkSelectAll">
 							<asp:CheckBox ID="chkSelectAll" runat="server" />
@@ -57,15 +53,15 @@
 							<asp:CheckBox ID="chkSelected" runat="server" />
 						</div>
 					</ItemTemplate>
-				</asp:TemplateColumn>
-				<asp:BoundColumn DataField="sku" HeaderText="SKU" />
-				<asp:BoundColumn DataField="ProductName" HeaderText="Name" />
-				<asp:BoundColumn DataField="SitePrice" DataFormatString="{0:c}" HeaderText="Site Price" UniqueName="SitePrice" />
-				<asp:TemplateColumn HeaderText="Available for Sale" UniqueName="Inventory">
+				</asp:TemplateField>
+				<asp:BoundField DataField="Sku" HeaderText="SKU" />
+				<asp:BoundField DataField="ProductName" HeaderText="Name" />
+				<asp:BoundField DataField="SitePrice" DataFormatString="{0:c}" HeaderText="SitePrice" />
+				<asp:TemplateField HeaderText="Available">
 					<ItemTemplate>
-						<%# Convert.ToBoolean(Eval("IsAvailableForSale")) ? "Yes" : "No" %>
-					</ItemTemplate>
-				</asp:TemplateColumn>
+                        <asp:Label ID="lblAvailabile" runat="server" Text='<%#ParseProductAvailability(DataBinder.Eval(Container.DataItem, "IsAvailableForSale"))%>'/>
+                    </ItemTemplate>
+				</asp:TemplateField>
 			</Columns>
         </asp:GridView>
 	</div>
diff --git a/Website/DesktopModules/Hotcakes/Core/Controls/ProductPicker.ascx.cs b/Website/DesktopModules/Hotcakes/Core/Controls/ProductPicker.ascx.cs
index e02f2d989..668e20446 100644
--- a/Website/DesktopModules/Hotcakes/Core/Controls/ProductPicker.ascx.cs
+++ b/Website/DesktopModules/Hotcakes/Core/Controls/ProductPicker.ascx.cs
@@ -28,6 +28,7 @@
 using System.IO;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using DotNetNuke.Security;
 using DotNetNuke.Services.Localization;
 using Hotcakes.Commerce;
 using Hotcakes.Commerce.Catalog;
@@ -130,7 +131,7 @@ protected override void OnInit(EventArgs e)
             base.OnInit(e);
 
             if (!DisplayInventory)
-                GetGridViewColumnByName("Inventory").Visible = false;
+                GetGridViewColumnByName("Available").Visible = false;
             if (!DisplayPrice)
                 GetGridViewColumnByName("SitePrice").Visible = false;
         }
@@ -141,6 +142,7 @@ protected override void OnLoad(EventArgs e)
 
             if (!IsInitialized)
             {
+                LocalizeView();
                 PopulateCategories();
                 PopulateManufacturers();
                 PopulateVendors();
@@ -152,6 +154,11 @@ protected override void OnLoad(EventArgs e)
             }
         }
 
+        private void LocalizeView()
+        {
+            Localization.LocalizeGridView(ref rgProducts, LocalResourceFile);
+        }
+
         private void PopulateCategories()
         {
             var tree = CategoriesHelper.ListFullTreeWithIndents(HccApp.CatalogServices.Categories);
@@ -188,11 +195,12 @@ protected void btnSearch_Click(object sender, EventArgs e)
 
         private ProductSearchCriteria GetCurrentCriteria()
         {
+            var security = new PortalSecurity();
             var c = new ProductSearchCriteria();
 
             if (FilterField.Text.Trim().Length > 0)
             {
-                c.Keyword = FilterField.Text.Trim();
+                c.Keyword = security.InputFilter(FilterField.Text.Trim(), PortalSecurity.FilterFlag.NoMarkup);
             }
             if (!string.IsNullOrEmpty(ManufacturerFilter.SelectedValue))
             {
@@ -208,7 +216,7 @@ private ProductSearchCriteria GetCurrentCriteria()
             }
             if (ExcludeCategoryBvin.Trim().Length > 0)
             {
-                c.NotCategoryId = ExcludeCategoryBvin.Trim();
+                c.NotCategoryId = security.InputFilter(ExcludeCategoryBvin.Trim(), PortalSecurity.FilterFlag.NoMarkup);
             }
             c.DisplayInactiveProducts = true;
             return c;
@@ -220,6 +228,12 @@ public void RunSearch()
             BindGrid();
         }
 
+        protected void rgProducts_PageIndexChanging(object sender, GridViewPageEventArgs e)
+        {
+            rgProducts.PageIndex = e.NewPageIndex;
+            BindGrid();
+        }
+
         protected void ManufacturerFilter_SelectedIndexChanged(object sender, EventArgs e)
         {
             BindGrid();
@@ -243,6 +257,7 @@ protected void BindGrid()
                 rgProducts.PageSize,
                 ref totalCount);
             rgProducts.DataSource = items;
+            rgProducts.DataBind();
             rgProducts.VirtualItemCount = totalCount;
         }
 
@@ -258,5 +273,15 @@ private DataControlField GetGridViewColumnByName(string name)
 
             return null;
         }
+
+        protected string ParseProductAvailability(object value)
+        {
+            if (value != null)
+            {
+                return Convert.ToBoolean(value) ? "Yes" : "No";
+            }
+
+            return "No";
+        }
     }
 }
\ No newline at end of file
diff --git a/Website/DesktopModules/Hotcakes/FeaturedProducts/Settings.ascx b/Website/DesktopModules/Hotcakes/FeaturedProducts/Settings.ascx
index 958c86952..d0c4e62f0 100644
--- a/Website/DesktopModules/Hotcakes/FeaturedProducts/Settings.ascx
+++ b/Website/DesktopModules/Hotcakes/FeaturedProducts/Settings.ascx
@@ -11,7 +11,7 @@
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ViewSelectionLabel" controlname="ViewComboBox" suffix=":" runat="server" />
-            <asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px"/>
+            <asp:DropDownList ID="ViewComboBox" runat="server"/>
         </div>
     </fieldset>
 </div>
diff --git a/Website/DesktopModules/Hotcakes/Hotcakes.Modules.csproj b/Website/DesktopModules/Hotcakes/Hotcakes.Modules.csproj
index f30149f04..7faebd72e 100644
--- a/Website/DesktopModules/Hotcakes/Hotcakes.Modules.csproj
+++ b/Website/DesktopModules/Hotcakes/Hotcakes.Modules.csproj
@@ -386,6 +386,7 @@
     <Content Include="Core\Scripts\plupload\plupload.full.js" />
     <Content Include="Core\Scripts\plupload\plupload.silverlight.xap" />
     <Content Include="ExtensionUrlProvider\Settings.ascx" />
+    <Content Include="module.css" />
     <Content Include="ReleaseNotes.txt" />
     <Content Include="Core\Admin\Controls\DatePickerNavigation.ascx" />
     <Content Include="Core\Admin\Controls\Pager.ascx" />
diff --git a/Website/DesktopModules/Hotcakes/LastProductsViewed/Settings.ascx b/Website/DesktopModules/Hotcakes/LastProductsViewed/Settings.ascx
index 4cc49024a..28df518c0 100644
--- a/Website/DesktopModules/Hotcakes/LastProductsViewed/Settings.ascx
+++ b/Website/DesktopModules/Hotcakes/LastProductsViewed/Settings.ascx
@@ -11,7 +11,7 @@
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ViewSelectionLabel" controlname="ViewComboBox" suffix=":" runat="server" />
-            <asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px"/>
+            <asp:DropDownList ID="ViewComboBox" runat="server"/>
         </div>
     </fieldset>
 </div>
diff --git a/Website/DesktopModules/Hotcakes/MiniCart/Settings.ascx b/Website/DesktopModules/Hotcakes/MiniCart/Settings.ascx
index a90297648..4f9f54a86 100644
--- a/Website/DesktopModules/Hotcakes/MiniCart/Settings.ascx
+++ b/Website/DesktopModules/Hotcakes/MiniCart/Settings.ascx
@@ -11,7 +11,7 @@
 		</div>
 		<div class="dnnFormItem">
 			<dnn:LabelControl ID="ViewSelectionLabel" ControlName="ViewComboBox" Suffix=":" runat="server" />
-			<asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px"/>
+			<asp:DropDownList ID="ViewComboBox" runat="server"/>
 		</div>
 	</fieldset>
 </div>
diff --git a/Website/DesktopModules/Hotcakes/OrderHistory/Settings.ascx b/Website/DesktopModules/Hotcakes/OrderHistory/Settings.ascx
index 4928e4b68..ca5c7af12 100644
--- a/Website/DesktopModules/Hotcakes/OrderHistory/Settings.ascx
+++ b/Website/DesktopModules/Hotcakes/OrderHistory/Settings.ascx
@@ -11,7 +11,7 @@
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ViewSelectionLabel" controlname="ViewComboBox" suffix=":" runat="server" />
-            <asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px"/>
+            <asp:DropDownList ID="ViewComboBox" runat="server"/>
         </div>
     </fieldset>
 </div>
diff --git a/Website/DesktopModules/Hotcakes/ProductGrid/App_LocalResources/Settings.ascx.resx b/Website/DesktopModules/Hotcakes/ProductGrid/App_LocalResources/Settings.ascx.resx
index 9d75a0876..8d89cb8fe 100644
--- a/Website/DesktopModules/Hotcakes/ProductGrid/App_LocalResources/Settings.ascx.resx
+++ b/Website/DesktopModules/Hotcakes/ProductGrid/App_LocalResources/Settings.ascx.resx
@@ -120,15 +120,24 @@
   <data name="AddProducts.Text" xml:space="preserve">
     <value>Choose Products</value>
   </data>
+  <data name="btnAdd.Text" xml:space="preserve">
+    <value>Add Selected Products</value>
+  </data>
   <data name="GridColumnsLabel.Text" xml:space="preserve">
     <value>Number of Columns</value>
   </data>
   <data name="NoneSelectedText.Text" xml:space="preserve">
     <value>(None selected)</value>
   </data>
+  <data name="ProductImage.HeaderText" xml:space="preserve">
+    <value>Product Image</value>
+  </data>
   <data name="ProductImage.Text" xml:space="preserve">
     <value>Product Image</value>
   </data>
+  <data name="ProductName.HeaderText" xml:space="preserve">
+    <value>Product Name</value>
+  </data>
   <data name="ProductName.Text" xml:space="preserve">
     <value>Product Name</value>
   </data>
@@ -150,4 +159,16 @@
   <data name="ViewSettings.Text" xml:space="preserve">
     <value>View Settings</value>
   </data>
+  <data name="btnDel.Text" xml:space="preserve">
+    <value>Remove</value>
+  </data>
+  <data name="btnDown.Text" xml:space="preserve">
+    <value>Down</value>
+  </data>
+  <data name="btnUp.Text" xml:space="preserve">
+    <value>Up</value>
+  </data>
+  <data name="valGridColumns.ErrorMessage" xml:space="preserve">
+    <value>Please enter a numeric value</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Website/DesktopModules/Hotcakes/ProductGrid/Settings.ascx b/Website/DesktopModules/Hotcakes/ProductGrid/Settings.ascx
index 7851af71d..e55800240 100644
--- a/Website/DesktopModules/Hotcakes/ProductGrid/Settings.ascx
+++ b/Website/DesktopModules/Hotcakes/ProductGrid/Settings.ascx
@@ -1,5 +1,5 @@
 <%@ Control Language="C#" AutoEventWireup="True" Inherits="Hotcakes.Modules.ProductGrid.Settings" CodeBehind="Settings.ascx.cs" %>
-<%@ Register Src="../Core/Controls/ProductPicker.ascx" TagName="ProductPicker" TagPrefix="uc" %>
+<%@ Register Src="../Core/Controls/ProductPicker.ascx" TagName="ProductPicker" TagPrefix="hcc" %>
 <%@ Register Src="../../../controls/labelcontrol.ascx" TagName="labelcontrol" TagPrefix="dnn" %>
 <%@ Import Namespace="DotNetNuke.Services.Localization" %>
 
@@ -15,62 +15,57 @@
         </div>
 		<div class="dnnFormItem">
 			<dnn:LabelControl ID="ViewSelectionLabel" ControlName="ViewComboBox" Suffix=":" runat="server" />
-			<asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px"/>
+			<asp:DropDownList ID="ViewComboBox" runat="server"/>
 		</div>
     </fieldset>
     <h2 id="hcProductPicker" class="dnnFormSectionHead"><a href="" class="dnnLabelExpanded"><%=LocalizeString("AddProducts")%></a></h2>
     <fieldset>
         <div class="dnnFormItem">
-            <uc:productpicker id="ProductPicker" runat="server" />
-            <asp:LinkButton CssClass="dnnPrimaryAction" runat="server" ID="btnAdd" Text="Add Selected Products" />
+            <hcc:ProductPicker ID="ProductPicker" runat="server" DisplayInventory="False"/>
+            <asp:LinkButton CssClass="dnnPrimaryAction" runat="server" ID="btnAdd" resourcekey="btnAdd" />
             <asp:HiddenField ID="EditBvinField" runat="server" />
         </div>
     </fieldset>
     <h2 id="hcProductsDisplay" class="dnnFormSectionHead"><a href="" class=""><%=LocalizeString("ProductsDisplay")%></a></h2>
     <fieldset>
         <div class="dnnFormItem">
-            <asp:GridView ID="rgProducts" CssClass="dnnGrid"
-                OnDeleteCommand="rgProducts_OnDeleteCommand"
-                OnItemCommand="rgProducts_OnItemCommand" runat="server"
-                AutoGenerateColumns="False"
-                GridLines="None" DataKeyField="Key">
+            <asp:GridView ID="rgProducts" CssClass="dnnGrid" OnRowDeleting="rgProducts_OnDeleteCommand" OnRowCommand="rgProducts_OnItemCommand" 
+                runat="server" AutoGenerateColumns="false" DataKeyNames="Key">
+                <HeaderStyle CssClass="dnnGridHeader" />
+                <RowStyle CssClass="dnnGridRow" />
+                <AlternatingRowStyle CssClass="dnnGridAltRow" />
                 <Columns>
-                    <asp:TemplateColumn HeaderText="Product Image">
-                        <ItemStyle Width="15%"/>
+                    <asp:TemplateField HeaderText="ProductImage">
+                        <ItemStyle Width="15%" />
                         <ItemTemplate>
-                            <img style="width: 50px;" src="<%#Eval("Value.ImageUrl") %>" />
+                            <asp:Image ImageUrl='<%#Eval("Value.ImageUrl") %>' runat="server" />
                         </ItemTemplate>
-                    </asp:TemplateColumn>
-                    <asp:BoundColumn DataField="Value.Item.ProductName" HeaderText="Product Name">
-                        <ItemStyle Width="55%"/>
-                    </asp:BoundColumn>
-                    <asp:TemplateColumn>
+                    </asp:TemplateField>
+                    <asp:BoundField DataField="Value.Item.ProductName" HeaderText="ProductName" ItemStyle-Width="55%" />
+                    <asp:TemplateField>
                         <ItemTemplate>
-                            <asp:LinkButton ID="btnUp" runat="server" CommandName="Up" Text="Up" />
+                            <asp:LinkButton ID="btnUp" resourcekey="btnUp" runat="server" CommandName="Up" CommandArgument='<%#Eval("Key") %>' />
                         </ItemTemplate>
-                        <ItemStyle HorizontalAlign="Center" Width="30px" />
-                    </asp:TemplateColumn>
-                    <asp:TemplateColumn>
+                    </asp:TemplateField>
+                    <asp:TemplateField>
                         <ItemTemplate>
-                            <asp:LinkButton ID="btnDown" runat="server" CommandName="Down" Text="Down" />
+                            <asp:LinkButton ID="btnDown" resourcekey="btnDown" runat="server" CommandName="Down" CommandArgument='<%#Eval("Key") %>' />
                         </ItemTemplate>
-                        <ItemStyle HorizontalAlign="Center" Width="30px" />
-                    </asp:TemplateColumn>
-                    <asp:TemplateColumn>
+                    </asp:TemplateField>
+                    <asp:TemplateField>
                         <ItemTemplate>
-                            <asp:LinkButton ID="btnDel" runat="server" CommandName="Delete" Text="Remove" />
+                            <asp:LinkButton ID="btnDel" resourcekey="btnDel" runat="server" CommandName="Delete" />
                         </ItemTemplate>
-                        <ItemStyle HorizontalAlign="Center" Width="30px" />
-                    </asp:TemplateColumn>
+                    </asp:TemplateField>
                 </Columns>
             </asp:GridView>
             <br />
         </div>
         <div class="dnnFormItem">
-            <dnn:labelcontrol id="GridColumnsLabel" controlname="GridColumns" suffix=":" runat="server" />
-            <asp:TextBox ID="GridColumnsField" runat="server" Columns="5" Width="50px"></asp:TextBox>
-            <asp:RegularExpressionValidator ControlToValidate="GridColumnsField" runat="server" ID="valGridColumns" ForeColor=" " CssClass="errormessage"
-                ValidationExpression="[1-9]" Display="dynamic" ErrorMessage="Please Enter a Numeric Value"></asp:RegularExpressionValidator>
+            <dnn:labelcontrol id="GridColumnsLabel" resourcekey="GridColumnsLabel" controlname="GridColumns" suffix=":" runat="server" />
+            <asp:TextBox ID="GridColumnsField" runat="server"/>
+            <asp:RegularExpressionValidator ControlToValidate="GridColumnsField" resourcekey="valGridColumns" runat="server" ID="valGridColumns" CssClass="dnnFormMessage dnnFormError"
+                ValidationExpression="[1-9]" Display="Dynamic" />
         </div>
     </fieldset>
 </div>
diff --git a/Website/DesktopModules/Hotcakes/ProductGrid/Settings.ascx.cs b/Website/DesktopModules/Hotcakes/ProductGrid/Settings.ascx.cs
index 5277a833b..ecda912d7 100644
--- a/Website/DesktopModules/Hotcakes/ProductGrid/Settings.ascx.cs
+++ b/Website/DesktopModules/Hotcakes/ProductGrid/Settings.ascx.cs
@@ -29,6 +29,7 @@
 using System.Linq;
 using System.Web.UI.WebControls;
 using DotNetNuke.Entities.Modules;
+using DotNetNuke.Services.Localization;
 using Hotcakes.Commerce.Catalog;
 using Hotcakes.Commerce.Dnn.Utils;
 using Hotcakes.Commerce.Dnn.Web;
@@ -43,6 +44,8 @@ protected override void OnInit(EventArgs e)
         {
             base.OnInit(e);
             btnAdd.Click += btnAdd_Click;
+            rgProducts.RowDeleting += rgProducts_OnDeleteCommand;
+            rgProducts.RowCommand += rgProducts_OnItemCommand;
         }
 
         public override void LoadSettings()
@@ -73,8 +76,9 @@ protected override void OnLoad(EventArgs e)
             base.OnLoad(e);
             if (!Page.IsPostBack)
             {
-                var sortedProducts = GetSelectedProducts();
+                LocalizeView();
 
+                var sortedProducts = GetSelectedProducts();
                 LoadItems(sortedProducts);
 
                 int gridColumns;
@@ -91,6 +95,13 @@ protected override void OnLoad(EventArgs e)
             }
         }
 
+        private void LocalizeView()
+        {
+            Localization.LocalizeGridView(ref rgProducts, LocalResourceFile);
+
+            valGridColumns.ErrorMessage = LocalizeString("valGridColumns.ErrorMessage");
+        }
+
         private void LoadItems(SortedList<int, Product> list)
         {
             if (list != null)
@@ -109,7 +120,6 @@ private void LoadItems(SortedList<int, Product> list)
             }
         }
 
-
         private void SaveItems(SortedList<int, Product> sortedProducts)
         {
             var items = sortedProducts.ToDictionary(item => item.Key, item => item.Value.Bvin);
@@ -174,22 +184,21 @@ protected void btnAdd_Click(object sender, EventArgs e)
             LoadItems(sortedProducts);
         }
 
-        protected void rgProducts_OnDeleteCommand(object sender, DataGridCommandEventArgs e)
+        protected void rgProducts_OnDeleteCommand(object sender, GridViewDeleteEventArgs e)
         {
             var bvinsList = GetProductBvins();
-            var key = int.Parse(rgProducts.DataKeys[e.Item.ItemIndex].ToString(), NumberStyles.Integer);
+            var key = int.Parse(rgProducts.DataKeys[e.RowIndex].ToString(), NumberStyles.Integer);
             bvinsList.Remove(key);
             SaveItems(bvinsList);
             LoadItems(GetProducts(bvinsList));
         }
 
-
-        protected void rgProducts_OnItemCommand(object sender, DataGridCommandEventArgs e)
+        protected void rgProducts_OnItemCommand(object sender, GridViewCommandEventArgs e)
         {
             if (e.CommandName.Equals("Up") || e.CommandName.Equals("Down"))
             {
                 var bvinsList = GetProductBvins();
-                var key = int.Parse(rgProducts.DataKeys[e.Item.ItemIndex].ToString(), NumberStyles.Integer);
+                var key = int.Parse(e.CommandArgument.ToString(), NumberStyles.Integer);
 
                 int key2;
                 if (e.CommandName.Equals("Up"))
diff --git a/Website/DesktopModules/Hotcakes/ProductReviews/Settings.ascx b/Website/DesktopModules/Hotcakes/ProductReviews/Settings.ascx
index 8cd4cc85f..7dd27f325 100644
--- a/Website/DesktopModules/Hotcakes/ProductReviews/Settings.ascx
+++ b/Website/DesktopModules/Hotcakes/ProductReviews/Settings.ascx
@@ -11,7 +11,7 @@
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ViewSelectionLabel" controlname="ViewComboBox" suffix=":" runat="server" />
-            <asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px"/>
+            <asp:DropDownList ID="ViewComboBox" runat="server"/>
         </div>
     </fieldset>
 </div>
diff --git a/Website/DesktopModules/Hotcakes/ProductViewer/Settings.ascx b/Website/DesktopModules/Hotcakes/ProductViewer/Settings.ascx
index e2690f4f8..fad97f2be 100644
--- a/Website/DesktopModules/Hotcakes/ProductViewer/Settings.ascx
+++ b/Website/DesktopModules/Hotcakes/ProductViewer/Settings.ascx
@@ -8,7 +8,7 @@
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ProductSelectionLabel" controlname="ProductComboBox" suffix=":" runat="server" />
-            <asp:DropDownList ID="ProductComboBox" runat="server" Width="250px" Height="150px" />
+            <asp:DropDownList ID="ProductComboBox" runat="server"/>
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ViewLabel" controlname="ViewContentLabel" suffix=":" runat="server" />
@@ -16,7 +16,7 @@
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ViewSelectionLabel" controlname="ViewComboBox" suffix=":" runat="server" />
-            <asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px" />
+            <asp:DropDownList ID="ViewComboBox" runat="server"/>
         </div>
     </div>
 </fieldset>
diff --git a/Website/DesktopModules/Hotcakes/Search/Settings.ascx b/Website/DesktopModules/Hotcakes/Search/Settings.ascx
index 1c96f7cf2..e15dff4c3 100644
--- a/Website/DesktopModules/Hotcakes/Search/Settings.ascx
+++ b/Website/DesktopModules/Hotcakes/Search/Settings.ascx
@@ -11,7 +11,7 @@
 		</div>
 		<div class="dnnFormItem">
 			<dnn:LabelControl ID="ViewSelectionLabel" ControlName="ViewComboBox" Suffix=":" runat="server" />
-            <asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px"/>
+            <asp:DropDownList ID="ViewComboBox" runat="server"/>
 		</div>
 		<div class="dnnFormItem">
 			<dnn:LabelControl ID="PageSizeLabel" ControlName="ProductPageSizeTextBox" Suffix=":" runat="server" />
diff --git a/Website/DesktopModules/Hotcakes/SearchInput/Settings.ascx b/Website/DesktopModules/Hotcakes/SearchInput/Settings.ascx
index 622a0fcfc..b1f543248 100644
--- a/Website/DesktopModules/Hotcakes/SearchInput/Settings.ascx
+++ b/Website/DesktopModules/Hotcakes/SearchInput/Settings.ascx
@@ -11,7 +11,7 @@
 		</div>
 		<div class="dnnFormItem">
 			<dnn:LabelControl ID="ViewSelectionLabel" ControlName="ViewComboBox" Suffix=":" runat="server" />
-			<asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px"/>
+			<asp:DropDownList ID="ViewComboBox" runat="server"/>
 		</div>
 
 	</fieldset>
diff --git a/Website/DesktopModules/Hotcakes/Top10Products/Settings.ascx b/Website/DesktopModules/Hotcakes/Top10Products/Settings.ascx
index 80f8cf384..face26cc7 100644
--- a/Website/DesktopModules/Hotcakes/Top10Products/Settings.ascx
+++ b/Website/DesktopModules/Hotcakes/Top10Products/Settings.ascx
@@ -11,7 +11,7 @@
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ViewSelectionLabel" controlname="ViewComboBox" suffix=":" runat="server" />
-            <asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px" />
+            <asp:DropDownList ID="ViewComboBox" runat="server"/>
         </div>
     </fieldset>
 </div>
diff --git a/Website/DesktopModules/Hotcakes/TopWeeklySellers/Settings.ascx b/Website/DesktopModules/Hotcakes/TopWeeklySellers/Settings.ascx
index dde2ec89a..df642c069 100644
--- a/Website/DesktopModules/Hotcakes/TopWeeklySellers/Settings.ascx
+++ b/Website/DesktopModules/Hotcakes/TopWeeklySellers/Settings.ascx
@@ -11,7 +11,7 @@
         </div>
         <div class="dnnFormItem">
             <dnn:labelcontrol id="ViewSelectionLabel" controlname="ViewComboBox" suffix=":" runat="server" />
-            <asp:DropDownList ID="ViewComboBox" runat="server" Width="250px" Height="150px" />
+            <asp:DropDownList ID="ViewComboBox" runat="server"/>
         </div>
     </fieldset>
 </div>
diff --git a/Website/DesktopModules/Hotcakes/module.css b/Website/DesktopModules/Hotcakes/module.css
new file mode 100644
index 000000000..7f4dfec5b
--- /dev/null
+++ b/Website/DesktopModules/Hotcakes/module.css
@@ -0,0 +1,3 @@
+.hcListBox {
+    min-width: 158px;
+}
\ No newline at end of file