diff --git a/GanjooRazor/Areas/User/Pages/AllPoemSections.cshtml b/GanjooRazor/Areas/User/Pages/AllPoemSections.cshtml
index 0babc8a4..5e8c10b5 100644
--- a/GanjooRazor/Areas/User/Pages/AllPoemSections.cshtml
+++ b/GanjooRazor/Areas/User/Pages/AllPoemSections.cshtml
@@ -16,6 +16,17 @@ else
     <table>
         @foreach (var poemSection in Model.PoemSections)
         {
+            @if (poemSection.SectionType == RMuseum.Models.Ganjoor.PoemSectionType.WholePoem)
+            {
+                <tr>
+                    <td colspan="2">
+                        <a href="/User/Section?poemId=@poemSection.PoemId&index=@poemSection.Index">
+                            قطعهٔ @(poemSection.Number.ToPersianNumbers()):
+                        </a>
+                    </td>
+                </tr>
+            }
+
             <tr>
                 <td colspan="2">
                     @Html.Raw(poemSection.HtmlText)
@@ -58,12 +69,12 @@ else
             </tr>
 
 
-             <tr>
+            <tr>
                 <td>
                     وزن
                 </td>
                 <td>
-                    @(poemSection.GanjoorMetre == null ? "" : poemSection.GanjoorMetre.Rhythm)
+                    @(poemSection.GanjoorMetre == null ? "تعیین نشده" : poemSection.GanjoorMetre.Rhythm)
                 </td>
             </tr>
 
diff --git a/GanjooRazor/Areas/User/Pages/Section.cshtml b/GanjooRazor/Areas/User/Pages/Section.cshtml
index aeff2a55..3749ae54 100644
--- a/GanjooRazor/Areas/User/Pages/Section.cshtml
+++ b/GanjooRazor/Areas/User/Pages/Section.cshtml
@@ -25,7 +25,7 @@ else
                 }
             }
 
-            if(breakFromVIndices.length > 1){
+            if (breakFromVIndices.length > 1) {
                 alert('حداکثر از ۱ محل می‌توانید قطعه را بشکنید.');
                 return;
             }
@@ -72,6 +72,12 @@ else
 
         }
     </script>
+    <p><a role="button" target="_blank" href="@Model.PageInformation.FullUrl" class="actionlink">@Model.PageInformation.FullTitle</a></p>
+    <p>
+        <a href="/User/AllPoemSections?id=@Model.PageInformation.Id">
+            همهٔ قطعات شعر
+        </a>
+    </p>
     <table>
         <tr>
             <td>
@@ -181,18 +187,18 @@ else
             {
                 <tr>
                     <td>
-                        @if(Model.MyLastEdit != null 
-                            &&
-                            (
-                            Model.MyLastEdit.BreakFromVerse1VOrder == Model.Verses[v].VOrder 
-                            ||
-                            Model.MyLastEdit.BreakFromVerse2VOrder == Model.Verses[v].VOrder 
-                            ||
-                            Model.MyLastEdit.BreakFromVerse3VOrder == Model.Verses[v].VOrder 
-                            ||
-                            Model.MyLastEdit.BreakFromVerse4VOrder == Model.Verses[v].VOrder 
-                            )
-                        )
+                        @if (Model.MyLastEdit != null
+                       &&
+                       (
+                       Model.MyLastEdit.BreakFromVerse1VOrder == Model.Verses[v].VOrder
+                       ||
+                       Model.MyLastEdit.BreakFromVerse2VOrder == Model.Verses[v].VOrder
+                       ||
+                       Model.MyLastEdit.BreakFromVerse3VOrder == Model.Verses[v].VOrder
+                       ||
+                       Model.MyLastEdit.BreakFromVerse4VOrder == Model.Verses[v].VOrder
+                       )
+                       )
                         {
                             <input type="checkbox" name="break-from-@v" id="break-from-@v" checked />
                         }
@@ -200,8 +206,8 @@ else
                         {
                             <input type="checkbox" name="break-from-@v" id="break-from-@v" />
                         }
-                        
-                        @Model.Verses[v].Text 
+
+                        @Model.Verses[v].Text
                     </td>
                 </tr>
             }