diff --git a/.gitignore b/.gitignore
index a03e7c3..fb819e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -249,3 +249,4 @@ Installation/OpenStore_4.1.4_Upgrade.zip
 Installation/OpenStore_4.1.4_Upgate.zip
 Installation/OpenStore_4.1.4_Upgrade-OLD.zip
 dnnpack.config
+*.zip
diff --git a/App_LocalResources/Notification.ascx.nl-NL.resx b/App_LocalResources/Notification.ascx.nl-NL.resx
index b9e64d2..3d8e4b8 100644
--- a/App_LocalResources/Notification.ascx.nl-NL.resx
+++ b/App_LocalResources/Notification.ascx.nl-NL.resx
@@ -145,7 +145,7 @@
     <value>De bestelling is geannuleerd, of de betaling is mislukt. Controleer uw bankgegevens of neem contact op met ons op als u denkt dat het probleem bij ons zit.</value>
   </data>
 	<data name="checkoutsuccessmessage.Text" xml:space="preserve">
-    <value>Dank voor uw bestelling. U ontvangt per e-mail een bevestiging met alle informatie. Controleer uw ongewenste e-mail als u na 30 minuten nog niets ontvangen heeft. Indien u contact met ons opneemt vernemen wij graag uw ordernummer.</value>
+    <value>Dank voor uw bestelling. U ontvangt per e-mail een bevestiging met alle informatie. Controleer uw ongewenste e-mail als u na 30 minuten nog niets ontvangen heeft. Indien u contact met ons opneemt vernemen wij graag uw bestelnummer.</value>
   </data>
 	<data name="Collection.Text" xml:space="preserve">
     <value>Details van de bestelling</value>
diff --git a/App_LocalResources/OrderAdmin.ascx.nl-NL.resx b/App_LocalResources/OrderAdmin.ascx.nl-NL.resx
index 85dd8c9..37a9319 100644
--- a/App_LocalResources/OrderAdmin.ascx.nl-NL.resx
+++ b/App_LocalResources/OrderAdmin.ascx.nl-NL.resx
@@ -100,7 +100,7 @@
 		<value xml:space="preserve">Kwitantie</value>
 	</data>
 	<data name="PaymentMethod.Text">
-		<value xml:space="preserve">Betalingsmethode: </value>
+		<value xml:space="preserve">Betaalmethode: </value>
 	</data>
 	<data name="PaymentStatus.Text" lastModified="2014-11-29 13:56:22">
 		<value xml:space="preserve">Status betaling</value>
diff --git a/App_LocalResources/ProductView.ascx.nl-NL.resx b/App_LocalResources/ProductView.ascx.nl-NL.resx
index f3e327d..e063b47 100644
--- a/App_LocalResources/ProductView.ascx.nl-NL.resx
+++ b/App_LocalResources/ProductView.ascx.nl-NL.resx
@@ -333,4 +333,10 @@
   &lt;i class="fa fa-star fa-stack-1x fa-inverse"&gt;&lt;/i&gt;
 &lt;/span&gt;</value>
   </data>
+  <data name="article.Text" xml:space="preserve">
+    <value>artikel</value>
+  </data>
+  <data name="articles.Text" xml:space="preserve">
+    <value>artikelen</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/App_LocalResources/plugins.ascx.nl-NL.resx b/App_LocalResources/plugins.ascx.nl-NL.resx
index e767767..3c2b20e 100644
--- a/App_LocalResources/plugins.ascx.nl-NL.resx
+++ b/App_LocalResources/plugins.ascx.nl-NL.resx
@@ -127,7 +127,7 @@
     <value>&lt;i class="fa fa-bar-chart-o fa-fw"&gt;&lt;/i&gt;</value>
   </data>
   <data name="assembly.Text" xml:space="preserve">
-    <value>Vergadering</value>
+    <value>Assembly</value>
   </data>
   <data name="bomenuattributes.Text" xml:space="preserve">
     <value>class="nav main-menu"</value>
