diff --git a/lib/mv_web/live/member_live/form.ex b/lib/mv_web/live/member_live/form.ex
index c98feb9..45da418 100644
--- a/lib/mv_web/live/member_live/form.ex
+++ b/lib/mv_web/live/member_live/form.ex
@@ -58,16 +58,33 @@ defmodule MvWeb.MemberLive.Form do
         </.header>
 
         <div class="mt-6 space-y-6">
-          <%!-- Tab navigation: Payments tab not shown on new/edit (only on member show) --%>
-          <div role="tablist" class="tabs tabs-bordered">
-            <button type="button" role="tab" class="tab tab-active" aria-selected="true">
-              <.icon name="hero-identification" class="size-4 mr-2" />
+          <%!-- Tab navigation: same styling as member show; only Contact Data tab (no Membership Fees on edit) --%>
+          <div
+            role="tablist"
+            class="tabs tabs-bordered tabs-lg bg-base-200/60 rounded-box p-1 w-fit"
+          >
+            <button
+              id="member-tab-contact"
+              role="tab"
+              type="button"
+              tabindex="0"
+              aria-selected="true"
+              aria-controls="member-tabpanel-contact"
+              class="tab tab-active flex items-center gap-2"
+            >
+              <.icon name="hero-identification" class="size-4 shrink-0" />
               {gettext("Contact Data")}
             </button>
           </div>
 
-          <%!-- Personal Data and Custom Fields Row --%>
-          <div class="grid grid-cols-1 lg:grid-cols-2 gap-6 mb-6">
+          <%!-- Contact Data Tab Content (same structure as member show) --%>
+          <div
+            id="member-tabpanel-contact"
+            role="tabpanel"
+            aria-labelledby="member-tab-contact"
+          >
+            <%!-- Personal Data and Custom Fields Row --%>
+            <div class="grid grid-cols-1 lg:grid-cols-2 gap-6 mb-6">
             <%!-- Personal Data Section --%>
             <div>
               <.form_section title={gettext("Personal Data")}>
@@ -280,6 +297,7 @@ defmodule MvWeb.MemberLive.Form do
               </div>
             </section>
           <% end %>
+          </div>
         </div>
       </.form>
     </Layouts.app>