diff --git a/GanjooRazor/Pages/Index.cshtml.cs b/GanjooRazor/Pages/Index.cshtml.cs
index d2e7785d..43660c1a 100644
--- a/GanjooRazor/Pages/Index.cshtml.cs
+++ b/GanjooRazor/Pages/Index.cshtml.cs
@@ -550,6 +550,11 @@ namespace GanjooRazor.Pages
             }
         }
 
+        private void _preparePrododyAndRelatedSecions()
+        {
+
+        }
+
         /// <summary>
         /// Get
         /// </summary>
@@ -628,6 +633,7 @@ namespace GanjooRazor.Pages
                         _preparePoemExcerpt(GanjoorPage.Poem.Previous);
                         GanjoorPage.PoetOrCat = GanjoorPage.Poem.Category;
                         _prepareNextPre();
+                        _preparePrododyAndRelatedSecions();
                         IsPoemPage = true;
                         
                         break;
diff --git a/GanjooRazor/Pages/_GanjoorPagePartial.cshtml b/GanjooRazor/Pages/_GanjoorPagePartial.cshtml
index 3358cd32..05f9be76 100644
--- a/GanjooRazor/Pages/_GanjoorPagePartial.cshtml
+++ b/GanjooRazor/Pages/_GanjoorPagePartial.cshtml
@@ -370,7 +370,7 @@
                                                 @if (!string.IsNullOrEmpty(Model.GanjoorPage.Poem.RhymeLetters))
                                                 {
                                                     <text>
-                                                        <a role="button" class="pagebutton" href="@Html.Raw($"/simi/?v={Uri.EscapeDataString(Model.GanjoorPage.Poem.GanjoorMetre.Rhythm)}&amp;g={Uri.EscapeDataString(Model.GanjoorPage.Poem.RhymeLetters)}")">شعرهای هم آهنگ<i class="info-buttons rhyming-poems"></i></a>
+                                                        <a role="button" class="pagebutton" href="@Html.Raw($"/simi/?v={Uri.EscapeDataString(Model.GanjoorPage.Poem.GanjoorMetre.Rhythm)}&amp;g={Uri.EscapeDataString(Model.GanjoorPage.Poem.RhymeLetters)}")">موارد هم آهنگ<i class="info-buttons rhyming-poems"></i></a>
                                                     </text>
                                                 }
                                             }
@@ -434,7 +434,17 @@
 
                                                     @if (Model.GanjoorPage.Poem.Top6RelatedPoems[i].PoetMorePoemsLikeThisCount > 0)
                                                     {
-                                                        <a role="button" class="pagebutton" id="@($"load-more-button-{Model.GanjoorPage.Poem.Top6RelatedPoems[i].PoetId}")" onclick="loadMoreRelatedFromPoet(@Model.GanjoorPage.Poem.Top6RelatedPoems[i].PoetId, '@Model.GanjoorPage.Poem.GanjoorMetre.Rhythm', '@Model.GanjoorPage.Poem.RhymeLetters', '@Model.GanjoorPage.Poem.FullUrl', '@Model.GanjoorPage.Poem.Top6RelatedPoems[i].FullUrl')">مشاهدهٔ @Model.GanjoorPage.Poem.Top6RelatedPoems[i].PoetMorePoemsLikeThisCount.ToPersianNumbers() شعر هم آهنگ دیگر از @Model.GanjoorPage.Poem.Top6RelatedPoems[i].PoetName<i class="info-buttons autorenew"></i></a>
+
+                                                        @if (Model.GanjoorPage.Poem.Top6RelatedPoems[i].PoetMorePoemsLikeThisCount > 20)
+                                                        {
+                                                            <a role="button" class="pagebutton" id="@($"load-more-button-{Model.GanjoorPage.Poem.Top6RelatedPoems[i].PoetId}")" href="@Html.Raw($"/simi/?v={Uri.EscapeDataString(Model.GanjoorPage.Poem.GanjoorMetre.Rhythm)}&amp;g={Uri.EscapeDataString(Model.GanjoorPage.Poem.RhymeLetters)}&amp;a={Model.GanjoorPage.Poem.Top6RelatedPoems[i].PoetId}")" target="_blank">مشاهدهٔ بیش از @Model.GanjoorPage.Poem.Top6RelatedPoems[i].PoetMorePoemsLikeThisCount.ToPersianNumbers() مورد هم آهنگ دیگر از @Model.GanjoorPage.Poem.Top6RelatedPoems[i].PoetName<i class="info-buttons autorenew"></i></a>
+                                                        }
+                                                        else
+                                                        {
+                                                            <a role="button" class="pagebutton" id="@($"load-more-button-{Model.GanjoorPage.Poem.Top6RelatedPoems[i].PoetId}")" onclick="loadMoreRelatedFromPoet(@Model.GanjoorPage.Poem.Top6RelatedPoems[i].PoetId, '@Model.GanjoorPage.Poem.GanjoorMetre.Rhythm', '@Model.GanjoorPage.Poem.RhymeLetters', '@Model.GanjoorPage.Poem.FullUrl', '@Model.GanjoorPage.Poem.Top6RelatedPoems[i].FullUrl')">مشاهدهٔ @Model.GanjoorPage.Poem.Top6RelatedPoems[i].PoetMorePoemsLikeThisCount.ToPersianNumbers() مورد هم آهنگ دیگر از @Model.GanjoorPage.Poem.Top6RelatedPoems[i].PoetName<i class="info-buttons autorenew"></i></a>
+                                                        }
+
+                                                        
                                                     }
                                                 </div>
 
