diff --git a/GanjooRazor/Pages/Index.cshtml b/GanjooRazor/Pages/Index.cshtml
index 5d53c988..6921c318 100644
--- a/GanjooRazor/Pages/Index.cshtml
+++ b/GanjooRazor/Pages/Index.cshtml
@@ -299,40 +299,42 @@
                 </script>
             }
         }
+
+        @if (Model.IsCatPage || Model.IsPoetPage)
+        {
+            <script>
+                function asyncStartupLoadWordCounts() {
+                    return new Promise((resolve, reject) => {
+                        // Simulate a long running task
+                        setTimeout(() => {
+                            loadWordCounts(@Model.GanjoorPage.PoetOrCat.Cat.Id, @Model.GanjoorPage.PoetOrCat.Poet.Id, false)
+                        }, 100);
+                    });
+                }
+                asyncStartupLoadWordCounts();
+
+            </script>
+        }
+
+        @if (Model.GanjoorPage != null && Model.GanjoorPage.Id == 39401)
+        {
+            <script>
+                function asyncStartupLoadWordCounts() {
+                    return new Promise((resolve, reject) => {
+                        // Simulate a long running task
+                        setTimeout(() => {
+                            loadWordCounts(0, 0, false)
+                        }, 100);
+                    });
+                }
+
+                asyncStartupLoadWordCounts();
+
+            </script>
+        }
+
     }
 
-    @if (Model.IsCatPage || Model.IsPoetPage)
-    {
-        <script>
-            function asyncStartupLoadWordCounts() {
-                return new Promise((resolve, reject) => {
-                    // Simulate a long running task
-                    setTimeout(() => {
-                        loadWordCounts(@Model.GanjoorPage.PoetOrCat.Cat.Id, @Model.GanjoorPage.PoetOrCat.Poet.Id, false)
-                    }, 100);
-                });
-            }
-            asyncStartupLoadWordCounts();
-
-        </script>
-    }
-
-    @if (Model.GanjoorPage != null && Model.GanjoorPage.Id == 39401)
-    {
-        <script>
-            function asyncStartupLoadWordCounts() {
-                return new Promise((resolve, reject) => {
-                    // Simulate a long running task
-                    setTimeout(() => {
-                        loadWordCounts(0, 0, false)
-                    }, 100);
-                });
-            }
-
-            asyncStartupLoadWordCounts();
-
-        </script>
-    }
 
 
 </body>
diff --git a/TajikGanjoor/Pages/Index.cshtml.cs b/TajikGanjoor/Pages/Index.cshtml.cs
index 648fb2c4..51c2d640 100644
--- a/TajikGanjoor/Pages/Index.cshtml.cs
+++ b/TajikGanjoor/Pages/Index.cshtml.cs
@@ -24,7 +24,7 @@ namespace TajikGanjoor.Pages
         public string NextTitle { get; set; }
         public string PreviousUrl { get; set; }
         public string PreviousTitle { get; set; }
-
+        public string BreadCrumpUrls { get; set; }
 
 
         public async Task<IActionResult> OnGetAsync()
@@ -34,6 +34,7 @@ namespace TajikGanjoor.Pages
                 return StatusCode(503);
             }
 
+
             if(false == await PreparePoetsAsync())
             {
                 return Page();
@@ -85,6 +86,7 @@ namespace TajikGanjoor.Pages
 
             }
 
+            BreadCrumpUrls = "<a href=\"/\">Ганҷур</a>";
             if (IsHomePage)
             {
                 ViewData["Title"] = "Ганҷур";
@@ -93,30 +95,30 @@ namespace TajikGanjoor.Pages
             if (IsPoetPage)
             {
                 ViewData["Title"] = $"Ганҷур - {GanjoorPage?.PoetOrCat.Poet.TajikNickName}";
+                BreadCrumpUrls += $" - <a href=\"{GanjoorPage?.PoetOrCat.Poet.FullUrl}\">{GanjoorPage?.PoetOrCat.Poet.TajikNickName}\"</a>";
             }
             else
-            if (IsCatPage)
+            if (IsCatPage || IsPoemPage)
             {
                 string title = $"Ганҷур - ";
                 foreach (var gran in GanjoorPage.PoetOrCat.Cat.Ancestors)
                 {
                     title += $"{gran.TajikTitle} - ";
+                    BreadCrumpUrls += $" - <a href=\"{gran.FullUrl}\">{gran.TajikTitle}\"</a>";
                 }
-                title += GanjoorPage.PoetOrCat.Cat.TajikTitle;
-                ViewData["Title"] = title;
-            }
-            else
-            if (IsPoemPage)
-            {
-                string title = $"Ганҷур - ";
-                foreach (var gran in GanjoorPage.PoetOrCat.Cat.Ancestors)
+                if(IsCatPage)
                 {
-                    title += $"{gran.TajikTitle} - ";
+                    title += GanjoorPage.PoetOrCat.Cat.TajikTitle;
+                    BreadCrumpUrls += $" - <a href=\"{GanjoorPage?.PoetOrCat.Cat.FullUrl}\">{GanjoorPage?.PoetOrCat.Cat.TajikTitle}\"</a>";
+                }
+                else
+                {
+                    title += GanjoorPage.Poem.TajikTitle;
+                    BreadCrumpUrls += $" - <a href=\"{GanjoorPage?.FullUrl}\">{GanjoorPage?.Poem.TajikTitle}\"</a>";
                 }
-                title += GanjoorPage.Poem.TajikTitle;
                 ViewData["Title"] = title;
             }
-
+            ViewData["BreadCrumpUrls"] = BreadCrumpUrls;
             return Page();
         }
 
diff --git a/TajikGanjoor/Pages/Shared/_Layout.cshtml b/TajikGanjoor/Pages/Shared/_Layout.cshtml
index c7eb4a88..650c4904 100644
--- a/TajikGanjoor/Pages/Shared/_Layout.cshtml
+++ b/TajikGanjoor/Pages/Shared/_Layout.cshtml
@@ -12,7 +12,7 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container">
-                <a class="navbar-brand" asp-area="" asp-page="/Index">@ViewData["Title"]</a>
+                @Html.Raw(ViewData["BreadCrumpUrls"])
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>