diff --git a/src/BaseTemplates/StarterWeb/Views/Shared/_Layout.cshtml b/src/BaseTemplates/StarterWeb/Views/Shared/_Layout.cshtml
index 86c6888c..923695d4 100644
--- a/src/BaseTemplates/StarterWeb/Views/Shared/_Layout.cshtml
+++ b/src/BaseTemplates/StarterWeb/Views/Shared/_Layout.cshtml
@@ -26,13 +26,13 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a asp-controller="Home" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
+                <a asp-controller="Home" asp-area="" asp-action="Index" class="navbar-brand">$safeprojectname$</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-controller="Home" asp-action="About">About</a></li>
-                    <li><a asp-controller="Home" asp-action="Contact">Contact</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="Index">Home</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="About">About</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="Contact">Contact</a></li>
                 </ul>
             </div>
         </div>
diff --git a/src/BaseTemplates/StarterWeb/project.json b/src/BaseTemplates/StarterWeb/project.json
index 8930d1e0..1ef602b6 100644
--- a/src/BaseTemplates/StarterWeb/project.json
+++ b/src/BaseTemplates/StarterWeb/project.json
@@ -71,6 +71,7 @@ $endif$
     "include": [
       "wwwroot",
       "Views",
+      "Areas\**\Views",
       "appsettings.json",
       "web.config"
     ]
diff --git a/src/BaseTemplates/WebAPI/project.json b/src/BaseTemplates/WebAPI/project.json
index 02389a45..935178b8 100644
--- a/src/BaseTemplates/WebAPI/project.json
+++ b/src/BaseTemplates/WebAPI/project.json
@@ -54,6 +54,7 @@ $endif$
     "include": [
       "wwwroot",
       "Views",
+      "Areas\**\Views",
       "appsettings.json",
       "web.config"
     ]
diff --git a/src/Rules/StarterWeb/AI/CommonAuth/Views/Shared/_Layout.cshtml b/src/Rules/StarterWeb/AI/CommonAuth/Views/Shared/_Layout.cshtml
index e7dd72ee..0aa71de8 100644
--- a/src/Rules/StarterWeb/AI/CommonAuth/Views/Shared/_Layout.cshtml
+++ b/src/Rules/StarterWeb/AI/CommonAuth/Views/Shared/_Layout.cshtml
@@ -27,13 +27,13 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a asp-controller="Home" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
+                <a asp-controller="Home" asp-area="" asp-action="Index" class="navbar-brand">$safeprojectname$</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-controller="Home" asp-action="About">About</a></li>
-                    <li><a asp-controller="Home" asp-action="Contact">Contact</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="Index">Home</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="About">About</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="Contact">Contact</a></li>
                 </ul>
                 @await Html.PartialAsync("_LoginPartial")
             </div>
diff --git a/src/Rules/StarterWeb/AI/IndividualAuth/project.json b/src/Rules/StarterWeb/AI/IndividualAuth/project.json
index 72f759ba..cadec596 100644
--- a/src/Rules/StarterWeb/AI/IndividualAuth/project.json
+++ b/src/Rules/StarterWeb/AI/IndividualAuth/project.json
@@ -109,6 +109,7 @@ $endif$
     "include": [
       "wwwroot",
       "Views",
+      "Areas\**\Views",
       "appsettings.json",
       "web.config"
     ]
diff --git a/src/Rules/StarterWeb/AI/NoAuth/Views/Shared/_Layout.cshtml b/src/Rules/StarterWeb/AI/NoAuth/Views/Shared/_Layout.cshtml
index 3cd29c42..c50fdb9b 100644
--- a/src/Rules/StarterWeb/AI/NoAuth/Views/Shared/_Layout.cshtml
+++ b/src/Rules/StarterWeb/AI/NoAuth/Views/Shared/_Layout.cshtml
@@ -27,13 +27,13 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a asp-controller="Home" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
+                <a asp-controller="Home" asp-area="" asp-action="Index" class="navbar-brand">$safeprojectname$</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-controller="Home" asp-action="About">About</a></li>
-                    <li><a asp-controller="Home" asp-action="Contact">Contact</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="Index">Home</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="About">About</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="Contact">Contact</a></li>
                 </ul>
             </div>
         </div>
diff --git a/src/Rules/StarterWeb/AI/NoAuth/project.json b/src/Rules/StarterWeb/AI/NoAuth/project.json
index e4e40f70..ee1f5744 100644
--- a/src/Rules/StarterWeb/AI/NoAuth/project.json
+++ b/src/Rules/StarterWeb/AI/NoAuth/project.json
@@ -72,6 +72,7 @@ $endif$
     "include": [
       "wwwroot",
       "Views",
+      "Areas\**\Views",
       "appsettings.json",
       "web.config"
     ]