diff --git a/GanjooRazor/Pages/_SimiPage.cshtml.cs b/GanjooRazor/Pages/_SimiPage.cshtml.cs
index 6e43dc0e..ff20b8cd 100644
--- a/GanjooRazor/Pages/_SimiPage.cshtml.cs
+++ b/GanjooRazor/Pages/_SimiPage.cshtml.cs
@@ -27,7 +27,7 @@ namespace GanjooRazor.Pages
         {
             if (string.IsNullOrEmpty(Request.Query["v"]) || string.IsNullOrEmpty(Request.Query["g"]))
             {
-                GanjoorPage.HtmlText = "<p>شعری با مشخصات انتخاب شده یافت نشد.</p>";
+                GanjoorPage.HtmlText = "<p>موردی با مشخصات انتخاب شده یافت نشد.</p>";
                 return;
             }
 
@@ -53,7 +53,7 @@ namespace GanjooRazor.Pages
 
             var poems = JArray.Parse(await response.Content.ReadAsStringAsync()).ToObject<List<GanjoorPoemCompleteViewModel>>();
 
-            GanjoorPage.Title = "شعرهای ";
+            GanjoorPage.Title = "شعرها یا ابیات ";
 
             if (auther != "0")
             {
@@ -166,7 +166,7 @@ namespace GanjooRazor.Pages
             List<int> poetMorePoemsLikeThisCount = new List<int>();
             var poems = JArray.Parse(await response.Content.ReadAsStringAsync()).ToObject<List<GanjoorPoemCompleteViewModel>>();
             if (poems.Any(p => p.FullUrl == skipPoemFullUrl1))
-                poems.Remove(poems.Single(p => p.FullUrl == skipPoemFullUrl1));
+                poems.Remove(poems.Single(p => p.FullUrl == skipPoemFullUrl1)); //TODO: fix errors here
             if (poems.Any(p => p.FullUrl == skipPoemFullUrl2))
                 poems.Remove(poems.Single(p => p.FullUrl == skipPoemFullUrl2));
 
diff --git a/GanjooRazor/Pages/_SimiPartialView.cshtml b/GanjooRazor/Pages/_SimiPartialView.cshtml
index 3395d6b6..75d0a37d 100644
--- a/GanjooRazor/Pages/_SimiPartialView.cshtml
+++ b/GanjooRazor/Pages/_SimiPartialView.cshtml
@@ -19,7 +19,15 @@
 
         @if (Model.RelatedPoems[i].PoetMorePoemsLikeThisCount > 0)
         {
-            <a role="button" class="pagebutton" id="@($"load-more-button-{Model.RelatedPoems[i].PoetId}")" onclick="loadMoreRelatedFromPoet(@Model.RelatedPoems[i].PoetId, '@Model.Rhythm', '@Model.RhymeLetters', '@Model.PoemFullUrl', '@Model.RelatedPoems[i].FullUrl')">مشاهدهٔ @Model.RelatedPoems[i].PoetMorePoemsLikeThisCount.ToPersianNumbers() شعر هم آهنگ دیگر از @Model.RelatedPoems[i].PoetName<i class="info-buttons">autorenew</i></a>
+            @if (Model.RelatedPoems[i].PoetMorePoemsLikeThisCount > 20)
+            {
+                <a role="button" class="pagebutton" id="@($"load-more-button-{Model.RelatedPoems[i].PoetId}")" href="@Html.Raw($"/simi/?v={Uri.EscapeDataString(Model.Rhythm)}&amp;g={Uri.EscapeDataString(Model.RhymeLetters)}&amp;a={Model.RelatedPoems[i].PoetId}")" target="_blank">مشاهدهٔ بیش از @Model.RelatedPoems[i].PoetMorePoemsLikeThisCount.ToPersianNumbers() مورد هم آهنگ دیگر از @Model.RelatedPoems[i].PoetName<i class="info-buttons autorenew"></i></a>
+            }
+            else
+            {
+                <a role="button" class="pagebutton" id="@($"load-more-button-{Model.RelatedPoems[i].PoetId}")" onclick="loadMoreRelatedFromPoet(@Model.RelatedPoems[i].PoetId, '@Model.Rhythm', '@Model.RhymeLetters', '@Model.PoemFullUrl', '@Model.RelatedPoems[i].FullUrl')">مشاهدهٔ @Model.RelatedPoems[i].PoetMorePoemsLikeThisCount.ToPersianNumbers() مورد هم آهنگ دیگر از @Model.RelatedPoems[i].PoetName<i class="info-buttons">autorenew</i></a>
+            }
+
         }
     </div>
     @if (Model.RelatedPoems[i].PoetMorePoemsLikeThisCount > 0)