diff --git a/src/MusicStore/Views/Shared/Components/Announcement/Default.cshtml b/src/MusicStore/Views/Shared/Components/Announcement/Default.cshtml
index 98e5cffbe9..52e11e3193 100644
--- a/src/MusicStore/Views/Shared/Components/Announcement/Default.cshtml
+++ b/src/MusicStore/Views/Shared/Components/Announcement/Default.cshtml
@@ -5,6 +5,6 @@
     <li>
         <br />
         <small><i><label title="New Arrivals!" style="color:red">New Arrivals!</label></i></small>
-        <i><a id="NewArrivalsPanel" asp-controller="Store" asp-action="Details" asp-route-id="@Model.AlbumId">@Model.Title</a></i>
+        <i><a id="NewArrivalsPanel" asp-area="" asp-controller="Store" asp-action="Details" asp-route-id="@Model.AlbumId">@Model.Title</a></i>
     </li>
 }
\ No newline at end of file
diff --git a/src/MusicStore/Views/Shared/Components/CartSummary/Default.cshtml b/src/MusicStore/Views/Shared/Components/CartSummary/Default.cshtml
index d08e46e5e8..9e9dd038ee 100644
--- a/src/MusicStore/Views/Shared/Components/CartSummary/Default.cshtml
+++ b/src/MusicStore/Views/Shared/Components/CartSummary/Default.cshtml
@@ -1,7 +1,7 @@
 @if (ViewBag.CartCount > 0)
 {
     <li>
-        <a asp-controller="ShoppingCart" asp-action="Index" title="@ViewBag.CartSummary">
+        <a asp-area="" asp-controller="ShoppingCart" asp-action="Index" title="@ViewBag.CartSummary">
             <span class="glyphicon glyphicon-shopping-cart"></span>
             <span id="cart-status">
                 @ViewBag.CartCount
diff --git a/src/MusicStore/Views/Shared/Components/GenreMenu/Default.cshtml b/src/MusicStore/Views/Shared/Components/GenreMenu/Default.cshtml
index 601d74c824..aad1473627 100644
--- a/src/MusicStore/Views/Shared/Components/GenreMenu/Default.cshtml
+++ b/src/MusicStore/Views/Shared/Components/GenreMenu/Default.cshtml
@@ -1,12 +1,12 @@
 @model IEnumerable<string>
 
 <li class="dropdown">
-    <a asp-controller="Store" asp-action="Index" class="dropdown-toggle" data-toggle="dropdown">Store <b class="caret"></b></a>
+    <a asp-area="" asp-controller="Store" asp-action="Index" class="dropdown-toggle" data-toggle="dropdown">Store <b class="caret"></b></a>
     <ul class="dropdown-menu">
         @foreach (var genreName in Model)
         {
             <li>
-                <a asp-controller="Store" asp-action="Browse" asp-route-Genre="@genreName">@genreName</a>
+                <a asp-area="" asp-controller="Store" asp-action="Browse" asp-route-Genre="@genreName">@genreName</a>
             </li>
         }
         <li class="divider"></li>
diff --git a/src/MusicStore/Views/Shared/_Layout.cshtml b/src/MusicStore/Views/Shared/_Layout.cshtml
index f286ed504c..d2009c0b2b 100644
--- a/src/MusicStore/Views/Shared/_Layout.cshtml
+++ b/src/MusicStore/Views/Shared/_Layout.cshtml
@@ -33,11 +33,11 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a asp-controller="Home" asp-action="Index" class="navbar-brand">@AppSettings.Value.SiteTitle</a>
+                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">@AppSettings.Value.SiteTitle</a>
             </div>
             <div class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
-                    <li><a asp-controller="Home" asp-action="Index">Home</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
                     @await Component.InvokeAsync("GenreMenu")
                     @await Component.InvokeAsync("CartSummary")
                 </ul>
diff --git a/src/MusicStore/Views/Shared/_LoginPartial.cshtml b/src/MusicStore/Views/Shared/_LoginPartial.cshtml
index 64e7b91ed8..25954923fd 100644
--- a/src/MusicStore/Views/Shared/_LoginPartial.cshtml
+++ b/src/MusicStore/Views/Shared/_LoginPartial.cshtml
@@ -6,10 +6,10 @@
 
 @if (SignInManager.IsSignedIn(User))
 {
-    <form asp-controller="Account" asp-action="LogOff" method="post" id="logoutForm" class="navbar-right">
+    <form asp-area="" asp-controller="Account" asp-action="LogOff" method="post" id="logoutForm" class="navbar-right">
         <ul class="nav navbar-nav navbar-right">
             <li>
-                <a asp-controller="Manage" asp-action="Index" title="Manage">Hello @UserManager.GetUserName(User)!</a>
+                <a asp-area="" asp-controller="Manage" asp-action="Index" title="Manage">Hello @UserManager.GetUserName(User)!</a>
             </li>
             <li><a href="javascript:document.getElementById('logoutForm').submit()">Log off</a></li>
         </ul>