diff --git a/GanjooRazor/Pages/AudioClip.cshtml b/GanjooRazor/Pages/AudioClip.cshtml
index f1f4a053..b338c7b9 100644
--- a/GanjooRazor/Pages/AudioClip.cshtml
+++ b/GanjooRazor/Pages/AudioClip.cshtml
@@ -150,7 +150,7 @@
         </p>
 
         <script src="~/lib/jquery/dist/jquery.min.js"></script>
-        <script src="~/js/bk.js?version=71"></script>
+        <script src="~/js/bk.js?version=72"></script>
         <script src="~/js/jplayersupport.js"></script>
         <script src="~/js/vaabd.js?version=10"></script>
         <script src="~/dist/jplayer/jquery.jplayer.min.js"></script>
diff --git a/GanjooRazor/Pages/Books.cshtml b/GanjooRazor/Pages/Books.cshtml
index c653e603..8eb25fab 100644
--- a/GanjooRazor/Pages/Books.cshtml
+++ b/GanjooRazor/Pages/Books.cshtml
@@ -16,7 +16,7 @@
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=71"></script>
+    <script src="/js/bk.js?version=72"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/FAQ.cshtml b/GanjooRazor/Pages/FAQ.cshtml
index ad544ab1..0e6f53f9 100644
--- a/GanjooRazor/Pages/FAQ.cshtml
+++ b/GanjooRazor/Pages/FAQ.cshtml
@@ -16,7 +16,7 @@
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=71"></script>
+    <script src="/js/bk.js?version=72"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Hashieha.cshtml b/GanjooRazor/Pages/Hashieha.cshtml
index 1e8798dc..11ccd00c 100644
--- a/GanjooRazor/Pages/Hashieha.cshtml
+++ b/GanjooRazor/Pages/Hashieha.cshtml
@@ -18,7 +18,7 @@
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=71"></script>
+    <script src="/js/bk.js?version=72"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Index.cshtml b/GanjooRazor/Pages/Index.cshtml
index fd85b266..1d29a4d7 100644
--- a/GanjooRazor/Pages/Index.cshtml
+++ b/GanjooRazor/Pages/Index.cshtml
@@ -17,7 +17,7 @@
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml">
     <script src="/lib/jquery/dist/jquery.min.js"></script>
     <script src="/js/chart.js"></script>
-    <script src="/js/bk.js?version=71"></script>
+    <script src="/js/bk.js?version=72"></script>
     <script src="/js/jquery.mark.min.js"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
diff --git a/GanjooRazor/Pages/Map.cshtml b/GanjooRazor/Pages/Map.cshtml
index 0c979815..c59a1a14 100644
--- a/GanjooRazor/Pages/Map.cshtml
+++ b/GanjooRazor/Pages/Map.cshtml
@@ -23,7 +23,7 @@
             font-family: 'Vazir'
         }
     </style>
-    <script src="/js/bk.js?version=71"></script>
+    <script src="/js/bk.js?version=72"></script>
     <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="~/js/leaflet.js"></script>
     <script src="~/js/leaflet-providers.js"></script>
diff --git a/GanjooRazor/Pages/Photos.cshtml b/GanjooRazor/Pages/Photos.cshtml
index 0e111db5..d489a49a 100644
--- a/GanjooRazor/Pages/Photos.cshtml
+++ b/GanjooRazor/Pages/Photos.cshtml
@@ -15,7 +15,7 @@
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=71"></script>
+    <script src="/js/bk.js?version=72"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Quotes.cshtml b/GanjooRazor/Pages/Quotes.cshtml
index 8767a040..2bb9e528 100644
--- a/GanjooRazor/Pages/Quotes.cshtml
+++ b/GanjooRazor/Pages/Quotes.cshtml
@@ -16,7 +16,7 @@
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=71"></script>
+    <script src="/js/bk.js?version=72"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/ReportRecitation.cshtml b/GanjooRazor/Pages/ReportRecitation.cshtml
index a5ae09d6..13b81e1c 100644
--- a/GanjooRazor/Pages/ReportRecitation.cshtml
+++ b/GanjooRazor/Pages/ReportRecitation.cshtml
@@ -238,7 +238,7 @@
 
 
 