diff --git a/App_LocalResources/settings.ascx.nl-NL.resx b/App_LocalResources/settings.ascx.nl-NL.resx
index 0fbfe03..3126104 100644
--- a/App_LocalResources/settings.ascx.nl-NL.resx
+++ b/App_LocalResources/settings.ascx.nl-NL.resx
@@ -145,7 +145,7 @@
     <value>Fiscale codeveld</value>
   </data>
   <data name="copyorderto.Text" xml:space="preserve">
-    <value>Kopiëren van bestelling naar E-mail</value>
+    <value>Kopie van bestelling naar e-mail</value>
   </data>
   <data name="currencysymbol.Text" xml:space="preserve">
     <value>Valutasymbool</value>
diff --git a/Components/NBrightBuyUtils.cs b/Components/NBrightBuyUtils.cs
index 94332ff..ab85a19 100644
--- a/Components/NBrightBuyUtils.cs
+++ b/Components/NBrightBuyUtils.cs
@@ -1549,6 +1549,7 @@ public static string RazorTemplRenderList(string razorTemplName, int moduleid, s
             return RazorTemplRenderList(razorTemplName, moduleid, cacheKey, objList, templateControlPath, theme, lang, settings, null);
         }
 
+        private static string lockobjectRazorTemplRenderList = "lockitRazorTemplRenderList";
         public static string RazorTemplRenderList(string razorTemplName, int moduleid, string cacheKey, List<NBrightInfo> objList, string templateControlPath, string theme, string lang, Dictionary<string, string> settings, NBrightInfo headerData)
         {
             // do razor template
@@ -1560,26 +1561,30 @@ public static string RazorTemplRenderList(string razorTemplName, int moduleid, s
             var razorTempl = (string)GetModCache(ckey);
             if (razorTempl == null || StoreSettings.Current.DebugMode)
             {
-                razorTempl = GetRazorTemplateData(razorTemplName, templateControlPath, theme, lang);
-                if (razorTempl != "")
+                lock (lockobjectRazorTemplRenderList)
                 {
-                    var nbRazor = new NBrightRazor(objList.Cast<object>().ToList(), settings, HttpContext.Current.Request.QueryString);
-                    nbRazor.ModuleId = moduleid;
-                    nbRazor.FullTemplateName = theme + "." + razorTemplName;
-                    nbRazor.TemplateName = razorTemplName;
-                    nbRazor.ThemeFolder = theme;
-                    nbRazor.Lang = lang;
-
-                    nbRazor.HeaderData = headerData;
-
-                    var razorTemplateKey = "NBrightBuyRazorKey" + theme + razorTemplName + PortalSettings.Current.PortalId.ToString();
-                    razorTempl = RazorRender(nbRazor, razorTempl, razorTemplateKey, StoreSettings.Current.DebugMode);
-                    if (cacheKey != "") SetModCache(moduleid, ckey, razorTempl); // only save to cache if we pass in a cache key.
+                    razorTempl = GetRazorTemplateData(razorTemplName, templateControlPath, theme, lang);
+                    if (razorTempl != "")
+                    {
+                        var nbRazor = new NBrightRazor(objList.Cast<object>().ToList(), settings, HttpContext.Current.Request.QueryString);
+                        nbRazor.ModuleId = moduleid;
+                        nbRazor.FullTemplateName = theme + "." + razorTemplName;
+                        nbRazor.TemplateName = razorTemplName;
+                        nbRazor.ThemeFolder = theme;
+                        nbRazor.Lang = lang;
+
+                        nbRazor.HeaderData = headerData;
+
+                        var razorTemplateKey = "NBrightBuyRazorKey" + theme + razorTemplName + PortalSettings.Current.PortalId.ToString();
+                        razorTempl = RazorRender(nbRazor, razorTempl, razorTemplateKey, StoreSettings.Current.DebugMode);
+                        if (cacheKey != "") SetModCache(moduleid, ckey, razorTempl); // only save to cache if we pass in a cache key.
+                    }
                 }
             }
             return razorTempl;
         }
 
+        private static string lockobjectRenderGroupCategoryList = "lockitRenderGroupCategoryList";
         public static string RazorTemplRenderGroupCategoryList(string razorTemplName, int moduleid, string cacheKey, List<GroupCategoryData> objList, string templateControlPath, string theme, string lang, Dictionary<string, string> settings)
         {
             // do razor template
@@ -1587,24 +1592,28 @@ public static string RazorTemplRenderGroupCategoryList(string razorTemplName, in
             var razorTempl = (string)GetModCache(cachekey);
             if (razorTempl == null || StoreSettings.Current.DebugMode)
             {
-                razorTempl = GetRazorTemplateData(razorTemplName, templateControlPath, theme, lang);
-                if (razorTempl != "")
+                lock (lockobjectRenderGroupCategoryList)
                 {
-                    var nbRazor = new NBrightRazor(objList.Cast<object>().ToList(), settings, HttpContext.Current.Request.QueryString);
-                    nbRazor.ModuleId = moduleid;
-                    nbRazor.FullTemplateName = theme + "." + razorTemplName;
-                    nbRazor.TemplateName = razorTemplName;
-                    nbRazor.ThemeFolder = theme;
-                    nbRazor.Lang = lang;
-
-                    var razorTemplateKey = "NBrightBuyRazorKey" + theme + razorTemplName + PortalSettings.Current.PortalId.ToString();
-                    razorTempl = RazorRender(nbRazor, razorTempl, razorTemplateKey, StoreSettings.Current.DebugMode);
-                    if (cacheKey != "") SetModCache(moduleid, cachekey, razorTempl); // only save to cache if we pass in a cache key.
+                    razorTempl = GetRazorTemplateData(razorTemplName, templateControlPath, theme, lang);
+                    if (razorTempl != "")
+                    {
+                        var nbRazor = new NBrightRazor(objList.Cast<object>().ToList(), settings, HttpContext.Current.Request.QueryString);
+                        nbRazor.ModuleId = moduleid;
+                        nbRazor.FullTemplateName = theme + "." + razorTemplName;
+                        nbRazor.TemplateName = razorTemplName;
+                        nbRazor.ThemeFolder = theme;
+                        nbRazor.Lang = lang;
+
+                        var razorTemplateKey = "NBrightBuyRazorKey" + theme + razorTemplName + PortalSettings.Current.PortalId.ToString();
+                        razorTempl = RazorRender(nbRazor, razorTempl, razorTemplateKey, StoreSettings.Current.DebugMode);
+                        if (cacheKey != "") SetModCache(moduleid, cachekey, razorTempl); // only save to cache if we pass in a cache key.
+                    }
                 }
             }
             return razorTempl;
         }
 
+        private static string lockobjectRazorPreProcessTempl = "lockitRazorPreProcessTempl";
         public static Dictionary<string, string> RazorPreProcessTempl(string razorTemplName, string templateControlPath, string theme, string lang, Dictionary<string, string> settings, string moduleid = "")
         {
             // match the "AddPreProcessMetaData()" cachekey.
@@ -1618,37 +1627,40 @@ public static Dictionary<string, string> RazorPreProcessTempl(string razorTemplN
                 if (cachedlist != null) return cachedlist;
             }
 
-            // build cache data from template.
-            var razorTemplate = GetRazorTemplateData(razorTemplName, templateControlPath, theme, lang);
-            if (razorTemplate != "" && razorTemplate.Contains("AddPreProcessMetaData"))
-            {
-                var obj = new NBrightInfo(true);
-                obj.Lang = lang;
-                obj.ModuleId = -1;
-                var l = new List<object>();
-                l.Add(obj);
-                var modRazor = new NBrightRazor(l, settings, HttpContext.Current.Request.QueryString);
-                modRazor.FullTemplateName = theme + "." + razorTemplName;
-                modRazor.TemplateName = razorTemplName;
-                modRazor.ThemeFolder = theme;
-                modRazor.Lang = lang;
-                try
+            lock (lockobjectRazorPreProcessTempl)
+            {
+                // build cache data from template.
+                var razorTemplate = GetRazorTemplateData(razorTemplName, templateControlPath, theme, lang);
+                if (razorTemplate != "" && razorTemplate.Contains("AddPreProcessMetaData"))
                 {
-                    // do razor and cache preprocessmetadata
-                    razorTemplate = RazorRender(modRazor, razorTemplate, cachekey, false);
+                    var obj = new NBrightInfo(true);
+                    obj.Lang = lang;
+                    obj.ModuleId = -1;
+                    var l = new List<object>();
+                    l.Add(obj);
+                    var modRazor = new NBrightRazor(l, settings, HttpContext.Current.Request.QueryString);
+                    modRazor.FullTemplateName = theme + "." + razorTemplName;
+                    modRazor.TemplateName = razorTemplName;
+                    modRazor.ThemeFolder = theme;
+                    modRazor.Lang = lang;
+                    try
+                    {
+                        // do razor and cache preprocessmetadata
+                        razorTemplate = RazorRender(modRazor, razorTemplate, cachekey, false);
+                    }
+                    catch (Exception ex)
+                    {
+                        // Only log exception, could be a error because of missing data.  The preprocessing doesn't care.
+                    }
+                    cachedlist = (Dictionary<string, string>)Utils.GetCache(cachekey);
+                    if (cachedlist == null) cachedlist = new Dictionary<string, string>();
+                    Utils.SetCache(cachekey, cachedlist);
                 }
-                catch (Exception ex)
+                else
                 {
-                    // Only log exception, could be a error because of missing data.  The preprocessing doesn't care.
+                    cachedlist = new Dictionary<string, string>();
+                    Utils.SetCache(cachekey, cachedlist);
                 }
-                cachedlist = (Dictionary<string, string>) Utils.GetCache(cachekey);
-                if (cachedlist == null) cachedlist = new Dictionary<string, string>();
-                Utils.SetCache(cachekey, cachedlist);
-            }
-            else
-            {
-                cachedlist = new Dictionary<string, string>();
-                Utils.SetCache(cachekey, cachedlist);
             }
             return cachedlist;
         }
diff --git a/DNNpackager.dnnpack b/DNNpackager.dnnpack
index f17a49a..c479010 100644
--- a/DNNpackager.dnnpack
+++ b/DNNpackager.dnnpack
@@ -3,7 +3,7 @@
   <websitedestrelpath>\DesktopModules\NBright\NBrightBuy</websitedestrelpath>
   <websitedestbinrelpath>\bin</websitedestbinrelpath>
   <!-- Include only files that match the regular expression -->
-  <regexpr>(\.cshtml|\.html|\.resx|\.dnn|\.png|\.css|\.js|\.xml|\.txt|\.md|\.aspx|\.ascx|\.ashx)$</regexpr>
+  <regexpr>(\.cshtml|\.html|\.resx|OpenStore\.dnn|\.png|\.gif|\.jpg|\.jpeg|\.css|\.js|\.xml|\.txt|\.md|\.aspx|\.ascx|\.ashx)$</regexpr>
   <directory include='false'>
 		<!-- All paths should be from the source root (project root) -->
     <value>\.git</value>
diff --git a/NBrightBuy.csproj b/NBrightBuy.csproj
index 5aadbdc..a847467 100644
--- a/NBrightBuy.csproj
+++ b/NBrightBuy.csproj
@@ -102,106 +102,131 @@
     </Compile>
     <Compile Include="Admin\PropertiesValue.ascx.cs">
       <DependentUpon>PropertiesValue.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Admin\PropertiesValue.ascx.designer.cs">
       <DependentUpon>PropertiesValue.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="Admin\Categories.ascx.cs">
       <DependentUpon>Categories.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Admin\Categories.ascx.designer.cs">
       <DependentUpon>Categories.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="Admin\Clients.ascx.cs">
       <DependentUpon>Clients.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Admin\Clients.ascx.designer.cs">
       <DependentUpon>Clients.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="Admin\BackOffice.ascx.cs">
       <DependentUpon>BackOffice.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Admin\BackOffice.ascx.designer.cs">
       <DependentUpon>BackOffice.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="Admin\Tools.ascx.cs">
       <DependentUpon>Tools.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Admin\Tools.ascx.designer.cs">
       <DependentUpon>Tools.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="Admin\Import.ascx.cs">
       <DependentUpon>Import.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Admin\Import.ascx.designer.cs">
       <DependentUpon>Import.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="Admin\Export.ascx.cs">
       <DependentUpon>Export.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Admin\Export.ascx.designer.cs">
       <DependentUpon>Export.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="Admin\EditLanguage.ascx.cs">
       <DependentUpon>EditLanguage.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Admin\EditLanguage.ascx.designer.cs">
       <DependentUpon>EditLanguage.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="Admin\Products.ascx.cs">
       <DependentUpon>Products.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Admin\Products.ascx.designer.cs">
       <DependentUpon>Products.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="Admin\PropertyGroups.ascx.cs">
       <DependentUpon>PropertyGroups.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Admin\PropertyGroups.ascx.designer.cs">
       <DependentUpon>PropertyGroups.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="Admin\Settings.ascx.cs">
       <DependentUpon>Settings.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Admin\Settings.ascx.designer.cs">
       <DependentUpon>Settings.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="Admin\DashSummary.ascx.cs">
       <DependentUpon>DashSummary.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Admin\DashSummary.ascx.designer.cs">
       <DependentUpon>DashSummary.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="Admin\Plugins.ascx.cs">
       <DependentUpon>Plugins.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Admin\Plugins.ascx.designer.cs">
       <DependentUpon>Plugins.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="Admin\Menu.ascx.cs">
       <DependentUpon>Menu.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Admin\Menu.ascx.designer.cs">
       <DependentUpon>Menu.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="Admin\Orders.ascx.cs">
       <DependentUpon>Orders.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Admin\Orders.ascx.designer.cs">
       <DependentUpon>Orders.ascx.cs</DependentUpon>
     </Compile>
-    <Compile Include="Base\NBrightBuyFrontOfficeBase.cs" />
-    <Compile Include="Base\NBrightBuyAdminBase.cs" />
-    <Compile Include="Base\NBrightBuyBase.cs" />
-    <Compile Include="Base\NBrightBuySettingBase.cs" />
+    <Compile Include="Base\NBrightBuyFrontOfficeBase.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Base\NBrightBuyAdminBase.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Base\NBrightBuyBase.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Base\NBrightBuySettingBase.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="CartRazorView.ascx.cs">
       <DependentUpon>CartRazorView.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="CartRazorView.ascx.designer.cs">
       <DependentUpon>CartRazorView.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="CartRazorViewSettings.ascx.cs">
       <DependentUpon>CartRazorViewSettings.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="CartRazorViewSettings.ascx.designer.cs">
       <DependentUpon>CartRazorViewSettings.ascx.cs</DependentUpon>
@@ -210,12 +235,14 @@
     <Compile Include="Components\ItemLists\ListCount.cs" />
     <Compile Include="ProductListAjaxFilter.ascx.cs">
       <DependentUpon>ProductListAjaxFilter.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ProductListAjaxFilter.ascx.designer.cs">
       <DependentUpon>ProductListAjaxFilter.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="ProductListAjaxFilterSettings.ascx.cs">
       <DependentUpon>ProductListAjaxFilterSettings.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ProductListAjaxFilterSettings.ascx.designer.cs">
       <DependentUpon>ProductListAjaxFilterSettings.ascx.cs</DependentUpon>
@@ -240,36 +267,42 @@
     <Compile Include="Components\Product\ProductUtils.cs" />
     <Compile Include="ItemListRazor.ascx.cs">
       <DependentUpon>ItemListRazor.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ItemListRazor.ascx.designer.cs">
       <DependentUpon>ItemListRazor.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="ItemListRazorSettings.ascx.cs">
       <DependentUpon>ItemListRazorSettings.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ItemListRazorSettings.ascx.designer.cs">
       <DependentUpon>ItemListRazorSettings.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="ProductRazorSearch.ascx.cs">
       <DependentUpon>ProductRazorSearch.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ProductRazorSearch.ascx.designer.cs">
       <DependentUpon>ProductRazorSearch.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="ProductRazorSearchSettings.ascx.cs">
       <DependentUpon>ProductRazorSearchSettings.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ProductRazorSearchSettings.ascx.designer.cs">
       <DependentUpon>ProductRazorSearchSettings.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="CategoryRazorMenuSettings.ascx.cs">
       <DependentUpon>CategoryRazorMenuSettings.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="CategoryRazorMenuSettings.ascx.designer.cs">
       <DependentUpon>CategoryRazorMenuSettings.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="CategoryRazorMenu.ascx.cs">
       <DependentUpon>CategoryRazorMenu.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="CategoryRazorMenu.ascx.designer.cs">
       <DependentUpon>CategoryRazorMenu.ascx.cs</DependentUpon>
@@ -278,36 +311,42 @@
     <Compile Include="Components\Interfaces\EntityTypeInterface.cs" />
     <Compile Include="OrderRazorAdmin.ascx.cs">
       <DependentUpon>OrderRazorAdmin.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="OrderRazorAdmin.ascx.designer.cs">
       <DependentUpon>OrderRazorAdmin.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="OrderRazorAdminSettings.ascx.cs">
       <DependentUpon>OrderRazorAdminSettings.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="OrderRazorAdminSettings.ascx.designer.cs">
       <DependentUpon>OrderRazorAdminSettings.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="ProductAjaxView.ascx.cs">
       <DependentUpon>ProductAjaxView.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ProductAjaxView.ascx.designer.cs">
       <DependentUpon>ProductAjaxView.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="ProductAjaxViewSettings.ascx.cs">
       <DependentUpon>ProductAjaxViewSettings.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ProductAjaxViewSettings.ascx.designer.cs">
       <DependentUpon>ProductAjaxViewSettings.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="ProfileRazorFormSettings.ascx.cs">
       <DependentUpon>ProfileRazorFormSettings.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ProfileRazorFormSettings.ascx.designer.cs">
       <DependentUpon>ProfileRazorFormSettings.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="ProfileRazorForm.ascx.cs">
       <DependentUpon>ProfileRazorForm.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ProfileRazorForm.ascx.designer.cs">
       <DependentUpon>ProfileRazorForm.ascx.cs</DependentUpon>
@@ -343,36 +382,42 @@
     <Compile Include="Components\StoreSettings.cs" />
     <Compile Include="AddressAdmin.ascx.cs">
       <DependentUpon>AddressAdmin.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="AddressAdmin.ascx.designer.cs">
       <DependentUpon>AddressAdmin.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="AddressAdminSettings.ascx.cs">
       <DependentUpon>AddressAdminSettings.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="AddressAdminSettings.ascx.designer.cs">
       <DependentUpon>AddressAdminSettings.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="Admin\Container.ascx.cs">
       <DependentUpon>Container.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Admin\Container.ascx.designer.cs">
       <DependentUpon>Container.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="Payment.ascx.cs">
       <DependentUpon>Payment.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Payment.ascx.designer.cs">
       <DependentUpon>Payment.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="PaymentSettings.ascx.cs">
       <DependentUpon>PaymentSettings.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="PaymentSettings.ascx.designer.cs">
       <DependentUpon>PaymentSettings.ascx.cs</DependentUpon>
     </Compile>
     <Compile Include="PrintView.aspx.cs">
       <DependentUpon>PrintView.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="PrintView.aspx.designer.cs">
       <DependentUpon>PrintView.aspx.cs</DependentUpon>
@@ -1772,7 +1817,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets'))" />
   </Target>
   <Import Project="packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets" Condition="Exists('packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" />
   <PropertyGroup>
diff --git a/NBrightBuy15.sln b/NBrightBuy15.sln
index 8ad1e42..fd4577f 100644
--- a/NBrightBuy15.sln
+++ b/NBrightBuy15.sln
@@ -19,6 +19,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscountCodesProvider", "Pr
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3F7C3DDA-C643-40C8-B411-99C6C8AF5ED6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBrightDNN", "..\NBrightData\NBrightDNN.csproj", "{EC815D38-62CF-4B46-8177-CF40CE1AAB62}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBrightCore", "..\NBrightData\NBrightCore\NBrightCore.csproj", "{7B338113-6A9A-484D-A6C6-4D63FD5E58C6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,8 +31,10 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{8F850303-BEC5-4247-9126-1E58F1402205}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F850303-BEC5-4247-9126-1E58F1402205}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8F850303-BEC5-4247-9126-1E58F1402205}.Razor|Any CPU.ActiveCfg = Razor|Any CPU
 		{8F850303-BEC5-4247-9126-1E58F1402205}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F850303-BEC5-4247-9126-1E58F1402205}.Release|Any CPU.Build.0 = Release|Any CPU
 		{747FC12A-3C5B-495E-90A6-47E999E16AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{747FC12A-3C5B-495E-90A6-47E999E16AAA}.Razor|Any CPU.ActiveCfg = Razor|Any CPU
 		{747FC12A-3C5B-495E-90A6-47E999E16AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -47,6 +53,18 @@ Global
 		{A634CB2D-946E-4C73-B7DC-0677CE5AA7D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A634CB2D-946E-4C73-B7DC-0677CE5AA7D0}.Razor|Any CPU.ActiveCfg = Razor|Any CPU
 		{A634CB2D-946E-4C73-B7DC-0677CE5AA7D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC815D38-62CF-4B46-8177-CF40CE1AAB62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC815D38-62CF-4B46-8177-CF40CE1AAB62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC815D38-62CF-4B46-8177-CF40CE1AAB62}.Razor|Any CPU.ActiveCfg = Release|Any CPU
+		{EC815D38-62CF-4B46-8177-CF40CE1AAB62}.Razor|Any CPU.Build.0 = Release|Any CPU
+		{EC815D38-62CF-4B46-8177-CF40CE1AAB62}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC815D38-62CF-4B46-8177-CF40CE1AAB62}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B338113-6A9A-484D-A6C6-4D63FD5E58C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B338113-6A9A-484D-A6C6-4D63FD5E58C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B338113-6A9A-484D-A6C6-4D63FD5E58C6}.Razor|Any CPU.ActiveCfg = Release|Any CPU
+		{7B338113-6A9A-484D-A6C6-4D63FD5E58C6}.Razor|Any CPU.Build.0 = Release|Any CPU
+		{7B338113-6A9A-484D-A6C6-4D63FD5E58C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B338113-6A9A-484D-A6C6-4D63FD5E58C6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/OpenStore.dnn b/OpenStore.dnn
index cdea5b7..7f38864 100644
--- a/OpenStore.dnn
+++ b/OpenStore.dnn
@@ -93,6 +93,8 @@
 
         v04.01.05
         - Minor updates
+        - Fix problem with cahce on product header.
+        - Fix duplicate plugin records.
         - Convert Dev to DNNpackager. 
 
       </releaseNotes>
diff --git a/OpenStoreUpgrade.dnn b/OpenStoreUpgrade.dnn
index ca88aca..ef5bf41 100644
--- a/OpenStoreUpgrade.dnn
+++ b/OpenStoreUpgrade.dnn
@@ -93,6 +93,8 @@
 
         v04.01.05
         - Minor updates
+        - Fix problem with cahce on product header.
+        - Fix duplicate plugin records.
         - Convert Dev to DNNpackager.
 
       </releaseNotes>
diff --git a/Payment.ascx.cs b/Payment.ascx.cs
index dba5b2e..29fd11d 100644
--- a/Payment.ascx.cs
+++ b/Payment.ascx.cs
@@ -73,9 +73,12 @@ protected override void OnLoad(EventArgs e)
                         {
                             cartInfo.SaveModelTransQty(); // move qty into trans
                             var orderData = cartInfo.ConvertToOrder(StoreSettings.Current.DebugMode);
-                            orderData.PaymentProviderKey = providerkey.ToLower(); // provider keys should always be lowecase
-                            orderData.SavePurchaseData();
-                            PaymentsInterface.Instance(orderData.PaymentProviderKey).RedirectForPayment(orderData);
+                            if (orderData != null)
+                            {
+                                orderData.PaymentProviderKey = providerkey.ToLower(); // provider keys should always be lowecase
+                                orderData.SavePurchaseData();
+                                PaymentsInterface.Instance(orderData.PaymentProviderKey).RedirectForPayment(orderData);
+                            }
                         }
                     }
                     else
diff --git a/Themes/Bootstrap4/Default/ProductDisplayDetail.cshtml b/Themes/Bootstrap4/Default/ProductDisplayDetail.cshtml
index 275fad2..8d4e9c9 100644
--- a/Themes/Bootstrap4/Default/ProductDisplayDetail.cshtml
+++ b/Themes/Bootstrap4/Default/ProductDisplayDetail.cshtml
@@ -209,7 +209,7 @@
         <!-- Details -->
         <div class="mt-3 details">
             <ul class="nav nav-tabs" role="tablist">
-            @if (info.GetXmlProperty("genxml/lang/genxml/textbox/description") != "")
+            @if (info.GetXmlProperty("genxml/lang/genxml/edt/description") != "")
             {
                 <li class="nav-item" role="presentation">
                     <a class="nav-link active" role="tab" data-toggle="tab" href="#tab-1">@ResourceKey("ProductView.description")</a>
@@ -227,10 +227,10 @@
             }
             </ul>
             <div class="tab-content mt-3">
-                @if (@info.GetXmlProperty("genxml/lang/genxml/textbox/description") != "")
+                @if (@info.GetXmlProperty("genxml/lang/genxml/edt/description") != "")
                 {
                     <div id="tab-1" class="tab-pane fade show active" role="tabpanel">
-                        @HtmlOf(info, "genxml/lang/genxml/textbox/description")
+                        @HtmlOf(info, "genxml/lang/genxml/edt/description")
                     </div>
                 }
                 @if (@product.Docs.Count >= 1)
diff --git a/Themes/Bootstrap4/js/product.js b/Themes/Bootstrap4/js/product.js
index dfd0e9f..f9e0b4a 100644
--- a/Themes/Bootstrap4/js/product.js
+++ b/Themes/Bootstrap4/js/product.js
@@ -116,7 +116,7 @@ function AjaxView_GetList_nbxproductgetCompleted(e) {
         $('.processingminicart').show();
         $('input[id*="optionfilelist"]').val(''); // clear any clientupload file names
         $('#carttemplate').val('MiniCart.cshtml');
-        nbxproductget('cart_renderminicart', '#productajaxview', '.container_classicajax_minicart'); // Reload Cart
+        nbxproductget('cart_renderminicart', '#productajaxview', '.container_bootstrap4_minicart'); // Reload Cart
         $('.addedtobasket').delay(1000).fadeOut('fast');
     }
 
diff --git a/Themes/Default/Default/payment_ok.cshtml b/Themes/Default/Default/payment_ok.cshtml
index ffc1fb2..0261d34 100644
--- a/Themes/Default/Default/payment_ok.cshtml
+++ b/Themes/Default/Default/payment_ok.cshtml
@@ -36,7 +36,7 @@
     @if (UserController.Instance.GetCurrentUserInfo().UserID > 0)
     {
         <div class="formrow">
-            <a class="primarybutton" href="/tabid/@(Model.GetSetting("ordermanagertab"))/eid/@(info.ItemID)">@ResourceKey("CartView.ViewOrder")</a>
+            <a class="primarybutton" href="/tabid/@(Model.GetSetting("ordermanagertab"))">@ResourceKey("CartView.ViewOrder")</a>
         </div>
     }
     else
diff --git a/_external/Newtonsoft.Json.dll b/_external/Newtonsoft.Json.dll
new file mode 100644
index 0000000..77a5d89
Binary files /dev/null and b/_external/Newtonsoft.Json.dll differ