diff --git a/src/Services/Identity/Identity.API/Views/Consent/Index.cshtml b/src/Services/Identity/Identity.API/Views/Consent/Index.cshtml
index 03f026bda..08c316553 100644
--- a/src/Services/Identity/Identity.API/Views/Consent/Index.cshtml
+++ b/src/Services/Identity/Identity.API/Views/Consent/Index.cshtml
@@ -16,7 +16,7 @@
 
     <div class="row">
         <div class="col-sm-8">
-            @Html.Partial("_ValidationSummary")
+            <partial name="_ValidationSummary"/>
 
             <form asp-action="Index" class="consent-form">
                 <input type="hidden" asp-for="ReturnUrl" />
@@ -33,7 +33,7 @@
                         <ul class="list-group">
                             @foreach (var scope in Model.IdentityScopes)
                             {
-                                @Html.Partial("_ScopeListItem", scope)
+                                <partial name="_ScopeListItem" model="scope"/>
                             }
                         </ul>
                     </div>
@@ -49,7 +49,7 @@
                         <ul class="list-group">
                             @foreach (var scope in Model.ResourceScopes)
                             {
-                                @Html.Partial("_ScopeListItem", scope)
+                                <partial name="_ScopeListItem" model="scope"/>
                             }
                         </ul>
                     </div>
diff --git a/src/Web/WebMVC/Views/Campaigns/Details.cshtml b/src/Web/WebMVC/Views/Campaigns/Details.cshtml
index df3b600e1..979a6bce6 100644
--- a/src/Web/WebMVC/Views/Campaigns/Details.cshtml
+++ b/src/Web/WebMVC/Views/Campaigns/Details.cshtml
@@ -1,6 +1,9 @@
 @{
     ViewData["Title"] = "Campaign details";
     @model CampaignItem
+    var headerList= new List<Header>() {
+        new Header() { Controller = "Catalog", Text = "Back to catalog" },
+        new Header() { Controller = "Campaigns", Text = "Back to Campaigns" } };
 }
 <section class="esh-campaigns-hero">
     <div class="container">
@@ -8,9 +11,7 @@
     </div>
 </section>
 
-@Html.Partial("_Header", new List<Header>() {
-            new Header() { Controller = "Catalog", Text = "Back to catalog" },
-        new Header() { Controller = "Campaigns", Text = "Back to Campaigns" } })
+<partial name="_Header" model="headerList" />
 
 <div class="container">
     <div class="card esh-campaigns-items">
diff --git a/src/Web/WebMVC/Views/Campaigns/Index.cshtml b/src/Web/WebMVC/Views/Campaigns/Index.cshtml
index 7bfe7edd5..84f893291 100644
--- a/src/Web/WebMVC/Views/Campaigns/Index.cshtml
+++ b/src/Web/WebMVC/Views/Campaigns/Index.cshtml
@@ -1,6 +1,8 @@
 @{
     ViewData["Title"] = "Campaigns";
-@model WebMVC.ViewModels.CampaignViewModel
+    @model WebMVC.ViewModels.CampaignViewModel
+    var headerList= new List<Header>() {
+        new Header() { Controller = "Catalog", Text = "Back to catalog" } };
 }
 
 <section class="esh-campaigns-hero">
@@ -9,8 +11,7 @@
     </div>
 </section>
 
-@Html.Partial("_Header", new List<Header>() {
-    new Header() { Controller = "Catalog", Text = "Back to catalog" } })
+<partial name="_Header" model="headerList"/>
 
 <div class="container">
     <br />
@@ -58,12 +59,12 @@
                 @foreach (var catalogItem in Model.CampaignItems)
                 {
                     <div class="esh-campaigns-item col-md-4">
-                        @Html.Partial("_campaign", catalogItem)
+                        <partial name="_campaign" model="catalogItem"/>
                     </div>
                 }
             </div>
 