-                <script src="~/js/bk.js?version=71"></script>
+                <script src="~/js/bk.js?version=72"></script>
                 <script src="~/js/jplayersupport.js"></script>
                 <script src="~/js/vaabd.js?version=10"></script>
                 <script src="~/dist/jplayer/jquery.jplayer.min.js"></script>
diff --git a/GanjooRazor/Pages/Search.cshtml b/GanjooRazor/Pages/Search.cshtml
index 728eec77..e080118d 100644
--- a/GanjooRazor/Pages/Search.cshtml
+++ b/GanjooRazor/Pages/Search.cshtml
@@ -22,7 +22,7 @@
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/js/chart.js"></script>
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=71"></script>
+    <script src="/js/bk.js?version=72"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
index 3a6f2668..9c53818d 100644
--- a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
+++ b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
@@ -35,7 +35,7 @@
         });
     </script>
 
-    <script src="/js/bk.js?version=71"></script>
+    <script src="/js/bk.js?version=72"></script>
     <script>
         function editBanner(bannerId) {
             var url = '?handler=Edit';
diff --git a/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml b/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
index 9fb7220e..c3f9410e 100644
--- a/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
+++ b/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
@@ -32,7 +32,7 @@
         });
     </script>
     <script src="/lib/diff.js"></script>
