diff --git a/Pages/Index.cshtml b/Pages/Index.cshtml
index a3bc793..ea27846 100644
--- a/Pages/Index.cshtml
+++ b/Pages/Index.cshtml
@@ -54,10 +54,6 @@
                     <div class="card-body d-flex flex-column">
                         <h5 class="card-title mb-1">@item.Title</h5>
                         <div class="text-muted small">@item.Date.ToString("yyyy-MM-dd") · @item.Author</div>
-                        @if (!string.IsNullOrWhiteSpace(item.Keywords))
-                        {
-                            <div class="mt-2 text-body-secondary small">@item.Keywords</div>
-                        }
                         <div class="mt-auto pt-2">
                             <span class="badge text-bg-light">@((item.FileCount ?? 0).ToString()) files</span>
                         </div>
@@ -74,12 +70,23 @@
         <ul class="pagination mb-0">
             <li class="page-item @(Model.PageNumber <= 1 ? "disabled" : "")">
                 <a class="page-link"
+                   href="@Url.Page("Index", null, new { p = 1, keyword = Model.Keyword })"
+                   aria-label="First">
+                    <span aria-hidden="true">««</span>
+                </a>
+            </li>
+            <li class="page-item @(Model.PageNumber <= 1 ? "disabled" : "")">
+                <a class="page-link"
                    href="@Url.Page("Index", null, new { p = Model.PageNumber - 1, keyword = Model.Keyword })"
                    aria-label="Previous">
                     <span aria-hidden="true">«</span>
                 </a>
             </li>
-            @for (var i = 1; i <= Model.TotalPages; i++)
+            @{
+                var startPage = Math.Max(1, Model.PageNumber - 1);
+                var endPage = Math.Min(Model.TotalPages, Model.PageNumber + 1);
+            }
+            @for (var i = startPage; i <= endPage; i++)
             {
                 <li class="page-item @(i == Model.PageNumber ? "active" : "")">
                     <a class="page-link" href="@Url.Page("Index", null, new { p = i, keyword = Model.Keyword })">@i</a>
@@ -92,7 +99,15 @@
                     <span aria-hidden="true">»</span>
                 </a>
             </li>
+            <li class="page-item @(Model.PageNumber >= Model.TotalPages ? "disabled" : "")">
+                <a class="page-link"
+                   href="@Url.Page("Index", null, new { p = Model.TotalPages, keyword = Model.Keyword })"
+                   aria-label="Last">
+                    <span aria-hidden="true">»»</span>
+                </a>
+            </li>
         </ul>
+        <div class="small text-muted mt-2">Page @Model.PageNumber / @Model.TotalPages</div>
     </nav>
 }
 
@@ -108,12 +123,27 @@
 @section Scripts {
     <script>
         const waitOverlay = document.getElementById("thumbWait");
+        function isBackForwardNavigation() {
+            const navEntry = performance.getEntriesByType("navigation")[0];
+            return navEntry?.type === "back_forward";
+        }
+
+        window.addEventListener("pageshow", event => {
+            if (event.persisted || isBackForwardNavigation()) {
+                waitOverlay?.classList.add("d-none");
+            }
+        });
+
         document.querySelectorAll("[data-folder-link='true']").forEach(link => {
             link.addEventListener("click", async event => {
                 if (event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) {
                     return;
                 }
 
+                if (isBackForwardNavigation()) {
+                    return;
+                }
+
                 const folderId = link.dataset.folderId;
                 if (!folderId) {
                     return;