diff --git a/internal/http/templates/servers_edit.html b/internal/http/templates/servers_edit.html
index 64489ef..2f982ee 100644
--- a/internal/http/templates/servers_edit.html
+++ b/internal/http/templates/servers_edit.html
@@ -22,16 +22,26 @@ <h1>Edit Server</h1>
   {{end}}
 
   <form method="POST" action="servers/{{.Server.ID}}/edit">
-    <fieldset>
+    <div class="card">
+      <h3>Connection Details</h3>
       <label>Name<input type="text" name="name" value="{{.Server.Name}}" placeholder="my-worker-01" required autofocus></label>
       <label>Host<input type="text" name="host" value="{{.Server.Host}}" placeholder="192.168.1.10" required></label>
       <div class="grid">
         <label>Port<input type="number" name="port" value="{{.Server.Port}}" placeholder="22"></label>
         <label>User<input type="text" name="user" value="{{.Server.User}}" placeholder="root"></label>
       </div>
-      <label>SSH Private Key<textarea name="ssh_key" rows="8" placeholder="Leave empty to keep current key"></textarea><small>Paste a new key only if you want to replace the current one</small></label>
-    </fieldset>
-    <button type="submit" class="btn btn-primary">Save Changes</button>
+    </div>
+    <div class="card">
+      <h3>SSH Key</h3>
+      <label>
+        <textarea name="ssh_key" rows="8" placeholder="Leave empty to keep current key"></textarea>
+        <small>Paste a new key only if you want to replace the current one</small>
+      </label>
+    </div>
+    <div style="display:flex;gap:0.6em;align-items:center">
+      <button type="submit" class="btn btn-primary">Save Changes</button>
+      <a href="servers/{{.Server.ID}}" class="btn btn-ghost">Cancel</a>
+    </div>
   </form>
 </div>
 {{template "scripts" .}}