-    <script src="/js/bk.js?version=71"></script>
+    <script src="/js/bk.js?version=72"></script>
     <script>
         function compareCorrectionBlocks(originalElemenyId, editedElementId, resultElementId) {
             var a = document.getElementById(originalElemenyId);
diff --git a/GanjooRazor/Pages/Simi.cshtml b/GanjooRazor/Pages/Simi.cshtml
index c1d9a5e5..6461a123 100644
--- a/GanjooRazor/Pages/Simi.cshtml
+++ b/GanjooRazor/Pages/Simi.cshtml
@@ -18,7 +18,7 @@
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=71"></script>
+    <script src="/js/bk.js?version=72"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Tagged.cshtml b/GanjooRazor/Pages/Tagged.cshtml
index 06d0c179..a8248190 100644
--- a/GanjooRazor/Pages/Tagged.cshtml
+++ b/GanjooRazor/Pages/Tagged.cshtml
@@ -18,7 +18,7 @@
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=71"></script>
+    <script src="/js/bk.js?version=72"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/_GanjoorPagePartial.cshtml b/GanjooRazor/Pages/_GanjoorPagePartial.cshtml
index ea289587..09054372 100644
--- a/GanjooRazor/Pages/_GanjoorPagePartial.cshtml
+++ b/GanjooRazor/Pages/_GanjoorPagePartial.cshtml
@@ -255,7 +255,22 @@
 
                 @if (Model.IsCatPage || Model.IsPoetPage)
                 {
-                    <div class="tabcontent related-images-frame" id="words">
+                    <div class="poemtab">
+                        <div class="poemtablinks"><a href="#stats">آمار</a></div>
+                        @if (Model.IsPoetPage)
+                        {
+                            <div class="poemtablinks"><a href="#quoteds">مشق شعر</a></div>
+                        }
+                        <div class="poemtablinks active"><a href="#words" onclick="javascript:loadWordCounts(@Model.GanjoorPage.PoetOrCat.Cat.Id, @Model.GanjoorPage.PoetOrCat.Poet.Id, false)">واژگان</a></div>
+                        <div class="poemtablinks"><a href="#recitations" onclick="javascript:loadCatRecitations(@Model.GanjoorPage.PoetOrCat.Cat.Id)">خوانش‌ها</a></div>
+                        @if (Model.IsPoetPage)
+                        {
+                            <div class="poemtablinks"><a href="#photos">تصاویر چهره</a></div>
+                            <div class="poemtablinks"><a href="#papersources">منابع کاغذی</a></div>
+                        }
+
+                    </div>
+                    <div class="related-images-frame poemtabcontent" id="words">
                         <div class="century cursor-pointer" id="load-word-counts" onclick="loadWordCounts(@Model.GanjoorPage.PoetOrCat.Cat.Id, @Model.GanjoorPage.PoetOrCat.Poet.Id, false)">
                             محاسبهٔ بسامد واژٰگان.
                         </div>
@@ -271,7 +286,22 @@
                     </div>
 
 
-                    <div class="tabcontent related-images-frame" id="recitations">
+                    <div class="poemtab">
+                        <div class="poemtablinks"><a href="#stats">آمار</a></div>
+                        @if (Model.IsPoetPage)
+                        {
+                            <div class="poemtablinks"><a href="#quoteds">مشق شعر</a></div>
+                        }
+                        <div class="poemtablinks"><a href="#words" onclick="javascript:loadWordCounts(@Model.GanjoorPage.PoetOrCat.Cat.Id, @Model.GanjoorPage.PoetOrCat.Poet.Id, false)">واژگان</a></div>
+                        <div class="poemtablinks active"><a href="#recitations" onclick="javascript:loadCatRecitations(@Model.GanjoorPage.PoetOrCat.Cat.Id)">خوانش‌ها</a></div>
+                        @if (Model.IsPoetPage)
+                        {
+                            <div class="poemtablinks"><a href="#photos">تصاویر چهره</a></div>
+                            <div class="poemtablinks"><a href="#papersources">منابع کاغذی</a></div>
+                        }
+                    </div>
+
+                    <div class="related-images-frame poemtabcontent" id="recitations">
                         @if (Model.CategoryHasRecitations)
                         {
                             <div class="century cursor-pointer" id="load-cat-recitations" onclick="loadCatRecitations(@Model.GanjoorPage.PoetOrCat.Cat.Id)">
@@ -288,7 +318,21 @@
 
                     @if (Model.IsPoetPage)
                     {
-                        <div class="tabcontent" id="photos">
+                        <div class="poemtab">
+                            <div class="poemtablinks"><a href="#stats">آمار</a></div>
+                            @if (Model.IsPoetPage)
+                            {
+                                <div class="poemtablinks"><a href="#quoteds">مشق شعر</a></div>
+                            }
+                            <div class="poemtablinks"><a href="#words" onclick="javascript:loadWordCounts(@Model.GanjoorPage.PoetOrCat.Cat.Id, @Model.GanjoorPage.PoetOrCat.Poet.Id, false)">واژگان</a></div>
+                            <div class="poemtablinks"><a href="#recitations" onclick="javascript:loadCatRecitations(@Model.GanjoorPage.PoetOrCat.Cat.Id)">خوانش‌ها</a></div>
+                            @if (Model.IsPoetPage)
+                            {
+                                <div class="poemtablinks active"><a href="#photos">تصاویر چهره</a></div>
+                                <div class="poemtablinks"><a href="#papersources">منابع کاغذی</a></div>
+                            }
+                        </div>
+                        <div id="photos" class="poemtabcontent">
                             <div class="related-images-frame">
                                 @if (Model.Photo != null)
                                 {
@@ -315,7 +359,22 @@
                         </div>
                         if (Model.GanjoorPage.SecondPoet == null)
                         {
-                            <div class="tabcontent related-images-frame" id="papersources">
+                            <div class="poemtab">
+                                <div class="poemtablinks"><a href="#stats">آمار</a></div>
+                                @if (Model.IsPoetPage)
+                                {
+                                    <div class="poemtablinks"><a href="#quoteds">مشق شعر</a></div>
+                                }
+                                <div class="poemtablinks"><a href="#words" onclick="javascript:loadWordCounts(@Model.GanjoorPage.PoetOrCat.Cat.Id, @Model.GanjoorPage.PoetOrCat.Poet.Id, false)">واژگان</a></div>
+                                <div class="poemtablinks"><a href="#recitations" onclick="javascript:loadCatRecitations(@Model.GanjoorPage.PoetOrCat.Cat.Id)">خوانش‌ها</a></div>
+                                @if (Model.IsPoetPage)
+                                {
+                                    <div class="poemtablinks"><a href="#photos">تصاویر چهره</a></div>
+                                    <div class="poemtablinks active"><a href="#papersources">منابع کاغذی</a></div>
+                                }
+                            </div>
+
+                            <div class="poemtabcontent related-images-frame" id="papersources">
                                 <div class="related-images">
                                     @if (Model.GanjoorPage.PoetOrCat.Cat.PaperSources != null && Model.GanjoorPage.PoetOrCat.Cat.PaperSources.Any())
                                     {
diff --git a/GanjooRazor/wwwroot/js/bk.js b/GanjooRazor/wwwroot/js/bk.js
index 2363ca7d..e5f52f47 100644
--- a/GanjooRazor/wwwroot/js/bk.js
+++ b/GanjooRazor/wwwroot/js/bk.js
@@ -1653,9 +1653,9 @@ function loadWordCounts(catId, poetId, remStopWords) {
         success: function (data) {
             if (document.getElementById("remove-this-wordcounts") != null) {
                 document.getElementById("remove-this-wordcounts").remove();
-                if (document.getElementById("load-word-counts") != null) {
+                /*if (document.getElementById("load-word-counts") != null) {
                     document.getElementById("percent-button").style.display = 'inline-block';
-                }
+                }*/
                 $(data).appendTo(divParent);
                 plotChart('words-stats');
             }
diff --git a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-TOC.cs b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-TOC.cs
index 870dd220..4cce9844 100644
--- a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-TOC.cs
+++ b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-TOC.cs
@@ -698,11 +698,14 @@ namespace RMuseum.Services.Implementation
             html += $"<div id=\"poempretab\"></div>{Environment.NewLine}";
             html += $"<div class=\"poemtab\">{Environment.NewLine}";
             html += $"<div class=\"poemtablinks{(active == "stats" ? " active" : "")}\"><a href=\"#stats\">آمار</a></div>{Environment.NewLine}";
+            if (cat.ParentId == null)
+            {
+                html += $"<div class=\"poemtablinks{(active == "quoteds" ? " active" : "")}\"><a href=\"#quoteds\">مشق شعر</a></div>{Environment.NewLine}";
+            }
             html += $"<div class=\"poemtablinks{(active == "words" ? " active" : "")}\"><a href=\"#words\" onclick=\"javascript:loadWordCounts({cat.Id}, {cat.PoetId}, false)\">واژگان</a></div>{Environment.NewLine}";
             html += $"<div class=\"poemtablinks{(active == "recitations" ? " active" : "")}\"><a href=\"#recitations\" onclick=\"javascript:loadCatRecitations({cat.Id})\">خوانش‌ها</a></div>{Environment.NewLine}";
             if (cat.ParentId == null)
             {
-                html += $"<div class=\"poemtablinks{(active == "quoteds" ? " active" : "")}\"><a href=\"#quoteds\">مشق شعر</a></div>{Environment.NewLine}";
                 html += $"<div class=\"poemtablinks{(active == "photos" ? " active" : "")}\"><a href=\"#photos\">تصاویر چهره</a></div> {Environment.NewLine}";
                 html += $"<div class=\"poemtablinks{(active == "papersources" ? " active" : "")}\"><a href=\"#papersources\">منابع کاغذی</a></div> {Environment.NewLine}";
             }