diff --git a/app/assets/stylesheets/card-perma.css b/app/assets/stylesheets/card-perma.css
index fd506aa17..0693cd05e 100644
--- a/app/assets/stylesheets/card-perma.css
+++ b/app/assets/stylesheets/card-perma.css
@@ -133,7 +133,7 @@
     background-color: var(--color-container);
     border-radius: 0.2em;
     grid-area: card;
-    padding: clamp(2rem, 4vw, var(--padding-block)) clamp(16px, 4vw, var(--padding-inline));
+    padding: clamp(2rem, 4vw, var(--padding-block));
   }
 
   .card-perma__actions {
diff --git a/app/helpers/hotkeys_helper.rb b/app/helpers/hotkeys_helper.rb
index 062f6ca2d..3e75081f9 100644
--- a/app/helpers/hotkeys_helper.rb
+++ b/app/helpers/hotkeys_helper.rb
@@ -5,7 +5,9 @@ module HotkeysHelper
       if key == "ctrl" && platform.mac?
         "⌘"
       elsif key == "enter"
-        platform.mac? ? "return" : "enter"
+        "⏎"
+      elsif key == "shift"
+        "⇧"
       else
         key
       end.capitalize
diff --git a/app/models/filter/fields.rb b/app/models/filter/fields.rb
index c44dff996..0e1c62e0a 100644
--- a/app/models/filter/fields.rb
+++ b/app/models/filter/fields.rb
@@ -18,7 +18,9 @@ module Filter::Fields
     def indexed_by_human_name(index)
       case index
       when "postponing_soon"
-        "Auto-closing soon"
+        "Closing soon"
+      when "closed"
+        "Done"
       when "all"
         "Open"
       else
diff --git a/app/views/account/join_codes/edit.html.erb b/app/views/account/join_codes/edit.html.erb
index 14958a44c..44854c6d0 100644
--- a/app/views/account/join_codes/edit.html.erb
+++ b/app/views/account/join_codes/edit.html.erb
@@ -11,7 +11,7 @@
   </div>
 <% end %>
 
-<article class="panel center shadow flex flex-column gap-half" style="view-transition-name: <%= dom_id(@join_code) %>">
+<article class="panel panel--wide center shadow flex flex-column gap-half" style="view-transition-name: <%= dom_id(@join_code) %>">
   <header class="margin-block-end-half">
     <h2 class="txt-large margin-none font-weight-black"><%= @page_title %></h2>
     <p class="txt-medium margin-none">How many times can this link be used to join the account?</p>
diff --git a/app/views/account/join_codes/show.html.erb b/app/views/account/join_codes/show.html.erb
index da1527501..d16006019 100644
--- a/app/views/account/join_codes/show.html.erb
+++ b/app/views/account/join_codes/show.html.erb
@@ -11,7 +11,7 @@
   </div>
 <% end %>
 
-<div class="panel shadow center flex flex-column gap" style="view-transition-name: <%= dom_id(@join_code) %>">
+<div class="panel panel--wide shadow center flex flex-column gap" style="view-transition-name: <%= dom_id(@join_code) %>">
   <header>
     <h2 class="txt-large margin-none font-weight-black"><%= @page_title %></h2>
     <p class="txt-medium margin-none">Share the link below to invite people to this account</p>
diff --git a/app/views/cards/comments/_new.html.erb b/app/views/cards/comments/_new.html.erb
index 5d80fed78..8d1426f5a 100644
--- a/app/views/cards/comments/_new.html.erb
+++ b/app/views/cards/comments/_new.html.erb
@@ -17,13 +17,10 @@
         <span class="flex-inline align-center gap">
           <%= form.button class: "comment__submit btn btn--reversed",
               data: { form_target: "submit" }, disabled: true do %>
-            <span>Post this comment</span>
+            <span>Post</span>
+            <kbd class="txt-x-small hide-on-touch"><%= hotkey_label([ "ctrl", "enter" ]) %></kbd>
           <% end %>
-          <span class="hide-on-touch txt-subtle">
-            <kbd class="txt-x-small"><%= hotkey_label([ "ctrl", "enter" ]) %></kbd>
-          </span>
         </span>
-        <span data-form-target="cancel" hidden></span>
       <% end %>
     </div>
   </div>
diff --git a/app/views/cards/container/footer/_draft.html.erb b/app/views/cards/container/footer/_draft.html.erb
index 30e9aa02b..dbc95a6da 100644
--- a/app/views/cards/container/footer/_draft.html.erb
+++ b/app/views/cards/container/footer/_draft.html.erb
@@ -1,19 +1,15 @@
 <div class="card-perma__notch card-perma__notch--bottom">
-  <div class="flex flex-column gap-half">
-    <%= button_to card_publish_path(card), name: "creation_type", value: "add", class: "btn",
-          form: { data: { controller: "form" } },
-          data: { form_target: "submit", controller: "clicker", action: "keydown.ctrl+enter@document->clicker#click keydown.meta+enter@document->clicker#click" } do %>
-      <span>Create card</span>
-    <% end %>
-    <kbd class="txt-x-small txt-subtle center"><%= hotkey_label([ "ctrl", "enter" ]) %></kbd>
-  </div>
+  <%= button_to card_publish_path(card), name: "creation_type", value: "add", class: "btn",
+        form: { data: { controller: "form" } },
+        data: { form_target: "submit", controller: "clicker", action: "keydown.ctrl+enter@document->clicker#click keydown.meta+enter@document->clicker#click" } do %>
+    <span>Create card</span>
+    <kbd class="txt-x-small hide-on-touch"><%= hotkey_label([ "ctrl", "enter" ]) %></kbd>
+  <% end %>
 
-  <div class="flex flex-column gap-half">
-    <%= button_to card_publish_path(card), method: :post, class: "btn btn--reversed", name: "creation_type", value: "add_another",
-          title: "Create and add another (ctrl+shift+enter)", form: { data: { controller: "form" } },
-          data: { form_target: "submit", controller: "clicker", action: "keydown.ctrl+shift+enter@document->clicker#click keydown.meta+shift+enter@document->clicker#click" } do %>
-      <span>Create and add another</span>
-    <% end %>
-    <kbd class="txt-x-small txt-subtle center"><%= hotkey_label([ "ctrl", "shift", "enter" ]) %></kbd>
-  </div>
+  <%= button_to card_publish_path(card), method: :post, class: "btn btn--reversed", name: "creation_type", value: "add_another",
+        title: "Create and add another (ctrl+shift+enter)", form: { data: { controller: "form" } },
+        data: { form_target: "submit", controller: "clicker", action: "keydown.ctrl+shift+enter@document->clicker#click keydown.meta+shift+enter@document->clicker#click" } do %>
+    <span>Create and add another</span>
+    <kbd class="txt-x-small hide-on-touch"><%= hotkey_label([ "ctrl", "shift", "enter" ]) %></kbd>
+  <% end %>
 </div>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index dd2292601..f66d08736 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -10,7 +10,7 @@
       </label>
     </div>
 
-    <p><strong>New here?</strong> Enter your email to create an account. <strong>Already have an account?</strong> Enter your email and we'll get you signed in.</p>
+    <p><strong>New here?</strong> Enter your email to create an account. <strong>Already have an account?</strong> Enter your email and we’ll get you signed in.</p>
 
     <button type="submit" id="log_in" class="btn btn--link center txt-medium">
       <span>Let’s go</span>
diff --git a/test/helpers/hotkeys_helper_test.rb b/test/helpers/hotkeys_helper_test.rb
index ec96f6c9c..7201d7566 100644
--- a/test/helpers/hotkeys_helper_test.rb
+++ b/test/helpers/hotkeys_helper_test.rb
@@ -18,13 +18,13 @@ class HotkeysHelperTest < ActionView::TestCase
   test "mac enter" do
     emulate_mac
 
-    assert_equal "Return+J", hotkey_label([ "enter", "J" ])
+    assert_equal "⏎+J", hotkey_label([ "enter", "J" ])
   end
 
   test "linux enter" do
     emulate_linux
 
-    assert_equal "Enter+J", hotkey_label([ "enter", "J" ])
+    assert_equal "⏎+J", hotkey_label([ "enter", "J" ])
   end
 
   test "mac hyper" do