diff --git a/src/Web/Views/Basket/Index.cshtml b/src/Web/Views/Basket/Index.cshtml
index 35b30b1..1cc318d 100644
--- a/src/Web/Views/Basket/Index.cshtml
+++ b/src/Web/Views/Basket/Index.cshtml
@@ -22,7 +22,7 @@
                 <section class="esh-basket-title col-xs-2">Cost</section>
             </article>
             <div class="esh-catalog-items row">
-                @for (int i=0; i< Model.Items.Count; i++)
+                @for (int i = 0; i < Model.Items.Count; i++)
                 {
                     var item = Model.Items[i];
                     <article class="esh-basket-items row">
@@ -42,32 +42,32 @@
 
                         </div>
                     </article>
-                    @*<div class="esh-catalog-item col-md-4">
-                            @item.ProductId
-                        </div>*@
-
-                    <div class="container">
-                        <article class="esh-basket-titles esh-basket-titles--clean row">
-                            <section class="esh-basket-title col-xs-10"></section>
-                            <section class="esh-basket-title col-xs-2">Total</section>
-                        </article>
-
-                        <article class="esh-basket-items row">
-                            <section class="esh-basket-item col-xs-10"></section>
-                            <section class="esh-basket-item esh-basket-item--mark col-xs-2">$ @Model.Total()</section>
-                        </article>
-
-                        <article class="esh-basket-items row">
-                            <section class="esh-basket-item col-xs-7"></section>
-                            <section class="esh-basket-item col-xs-2">
-                                @*<button class="btn esh-basket-checkout" name="name" value="" type="submit">[ Update ]</button>*@
-                            </section>
-                        </article>
-                    </div>
                 }
+
+                <div class="container">
+                    <article class="esh-basket-titles esh-basket-titles--clean row">
+                        <section class="esh-basket-title col-xs-10"></section>
+                        <section class="esh-basket-title col-xs-2">Total</section>
+                    </article>
+
+                    <article class="esh-basket-items row">
+                        <section class="esh-basket-item col-xs-10"></section>
+                        <section class="esh-basket-item esh-basket-item--mark col-xs-2">$ @Model.Total().ToString("N2")</section>
+                    </article>
+
+                    <article class="esh-basket-items row">
+                        <section class="esh-basket-item col-xs-7"></section>
+                        <section class="esh-basket-item col-xs-2">
+                            @*<button class="btn esh-basket-checkout" name="name" value="" type="submit">[ Update ]</button>*@
+                        </section>
+                    </article>
+                </div>
+
                 <section class="esh-basket-item col-xs-push-8 col-xs-4">
                     <button class="btn esh-basket-checkout" name="updatebutton" value="" type="submit"
-                            asp-action="Index">[ Update ]</button>
+                            asp-action="Index">
+                        [ Update ]
+                    </button>
                     <input type="submit" asp-action="Checkout"
                            class="btn esh-basket-checkout"
                            value="[ Checkout ]" name="action" />
diff --git a/src/WebRazorPages/Pages/Basket/Index.cshtml b/src/WebRazorPages/Pages/Basket/Index.cshtml
index 5aa5959..c1dc5f4 100644
--- a/src/WebRazorPages/Pages/Basket/Index.cshtml
+++ b/src/WebRazorPages/Pages/Basket/Index.cshtml
@@ -57,7 +57,7 @@
 
                     <article class="esh-basket-items row">
                         <section class="esh-basket-item col-xs-10"></section>
-                        <section class="esh-basket-item esh-basket-item--mark col-xs-2">$ @Model.BasketModel.Total()</section>
+                        <section class="esh-basket-item esh-basket-item--mark col-xs-2">$ @Model.BasketModel.Total().ToString("N2")</section>
                     </article>
 
                     <article class="esh-basket-items row">
diff --git a/src/WebRazorPages/Pages/Basket/Index.cshtml.cs b/src/WebRazorPages/Pages/Basket/Index.cshtml.cs
index 904bf6f..fd7e42a 100644
--- a/src/WebRazorPages/Pages/Basket/Index.cshtml.cs
+++ b/src/WebRazorPages/Pages/Basket/Index.cshtml.cs
@@ -84,7 +84,7 @@ namespace Microsoft.eShopWeb.RazorPages.Pages.Basket
             if (_username != null) return;
 
             _username = Guid.NewGuid().ToString();
-            var cookieOptions = new CookieOptions();
+            var cookieOptions = new CookieOptions { IsEssential = true };
             cookieOptions.Expires = DateTime.Today.AddYears(10);
             Response.Cookies.Append(Constants.BASKET_COOKIENAME, _username, cookieOptions);
         }
diff --git a/src/WebRazorPages/Pages/Components/Basket/Default.cshtml b/src/WebRazorPages/Pages/Shared/Components/Basket/Default.cshtml
similarity index 100%
rename from src/WebRazorPages/Pages/Components/Basket/Default.cshtml
rename to src/WebRazorPages/Pages/Shared/Components/Basket/Default.cshtml
diff --git a/src/WebRazorPages/WebRazorPages.csproj b/src/WebRazorPages/WebRazorPages.csproj
index ec17601..7594006 100644
--- a/src/WebRazorPages/WebRazorPages.csproj
+++ b/src/WebRazorPages/WebRazorPages.csproj
@@ -9,6 +9,10 @@
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="Pages\Shared\Components\Basket\Default.cshtml" />
+  </ItemGroup>
+
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />