diff --git a/assets/js/page_upload.js b/assets/js/page_upload.js
index d656d2495f5b76e3d8f0928f069df8a04ec8a9fb..ecdc73c0907fdc3d2f05b25749899067be018a27 100644
--- a/assets/js/page_upload.js
+++ b/assets/js/page_upload.js
@@ -58,14 +58,16 @@ element.addEventListener("change", () => {
             });
             image_container.classList.remove("uploading");
             if (response.ok) {
-                image_link.href = "/" + json.id + ".png";
-                image.src = "/" + json.id + ".png";
+                const data = await response.json();
+                image_link.href = "/" + data.id + ".png";
+                image.src = "/" + data.id + ".png";
             } else {
+                const data = await response.json();
                 const image_error = document.createElement("div");
                 image_error.classList.add("alert", "error");
-                image_error.innerText = JSON.stringify(json.errors);
+                image_error.innerText = JSON.stringify(data.errors);
                 image_container.insertBefore(image_error, image_description);
-                console.log(json);
+                console.log(data);
             }
         });
         reader.readAsDataURL(file);
diff --git a/templates/image_list.html b/templates/image_list.html
index 5f8383380e3493229eba5b8291bece60ca107975..718dda15cd95036259b14a474d41dd06658033a7 100644
--- a/templates/image_list.html
+++ b/templates/image_list.html
@@ -26,14 +26,17 @@
     <ul class="pagination">
         <li class="page">
             {{- if lt 0 .Previous -}}
-                <a class="button" href="/me/images/{{- .Previous -}}">Previous page</a>
+                <a class="button" href="/me/images/1">First</a>
+                <a class="button" href="/me/images/{{- .Previous -}}">Previous</a>
             {{- else -}}
-                <a class="button" aria-disabled="true">Previous page</a>
+                <a class="button" aria-disabled="true">First</a>
+                <a class="button" aria-disabled="true">Previous</a>
             {{- end -}}
         </li>
         <li class="page current">Page {{ .Current }}</li>
         <li class="page">
-            <a class="button" href="/me/images/{{- .Next -}}">Next page</a>
+            <a class="button" href="/me/images/{{- .Next -}}">Next</a>
+            <a class="button" aria-disabled="true">Last</a>
         </li>
     </ul>
 </div>