-            @Html.Partial("_pagination", Model.PaginationInfo)
+            <partial name="_pagination" for="PaginationInfo" />
         }
         else
         {
diff --git a/src/Web/WebMVC/Views/Cart/Index.cshtml b/src/Web/WebMVC/Views/Cart/Index.cshtml
index d9386a1fd..398a66181 100644
--- a/src/Web/WebMVC/Views/Cart/Index.cshtml
+++ b/src/Web/WebMVC/Views/Cart/Index.cshtml
@@ -5,13 +5,14 @@
 @inject IIdentityParser<ApplicationUser> UserManager
 
 @{
-    ViewData["Title"] = "My Cart";
+     ViewData["Title"] = "My Cart";
+     var headerList = new List<Header>() {
+          new Header() { Controller = "Catalog", Text = "Back to catalog" }};
 }
 
 <form method="post" id="cartForm">
     <div class="esh-basket">
-        @Html.Partial("_Header", new List<Header>() {
-            new Header() { Controller = "Catalog", Text = "Back to catalog" } })
+        <partial name="_Header" model="headerList"/>
 
         @await Component.InvokeAsync("CartList", new { user = UserManager.Parse(User) })
     </div>
diff --git a/src/Web/WebMVC/Views/Catalog/Index.cshtml b/src/Web/WebMVC/Views/Catalog/Index.cshtml
index c2ef7f367..e8f26d345 100644
--- a/src/Web/WebMVC/Views/Catalog/Index.cshtml
+++ b/src/Web/WebMVC/Views/Catalog/Index.cshtml
@@ -35,18 +35,18 @@
 
     @if (Model.CatalogItems.Count() > 0)
     {
-        @Html.Partial("_pagination", Model.PaginationInfo)
+        <partial name="_pagination" for="PaginationInfo" />
 
         <div class="esh-catalog-items row">
             @foreach (var catalogItem in Model.CatalogItems)
             {
                 <div class="esh-catalog-item col-md-4">
-                    @Html.Partial("_product", catalogItem)
+                    <partial name="_product" model="catalogItem"/>
                 </div>
             }
         </div>
 
-        @Html.Partial("_pagination", Model.PaginationInfo)
+        <partial name="_pagination" for="PaginationInfo"/>
     }
     else
     {
diff --git a/src/Web/WebMVC/Views/Order/Create.cshtml b/src/Web/WebMVC/Views/Order/Create.cshtml
index d9b06c67f..96eb56c72 100644
--- a/src/Web/WebMVC/Views/Order/Create.cshtml
+++ b/src/Web/WebMVC/Views/Order/Create.cshtml
@@ -3,11 +3,12 @@
 @inject IIdentityParser<ApplicationUser> UserManager
 
 @{
-    ViewData["Title"] = "New Order";
+     ViewData["Title"] = "New Order";
+     var headerList= new List<Header>() {
+       new Header() { Controller = "Cart", Text = "Back to cart" } };
 }
 
-@Html.Partial("_Header", new List<Header>() {
-        new Header() { Controller = "Cart", Text = "Back to cart" } })
+<partial name="_Header" model="headerList"/>
 <div class="container">
     <form method="post" asp-controller="Order" asp-action="Checkout">
         <section class="esh-orders_new-section">
diff --git a/src/Web/WebMVC/Views/Order/Detail.cshtml b/src/Web/WebMVC/Views/Order/Detail.cshtml
index 5b7dadf25..6b7c0b46e 100644
--- a/src/Web/WebMVC/Views/Order/Detail.cshtml
+++ b/src/Web/WebMVC/Views/Order/Detail.cshtml
@@ -3,12 +3,13 @@
 @model Microsoft.eShopOnContainers.WebMVC.ViewModels.Order
 
 @{
-    ViewData["Title"] = "Order Detail";
+     ViewData["Title"] = "Order Detail";
+     var headerList= new List<Header>() {
+     new Header() { Controller = "Catalog", Text = "Back to catalog" } };
 }
 
 <div class="esh-orders_detail">
-    @Html.Partial("_Header", new List<Header>() {
-        new Header() { Controller = "Catalog", Text = "Back to catalog" } })
+    <partial name="_Header" model="headerList"/>
 
     <div class="container">
         <section class="esh-orders_detail-section">
diff --git a/src/Web/WebMVC/Views/Order/Index.cshtml b/src/Web/WebMVC/Views/Order/Index.cshtml
index 43cb389c1..d3247433c 100644
--- a/src/Web/WebMVC/Views/Order/Index.cshtml
+++ b/src/Web/WebMVC/Views/Order/Index.cshtml
@@ -3,14 +3,15 @@
 @model IEnumerable<Microsoft.eShopOnContainers.WebMVC.ViewModels.Order>
 
 @{
-    ViewData["Title"] = "My Orders";
+     ViewData["Title"] = "My Orders";
+     var headerList= new List<Header>() {
+        new Header() { Controller = "Catalog", Text = "Back to catalog" },
+        new Header() { Text = " / " },
+        new Header() { Controller = "OrderManagement", Text = "Orders Management" } };
 }
 
 <div class="esh-orders">
-    @Html.Partial("_Header", new List<Header>() {
-new Header() { Controller = "Catalog", Text = "Back to catalog" },
-new Header() { Text = " / " },
-new Header() { Controller = "OrderManagement", Text = "Orders Management" } })
+    <partial name="_Header" model="headerList"/>
 
     <div class="container">
         <article class="esh-orders-titles row">
diff --git a/src/Web/WebMVC/Views/OrderManagement/Index.cshtml b/src/Web/WebMVC/Views/OrderManagement/Index.cshtml
index acceace31..6f7130bf4 100644
--- a/src/Web/WebMVC/Views/OrderManagement/Index.cshtml
+++ b/src/Web/WebMVC/Views/OrderManagement/Index.cshtml
@@ -3,12 +3,13 @@
 @model IEnumerable<Microsoft.eShopOnContainers.WebMVC.ViewModels.Order>
 
 @{
-    ViewData["Title"] = "My Orders";
+     ViewData["Title"] = "My Orders";
+     var headerList = new List<Header>() {
+          new Header() { Controller = "Catalog", Text = "Back to catalog" } };
 }
 
 <div class="esh-orders">
-    @Html.Partial("_Header", new List<Header>() {
-            new Header() { Controller = "Catalog", Text = "Back to catalog" } })
+    <partial name="_Header" model="headerList"/>
 
     <div class="container">
         <article class="esh-orders-titles row">
diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj
index 6f466d730..24a37fc75 100644
--- a/src/Web/WebMVC/WebMVC.csproj
+++ b/src/Web/WebMVC/WebMVC.csproj
@@ -31,11 +31,11 @@
     <PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.Redis" Version="2.2.0-preview2-35157" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Fabric.MSBuild" Version="1.6.7" />
-    <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="1.0.172" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" />
+    <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="1.0.172" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.3" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.0.1" />