diff --git a/lib/mv/membership/member_export/build.ex b/lib/mv/membership/member_export/build.ex
index ade4d82..5f7c314 100644
--- a/lib/mv/membership/member_export/build.ex
+++ b/lib/mv/membership/member_export/build.ex
@@ -352,7 +352,7 @@ defmodule Mv.Membership.MemberExport.Build do
           %{
             key: to_string(id),
             kind: :custom_field,
-            label: label_fn.(id),
+            label: cf.name,
             custom_field: cf
           }
         else
diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex
index b5b3942..c36d929 100644
--- a/lib/mv_web/components/core_components.ex
+++ b/lib/mv_web/components/core_components.ex
@@ -542,7 +542,7 @@ defmodule MvWeb.CoreComponents do
           {render_slot(@subtitle)}
         </p>
       </div>
-      <div class="flex-none">{render_slot(@actions)}</div>
+      <div class="flex gap-4 justify-end">{render_slot(@actions)}</div>
     </header>
     """
   end
diff --git a/lib/mv_web/components/export_dropdown.ex b/lib/mv_web/components/export_dropdown.ex
index 705c6c6..2bd922d 100644
--- a/lib/mv_web/components/export_dropdown.ex
+++ b/lib/mv_web/components/export_dropdown.ex
@@ -35,7 +35,7 @@ defmodule MvWeb.Components.ExportDropdown do
     assigns = assign(assigns, :button_label, button_label)
 
     ~H"""
-    <div id={@id} data-testid="export-dropdown">
+    <div id={@id} data-testid="export-dropdown" class="flex-auto flex-wrap">
       <.dropdown_menu
         id={"#{@id}-menu"}
         button_label={@button_label}
diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index 381cd63..3e9c520 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -2,20 +2,12 @@
   <.header>
     {gettext("Members")}
     <:actions>
-      <form method="post" action={~p"/members/export.csv"} target="_blank" class="inline">
-        <input type="hidden" name="_csrf_token" value={Plug.CSRFProtection.get_csrf_token()} />
-        <input type="hidden" name="payload" value={@export_payload_json} />
-        <button
-          type="submit"
-          class="btn btn-secondary gap-2"
-          aria-label={gettext("Export members to CSV")}
-        >
-          <.icon name="hero-arrow-down-tray" />
-          {gettext("Export to CSV")} ({if @selected_count == 0,
-            do: gettext("all"),
-            else: @selected_count})
-        </button>
-      </form>
+      <.live_component
+        module={MvWeb.Components.ExportDropdown}
+        id="export-dropdown"
+        export_payload_json={@export_payload_json}
+        selected_count={@selected_count}
+      />
       <.button
         class="secondary"
         id="copy-emails-btn"