diff --git a/app/views/account/settings/_entropy.html.erb b/app/views/account/settings/_entropy.html.erb
index ec9c58302..53f5064ce 100644
--- a/app/views/account/settings/_entropy.html.erb
+++ b/app/views/account/settings/_entropy.html.erb
@@ -1,8 +1,7 @@
-<div class="settings__panel settings__panel--entropy panel shadow center">
-  <header>
-    <h2 class="divider txt-large">Auto close</h2>
-    <p class="margin-none-block-start">Fizzy doesn’t let stale cards stick around forever. Cards automatically move to “Not Now” if there is no activity for specific period of time. <em>This is the default, global setting — you can override it on each board.</em></p>
-  </header>
+<header>
+  <h2 class="divider txt-large">Auto close</h2>
+  <p class="margin-none-block-start">Fizzy doesn’t let stale cards stick around forever. Cards automatically move to “Not Now” if there is no activity for specific period of time. <em>This is the default, global setting — you can override it on each board.</em></p>
+</header>
+
+<%= render "entropy/auto_close", model: account.entropy, url: account_entropy_path, disabled: !Current.user.admin? %>
 
-  <%= render "entropy/auto_close", model: account.entropy, url: account_entropy_path, disabled: !Current.user.admin? %>
-</div>
diff --git a/app/views/account/settings/_export.html.erb b/app/views/account/settings/_export.html.erb
index e5c2a9c02..d44bb4b74 100644
--- a/app/views/account/settings/_export.html.erb
+++ b/app/views/account/settings/_export.html.erb
@@ -1,22 +1,19 @@
-<div class="settings__panel panel shadow center">
-  <header>
-    <h2 class="divider txt-large">Data Export</h2>
-    <p class="margin-none-block-start">You can request a ZIP file containing all your Fizzy data.</p>
-  </header>
+<header class="margin-block-start-double">
+  <h2 class="divider txt-large">Export your data</h2>
+  <p class="margin-none-block">Download an archive of your Fizzy data.</p>
+</header>
 
-  <div data-controller="dialog" data-dialog-modal-value="true">
-    <button type="button" class="btn btn--primary" data-action="dialog#open">Export</button>
+<div data-controller="dialog" data-dialog-modal-value="true">
+  <button type="button" class="btn" data-action="dialog#open">Begin export...</button>
 
-    <dialog class="dialog panel shadow" data-dialog-target="dialog">
-      <p class="margin-none"><strong>Data Export</strong></p>
-      <p>We will create a downloadable ZIP file of all the Fizzy data that you have access to in this account.</p>
-      <p>This can take a few minutes. When the file is ready, we'll email you a link to download it.</p>
-      <p>The download link will expire after 24 hours. But you can always request another export later.</p>
+  <dialog class="dialog panel panel--wide shadow" data-dialog-target="dialog">
+    <h2 class="margin-none txt-large">Export your account data</h2>
+    <p class="margin-none-block-start">This will kick off a request to generate a ZIP archive of all the data in boards you have access to.</p>
+    <p>When the file is ready, we’ll email you a link to download it. The link will expire after 24 hours.</p>
 
-      <div class="flex gap justify-end">
-        <button type="button" class="btn" data-action="dialog#close">Cancel</button>
-        <%= button_to "Export", account_exports_path, method: :post, class: "btn btn--primary", form: { data: { action: "submit->dialog#close" } } %>
-      </div>
-    </dialog>
-  </div>
-</div>
+    <div class="flex gap justify-center">
+      <%= button_to "Start export", account_exports_path, method: :post, class: "btn btn--link", form: { data: { action: "submit->dialog#close" } } %>
+      <button type="button" class="btn" data-action="dialog#close">Cancel</button>
+    </div>
+  </dialog>
+</div>
\ No newline at end of file
diff --git a/app/views/account/settings/show.html.erb b/app/views/account/settings/show.html.erb
index 4291dc1b4..273a07b9a 100644
--- a/app/views/account/settings/show.html.erb
+++ b/app/views/account/settings/show.html.erb
@@ -15,6 +15,8 @@
     <%= render "account/settings/users", users: @users %>
   </div>
 
-  <%= render "account/settings/entropy", account: @account %>
-  <%= render "account/settings/export" %>
+  <div class="settings__panel settings__panel--entropy panel shadow center">
+    <%= render "account/settings/entropy", account: @account %>
+    <%= render "account/settings/export" %>
+  </div>
 </section>