diff --git a/src/Rules/StarterWeb/AI/OrganizationalAuth/Multiple/Common/project.json b/src/Rules/StarterWeb/AI/OrganizationalAuth/Multiple/Common/project.json
index 5afcd2a4..2bf0bd46 100644
--- a/src/Rules/StarterWeb/AI/OrganizationalAuth/Multiple/Common/project.json
+++ b/src/Rules/StarterWeb/AI/OrganizationalAuth/Multiple/Common/project.json
@@ -81,6 +81,7 @@ $endif$
     "include": [
       "wwwroot",
       "Views",
+      "Areas\**\Views",
       "appsettings.json",
       "web.config"
     ]
diff --git a/src/Rules/StarterWeb/AI/OrganizationalAuth/Single/Common/project.json b/src/Rules/StarterWeb/AI/OrganizationalAuth/Single/Common/project.json
index 5afcd2a4..2bf0bd46 100644
--- a/src/Rules/StarterWeb/AI/OrganizationalAuth/Single/Common/project.json
+++ b/src/Rules/StarterWeb/AI/OrganizationalAuth/Single/Common/project.json
@@ -81,6 +81,7 @@ $endif$
     "include": [
       "wwwroot",
       "Views",
+      "Areas\**\Views",
       "appsettings.json",
       "web.config"
     ]
diff --git a/src/Rules/StarterWeb/AI/WindowsAuth/Views/Shared/_Layout.cshtml b/src/Rules/StarterWeb/AI/WindowsAuth/Views/Shared/_Layout.cshtml
index b8151ade..c7a57cf5 100644
--- a/src/Rules/StarterWeb/AI/WindowsAuth/Views/Shared/_Layout.cshtml
+++ b/src/Rules/StarterWeb/AI/WindowsAuth/Views/Shared/_Layout.cshtml
@@ -27,13 +27,13 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a asp-controller="Home" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
+                <a asp-controller="Home" asp-area="" asp-action="Index" class="navbar-brand">$safeprojectname$</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-controller="Home" asp-action="About">About</a></li>
-                    <li><a asp-controller="Home" asp-action="Contact">Contact</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="Index">Home</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="About">About</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="Contact">Contact</a></li>
                 </ul>
                 <p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p>
             </div>
diff --git a/src/Rules/StarterWeb/CommonAuth/Views/Shared/_Layout.cshtml b/src/Rules/StarterWeb/CommonAuth/Views/Shared/_Layout.cshtml
index 6e2b79f2..4a952d70 100644
--- a/src/Rules/StarterWeb/CommonAuth/Views/Shared/_Layout.cshtml
+++ b/src/Rules/StarterWeb/CommonAuth/Views/Shared/_Layout.cshtml
@@ -26,13 +26,13 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a asp-controller="Home" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
+                <a asp-controller="Home" asp-area="" asp-action="Index" class="navbar-brand">$safeprojectname$</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-controller="Home" asp-action="About">About</a></li>
-                    <li><a asp-controller="Home" asp-action="Contact">Contact</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="Index">Home</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="About">About</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="Contact">Contact</a></li>
                 </ul>
                 @await Html.PartialAsync("_LoginPartial")
             </div>
diff --git a/src/Rules/StarterWeb/IndividualAuth/Views/Shared/_LoginPartial.cshtml b/src/Rules/StarterWeb/IndividualAuth/Views/Shared/_LoginPartial.cshtml
index 31176d33..1021d7d8 100644
--- a/src/Rules/StarterWeb/IndividualAuth/Views/Shared/_LoginPartial.cshtml
+++ b/src/Rules/StarterWeb/IndividualAuth/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-controller="Account" asp-area="" 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-controller="Manage" asp-area="" asp-action="Index" title="Manage">Hello @UserManager.GetUserName(User)!</a>
             </li>
             <li>
                 <button type="submit" class="btn btn-link navbar-btn navbar-link">Log off</button>
@@ -20,7 +20,7 @@
 else
 {
     <ul class="nav navbar-nav navbar-right">
-        <li><a asp-controller="Account" asp-action="Register">Register</a></li>
-        <li><a asp-controller="Account" asp-action="Login">Log in</a></li>
+        <li><a asp-controller="Account" asp-area="" asp-action="Register">Register</a></li>
+        <li><a asp-controller="Account" asp-area="" asp-action="Login">Log in</a></li>
     </ul>
 }
diff --git a/src/Rules/StarterWeb/IndividualAuth/project.json b/src/Rules/StarterWeb/IndividualAuth/project.json
index 34417ac3..e74d1798 100644
--- a/src/Rules/StarterWeb/IndividualAuth/project.json
+++ b/src/Rules/StarterWeb/IndividualAuth/project.json
@@ -108,6 +108,7 @@ $endif$
     "include": [
       "wwwroot",
       "Views",
+      "Areas\**\Views",
       "appsettings.json",
       "web.config"
     ]
