diff --git a/.gitignore b/.gitignore
index 628e7116368..5ae263bfc41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ artifacts/
 target/
 /**/_site/
 .vscode/
+.vs/
 
 ###############
 #  temp file  #
diff --git a/src/Microsoft.DocAsCode.EntityModel/Plugins/TocDocumentProcessor.cs b/src/Microsoft.DocAsCode.EntityModel/Plugins/TocDocumentProcessor.cs
index 2d0b768aa23..6589535b9e2 100644
--- a/src/Microsoft.DocAsCode.EntityModel/Plugins/TocDocumentProcessor.cs
+++ b/src/Microsoft.DocAsCode.EntityModel/Plugins/TocDocumentProcessor.cs
@@ -111,7 +111,7 @@ private void UpdateRelativePathAndAddTocMap(TocViewModel toc, FileModel model, H
                             tocPath = absHref.GetPathFromWorkingFolder();
                             if (!hostService.SourceFiles.TryGetValue(tocPath, out originalTocFile))
                             {
-                                var error = $"Unable to find either toc.yml or toc.md inside {item.Href}";
+                                var error = $"Unable to find either toc.yml or toc.md inside {item.Href}. Make sure the file is included in config file docfx.json!";
                                 Logger.LogError(error, file: model.LocalPathFromRepoRoot);
                                 throw new DocumentException(error);
                             }
@@ -124,6 +124,8 @@ private void UpdateRelativePathAndAddTocMap(TocViewModel toc, FileModel model, H
 
                     // Add toc.yml to tocMap before change item.Href to home page
                     item.Href = ((RelativePath)file + (RelativePath)item.Href).GetPathFromWorkingFolder();
+                    if (item.OriginalHref != null) item.OriginalHref = (RelativePath)file + (RelativePath)item.OriginalHref;
+
                     HashSet<string> value;
                     if (tocMap.TryGetValue(item.Href, out value))
                     {
diff --git a/src/docfx.website.themes/default/styles/main.js b/src/docfx.website.themes/default/styles/main.js
index feb081fd2aa..15415d2c59f 100644
--- a/src/docfx.website.themes/default/styles/main.js
+++ b/src/docfx.website.themes/default/styles/main.js
@@ -65,11 +65,11 @@ $(function() {
       if (navbarPath) navbarPath = navbarPath.replace(/\\/g, '/');
       $('#navbar').load(navbarPath + " #toc>ul", function() {
         var index = navbarPath.lastIndexOf('/');
-        if (index === -1) {
-          console.log("invalid navbar path: " + navbarPath);
-          return;
+        var navrel = '';
+        if (index > -1) {
+          navrel = navbarPath.substr(0, index + 1);
         }
-        var navrel = navbarPath.substr(0, index + 1);
+
         $('#navbar>ul').addClass('navbar-nav');
         var currentAbsPath = getAbsolutePath(window.location.pathname);
         // set active item
@@ -83,7 +83,8 @@ $(function() {
             var isActive = false;
             var originalHref = e.name;
             if (originalHref){
-              if ('/' + getDirectory(originalHref) === getDirectory(getAbsolutePath(tocPath))) {
+              originalHref = navrel + originalHref;
+              if (getDirectory(getAbsolutePath(originalHref)) === getDirectory(getAbsolutePath(tocPath))) {
                 isActive = true;
               }
             } else {
diff --git a/src/docfx/Template/default.zip b/src/docfx/Template/default.zip
index 5be29f9258e..055be12dad3 100644
Binary files a/src/docfx/Template/default.zip and b/src/docfx/Template/default.zip differ