diff --git a/src/components/cursor-catcher.astro b/src/components/cursor-catcher.astro
new file mode 100644
index 0000000..e0b1602
--- /dev/null
+++ b/src/components/cursor-catcher.astro
@@ -0,0 +1,9 @@
+---
+export interface Props {
+  id: string;
+}
+
+const { id } = Astro.props;
+---
+
+<div class="absolute hidden h-full w-full cursor-wait" id={id}></div>
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index f64bdf6..4ecffc9 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -15,7 +15,10 @@ const { title } = Astro.props;
     <meta name="generator" content={Astro.generator} />
     <title>{title}</title>
   </head>
-  <body class="h-full font-mono dark:bg-neutral-800 dark:text-neutral-300">
+  <body
+    class="h-full font-mono dark:bg-neutral-800 dark:text-neutral-300"
+    id="body"
+  >
     <slot />
   </body>
 </html>
diff --git a/src/pages/delete.astro b/src/pages/delete.astro
index 1ec9d90..ad4d3ed 100644
--- a/src/pages/delete.astro
+++ b/src/pages/delete.astro
@@ -1,15 +1,19 @@
 ---
 import Layout from "../layouts/Layout.astro";
 import CenterXy from "../components/center-xy.astro";
+import CursorCatcher from "../components/cursor-catcher.astro";
+
 import "../styles/global.css";
 ---
 
 <Layout title="Delete a key">
+  <CursorCatcher id="cursor-catcher" />
   <CenterXy>
     <form
       action="((%u))api/delete"
       method="get"
       class="flex max-w-full flex-col"
+      onsubmit="document.getElementById('submit-button').classList.add('cursor-wait'); document.getElementById('cursor-catcher').classList.remove('hidden')"
     >
       <label for="email" class="mt-3 text-xl font-bold"
         >Request key deletion:</label
@@ -23,7 +27,9 @@ import "../styles/global.css";
         class="input mt-3 focus:rounded-lg"
         required
       />
-      <button type="submit" class="button mt-4 self-end">Delete</button>
+      <button type="submit" id="submit-button" class="button mt-4 self-end"
+        >Delete</button
+      >
     </form>
   </CenterXy>
 </Layout>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 0467dd1..a2885d9 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,7 +1,8 @@
 ---
 import Layout from "../layouts/Layout.astro";
-import "../styles/global.css";
 import CenterXy from "../components/center-xy.astro";
+
+import "../styles/global.css";
 ---
 
 <Layout title="Manage keys">
diff --git a/src/pages/success.astro b/src/pages/status.astro
similarity index 88%
rename from src/pages/success.astro
rename to src/pages/status.astro
index 8ae6b45..34a8fea 100644
--- a/src/pages/success.astro
+++ b/src/pages/status.astro
@@ -3,7 +3,7 @@ import Layout from "../layouts/Layout.astro";
 import CenterXy from "../components/center-xy.astro";
 ---
 
-<Layout title="Success!">
+<Layout title="((%s))">
   <CenterXy>
     <h1 class="text-4xl font-bold">((%m))</h1>
   </CenterXy>
diff --git a/src/pages/submit.astro b/src/pages/submit.astro
index 39564b1..6728213 100644
--- a/src/pages/submit.astro
+++ b/src/pages/submit.astro
@@ -1,15 +1,19 @@
 ---
 import Layout from "../layouts/Layout.astro";
-import "../styles/global.css";
 import CenterXy from "../components/center-xy.astro";
+import CursorCatcher from "../components/cursor-catcher.astro";
+
+import "../styles/global.css";
 ---
 
 <Layout title="Submit a key">
+  <CursorCatcher id="cursor-catcher" />
   <CenterXy>
     <form
       action="((%u))api/submit"
       method="post"
       class="flex max-w-full flex-col"
+      onsubmit="document.getElementById('submit-button').classList.add('cursor-wait'); document.getElementById('cursor-catcher').classList.remove('hidden')"
     >
       <label for="key" class="text-xl font-bold"
         >Paste your pgp keyblock here:</label
@@ -21,8 +25,11 @@ import CenterXy from "../components/center-xy.astro";
         rows="20"
         class="input mt-3 resize-none"
         placeholder="-----BEGIN PGP PUBLIC KEY BLOCK-----"
+        spellcheck="false"
         required></textarea>
-      <button type="submit" class="button mt-6 self-end">Submit</button>
+      <button type="submit" id="submit-button" class="button mt-6 self-end"
+        >Submit</button
+      >
     </form>
   </CenterXy>
 </Layout>