diff --git a/src/Rules/StarterWeb/OrganizationalAuth/Common/Views/Shared/_LoginPartial.cshtml b/src/Rules/StarterWeb/OrganizationalAuth/Common/Views/Shared/_LoginPartial.cshtml
index f4b35b34..b0a2eb33 100644
--- a/src/Rules/StarterWeb/OrganizationalAuth/Common/Views/Shared/_LoginPartial.cshtml
+++ b/src/Rules/StarterWeb/OrganizationalAuth/Common/Views/Shared/_LoginPartial.cshtml
@@ -4,12 +4,12 @@
 {
     <ul class="nav navbar-nav navbar-right">
         <li class="navbar-text">Hello @User.Identity.Name!</li>
-        <li><a asp-controller="Account" asp-action="SignOut">Sign Out</a></li>
+        <li><a asp-controller="Account" asp-area="" asp-action="SignOut">Sign Out</a></li>
     </ul>
 }
 else
 {
     <ul class="nav navbar-nav navbar-right">
-        <li><a asp-controller="Account" asp-action="Signin">Sign in</a></li>
+        <li><a asp-controller="Account" asp-area="" asp-action="Signin">Sign in</a></li>
     </ul>
 }
diff --git a/src/Rules/StarterWeb/OrganizationalAuth/Common/project.json b/src/Rules/StarterWeb/OrganizationalAuth/Common/project.json
index a4a4f760..d5ec2a4d 100644
--- a/src/Rules/StarterWeb/OrganizationalAuth/Common/project.json
+++ b/src/Rules/StarterWeb/OrganizationalAuth/Common/project.json
@@ -80,6 +80,7 @@ $endif$
     "include": [
       "wwwroot",
       "Views",
+      "Areas\**\Views",
       "appsettings.json",
       "web.config"
     ]
diff --git a/src/Rules/StarterWeb/WindowsAuth/Views/Shared/_Layout.cshtml b/src/Rules/StarterWeb/WindowsAuth/Views/Shared/_Layout.cshtml
index 9536ee28..3a4c6f85 100644
--- a/src/Rules/StarterWeb/WindowsAuth/Views/Shared/_Layout.cshtml
+++ b/src/Rules/StarterWeb/WindowsAuth/Views/Shared/_Layout.cshtml
@@ -26,13 +26,13 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a asp-controller="Home" asp-action="Index" class="navbar-brand">$safeprojectname$</a>
+                <a asp-controller="Home" asp-area="" asp-action="Index" class="navbar-brand">$safeprojectname$</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-controller="Home" asp-action="About">About</a></li>
-                    <li><a asp-controller="Home" asp-action="Contact">Contact</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="Index">Home</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="About">About</a></li>
+                    <li><a asp-controller="Home" asp-area="" asp-action="Contact">Contact</a></li>
                 </ul>
                 <p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p>
             </div>
diff --git a/src/Rules/WebAPI/AI/NoAuth/project.json b/src/Rules/WebAPI/AI/NoAuth/project.json
index 4517ec25..f45a6b94 100644
--- a/src/Rules/WebAPI/AI/NoAuth/project.json
+++ b/src/Rules/WebAPI/AI/NoAuth/project.json
@@ -55,6 +55,7 @@ $endif$
     "include": [
       "wwwroot",
       "Views",
+      "Areas\**\Views",
       "appsettings.json",
       "web.config"
     ]
diff --git a/src/Rules/WebAPI/AI/OrganizationalAuth/Single/project.json b/src/Rules/WebAPI/AI/OrganizationalAuth/Single/project.json
index 3f365116..767969e6 100644
--- a/src/Rules/WebAPI/AI/OrganizationalAuth/Single/project.json
+++ b/src/Rules/WebAPI/AI/OrganizationalAuth/Single/project.json
@@ -63,6 +63,7 @@ $endif$
     "include": [
       "wwwroot",
       "Views",
+      "Areas\**\Views",
       "appsettings.json",
       "web.config"
     ]
diff --git a/src/Rules/WebAPI/OrganizationalAuth/Single/project.json b/src/Rules/WebAPI/OrganizationalAuth/Single/project.json
index c9ecec3b..c7691ab7 100644
--- a/src/Rules/WebAPI/OrganizationalAuth/Single/project.json
+++ b/src/Rules/WebAPI/OrganizationalAuth/Single/project.json
@@ -62,6 +62,7 @@ $endif$
     "include": [
       "wwwroot",
       "Views",
+      "Areas\**\Views",
       "appsettings.json",
       "web.config"
     ]