diff --git a/lib/mv_web/live/custom_field_live/form_component.ex b/lib/mv_web/live/custom_field_live/form_component.ex
index c0b731c..46be022 100644
--- a/lib/mv_web/live/custom_field_live/form_component.ex
+++ b/lib/mv_web/live/custom_field_live/form_component.ex
@@ -21,9 +21,14 @@ defmodule MvWeb.CustomFieldLive.FormComponent do
     ~H"""
     <div id={@id} class="card bg-base-200 shadow-xl mb-8">
       <div class="card-body">
-        <h3 class="card-title">
-          {if @custom_field, do: gettext("Edit Custom Field"), else: gettext("New Custom Field")}
-        </h3>
+        <div class="flex items-center gap-4 mb-4">
+          <.button type="button" phx-click="cancel" phx-target={@myself}>
+            <.icon name="hero-arrow-left" class="w-4 h-4" />
+          </.button>
+          <h3 class="card-title">
+            {if @custom_field, do: gettext("Edit Custom Field"), else: gettext("New Custom Field")}
+          </h3>
+        </div>
 
         <.form
           for={@form}
@@ -83,7 +88,14 @@ defmodule MvWeb.CustomFieldLive.FormComponent do
   def handle_event("save", %{"custom_field" => custom_field_params}, socket) do
     case AshPhoenix.Form.submit(socket.assigns.form, params: custom_field_params) do
       {:ok, custom_field} ->
-        socket.assigns.on_save.(custom_field)
+        action =
+          case socket.assigns.form.source.type do
+            :create -> gettext("create")
+            :update -> gettext("update")
+            other -> to_string(other)
+          end
+
+        socket.assigns.on_save.(custom_field, action)
         {:noreply, socket}
 
       {:error, form} ->
diff --git a/lib/mv_web/live/custom_field_live/index_component.ex b/lib/mv_web/live/custom_field_live/index_component.ex
index a071b7a..9b8ff0d 100644
--- a/lib/mv_web/live/custom_field_live/index_component.ex
+++ b/lib/mv_web/live/custom_field_live/index_component.ex
@@ -19,7 +19,7 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
       <.header>
         {gettext("Custom Fields")}
         <:subtitle>
-          {gettext("Manage custom field definitions for members.")}
+          {gettext("These will appear in addition to other data when adding new members.")}
         </:subtitle>
         <:actions>
           <.button variant="primary" phx-click="new_custom_field" phx-target={@myself}>
@@ -34,12 +34,14 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
           module={MvWeb.CustomFieldLive.FormComponent}
           id={@form_id}
           custom_field={@editing_custom_field}
-          on_save={fn custom_field -> send(self(), {:custom_field_saved, custom_field}) end}
-          on_cancel={fn -> send(self(), :cancel_custom_field_form) end}
+          on_save={fn custom_field, action -> send(self(), {:custom_field_saved, custom_field, action}) end}
+          on_cancel={fn -> send_update(__MODULE__, id: @id, show_form: false) end}
         />
       </div>
 
+      <%!-- Hide table when form is visible --%>
       <.table
+        :if={!@show_form}
         id="custom_fields"
         rows={@streams.custom_fields}
         row_click={
@@ -85,11 +87,11 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
       <%!-- Delete Confirmation Modal --%>
       <dialog :if={@show_delete_modal} id="delete-custom-field-modal" class="modal modal-open">
         <div class="modal-box">
-          <h3 class="font-bold text-lg">{gettext("Delete Custom Field")}</h3>
+          <h3 class="text-lg font-bold">{gettext("Delete Custom Field")}</h3>
 
           <div class="py-4 space-y-4">
             <div class="alert alert-warning">
-              <.icon name="hero-exclamation-triangle" class="h-5 w-5" />
+              <.icon name="hero-exclamation-triangle" class="w-5 h-5" />
               <div>
                 <p class="font-semibold">
                   {ngettext(
@@ -99,7 +101,7 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
                     count: @custom_field_to_delete.assigned_members_count
                   )}
                 </p>
-                <p class="text-sm mt-2">
+                <p class="mt-2 text-sm">
                   {gettext(
                     "All custom field values will be permanently deleted when you delete this custom field."
                   )}
@@ -113,7 +115,7 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
                   {gettext("To confirm deletion, please enter this text:")}
                 </span>
               </label>
-              <div class="font-mono font-bold text-lg mb-2 p-2 bg-base-200 rounded break-all">
+              <div class="p-2 mb-2 font-mono text-lg font-bold break-all rounded bg-base-200">
                 {@custom_field_to_delete.slug}
               </div>
               <form phx-change="update_slug_confirmation" phx-target={@myself}>
@@ -125,7 +127,7 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
                   placeholder={gettext("Enter the text above to confirm")}
                   autocomplete="off"
                   phx-mounted={JS.focus()}
-                  class="input input-bordered w-full"
+                  class="w-full input input-bordered"
                 />
               </form>
             </div>
@@ -152,6 +154,16 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
 
   @impl true
   def update(assigns, socket) do
+    # If show_form is explicitly provided in assigns, reset editing state
+    socket =
+      if Map.has_key?(assigns, :show_form) and assigns.show_form == false do
+        socket
+        |> assign(:editing_custom_field, nil)
+        |> assign(:form_id, "custom-field-form-new")
+      else
+        socket
+      end
+
     {:ok,
      socket
      |> assign(assigns)
diff --git a/lib/mv_web/live/global_settings_live.ex b/lib/mv_web/live/global_settings_live.ex
index 23cffe4..bb919cb 100644
--- a/lib/mv_web/live/global_settings_live.ex
+++ b/lib/mv_web/live/global_settings_live.ex
@@ -31,7 +31,6 @@ defmodule MvWeb.GlobalSettingsLive do
      socket
      |> assign(:page_title, gettext("Settings"))
      |> assign(:settings, settings)
-     |> assign(:show_custom_field_form, false)
      |> assign_form()}
   end
 
@@ -96,17 +95,14 @@ defmodule MvWeb.GlobalSettingsLive do
   end
 
   @impl true
-  def handle_info({:custom_field_saved, _custom_field}, socket) do
-    {:noreply,
-     socket
-     |> assign(:show_custom_field_form, false)
-     |> put_flash(:info, gettext("Custom field saved successfully"))
-     |> push_event("refresh-custom-fields", %{})}
-  end
+  def handle_info({:custom_field_saved, _custom_field, action}, socket) do
+    send_update(MvWeb.CustomFieldLive.IndexComponent,
+      id: "custom-fields-component",
+      show_form: false
+    )
 
-  @impl true
-  def handle_info(:cancel_custom_field_form, socket) do
-    {:noreply, assign(socket, :show_custom_field_form, false)}
+    {:noreply,
+     put_flash(socket, :info, gettext("Custom field %{action} successfully", action: action))}
   end
 
   @impl true
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 7a76f62..a2407a7 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -34,12 +34,14 @@ msgstr "Verbindung wird wiederhergestellt"
 msgid "City"
 msgstr "Stadt"
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:82
 #: lib/mv_web/live/member_live/index.html.heex:245
 #: lib/mv_web/live/user_live/index.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr "Löschen"
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:76
 #: lib/mv_web/live/member_live/index.html.heex:237
 #: lib/mv_web/live/user_live/form.ex:265
 #: lib/mv_web/live/user_live/index.html.heex:66
@@ -155,9 +157,9 @@ msgstr "Postleitzahl"
 msgid "Save Member"
 msgstr "Mitglied speichern"
 
-#: lib/mv_web/live/custom_field_live/form.ex:66
+#: lib/mv_web/live/custom_field_live/form_component.ex:63
 #: lib/mv_web/live/custom_field_value_live/form.ex:74
-#: lib/mv_web/live/global_settings_live.ex:55
+#: lib/mv_web/live/global_settings_live.ex:61
 #: lib/mv_web/live/member_live/form.ex:78
 #: lib/mv_web/live/user_live/form.ex:248
 #, elixir-autogen, elixir-format
@@ -176,6 +178,7 @@ msgstr "Straße"
 msgid "Id"
 msgstr "ID"
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:68
 #: lib/mv_web/live/member_live/index.html.heex:229
 #: lib/mv_web/live/member_live/index/formatter.ex:61
 #: lib/mv_web/live/member_live/show.ex:52
@@ -193,6 +196,7 @@ msgstr "Mitglied anzeigen"
 msgid "This is a member record from your database."
 msgstr "Dies ist ein Mitglied aus deiner Datenbank."
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:65
 #: lib/mv_web/live/member_live/index.html.heex:229
 #: lib/mv_web/live/member_live/index/formatter.ex:60
 #: lib/mv_web/live/member_live/show.ex:52
@@ -200,14 +204,14 @@ msgstr "Dies ist ein Mitglied aus deiner Datenbank."
 msgid "Yes"
 msgstr "Ja"
 
-#: lib/mv_web/live/custom_field_live/form.ex:110
+#: lib/mv_web/live/custom_field_live/form_component.ex:93
 #: lib/mv_web/live/custom_field_value_live/form.ex:233
 #: lib/mv_web/live/member_live/form.ex:137
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr "erstellt"
 
-#: lib/mv_web/live/custom_field_live/form.ex:111
+#: lib/mv_web/live/custom_field_live/form_component.ex:94
 #: lib/mv_web/live/custom_field_value_live/form.ex:234
 #: lib/mv_web/live/member_live/form.ex:138
 #, elixir-autogen, elixir-format
@@ -249,8 +253,8 @@ msgstr "Ihre E-Mail-Adresse wurde bestätigt"
 msgid "Your password has successfully been reset"
 msgstr "Ihr Passwort wurde erfolgreich zurückgesetzt"
 
-#: lib/mv_web/live/custom_field_live/form.ex:69
-#: lib/mv_web/live/custom_field_live/index.ex:120
+#: lib/mv_web/live/custom_field_live/form_component.ex:61
+#: lib/mv_web/live/custom_field_live/index_component.ex:138
 #: lib/mv_web/live/custom_field_value_live/form.ex:77
 #: lib/mv_web/live/member_live/form.ex:81
 #: lib/mv_web/live/user_live/form.ex:251
@@ -263,7 +267,8 @@ msgstr "Abbrechen"
 msgid "Choose a member"
 msgstr "Mitglied auswählen"
 
-#: lib/mv_web/live/custom_field_live/form.ex:61
+#: lib/mv_web/live/custom_field_live/form_component.ex:50
+#: lib/mv_web/live/custom_field_live/index_component.ex:59
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr "Beschreibung"
@@ -283,7 +288,7 @@ msgstr "Aktiviert"
 msgid "ID"
 msgstr "ID"
 
-#: lib/mv_web/live/custom_field_live/form.ex:62
+#: lib/mv_web/live/custom_field_live/form_component.ex:51
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr "Unveränderlich"
@@ -311,7 +316,8 @@ msgstr "Mitglied"
 msgid "Members"
 msgstr "Mitglieder"
 
-#: lib/mv_web/live/custom_field_live/form.ex:51
+#: lib/mv_web/live/custom_field_live/form_component.ex:40
+#: lib/mv_web/live/custom_field_live/index_component.ex:53
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr "Name"
@@ -354,7 +360,7 @@ msgstr "Passwort-Authentifizierung"
 msgid "Profil"
 msgstr "Profil"
 
-#: lib/mv_web/live/custom_field_live/form.ex:63
+#: lib/mv_web/live/custom_field_live/form_component.ex:52
 #, elixir-autogen, elixir-format
 msgid "Required"
 msgstr "Erforderlich"
@@ -369,7 +375,10 @@ msgstr "Alle Mitglieder auswählen"
 msgid "Select member"
 msgstr "Mitglied auswählen"
 
+#: lib/mv_web/components/layouts/navbar.ex:26
 #: lib/mv_web/components/layouts/navbar.ex:99
+#: lib/mv_web/live/global_settings_live.ex:32
+#: lib/mv_web/live/global_settings_live.ex:43
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr "Einstellungen"
@@ -410,7 +419,7 @@ msgstr "Benutzer*in"
 msgid "Value"
 msgstr "Wert"
 
-#: lib/mv_web/live/custom_field_live/form.ex:56
+#: lib/mv_web/live/custom_field_live/form_component.ex:45
 #, elixir-autogen, elixir-format
 msgid "Value type"
 msgstr "Wertetyp"
@@ -618,7 +627,7 @@ msgstr "Benutzerdefinierte Feldwerte"
 msgid "Custom field"
 msgstr "Benutzerdefiniertes Feld"
 
-#: lib/mv_web/live/custom_field_live/form.ex:117
+#: lib/mv_web/live/global_settings_live.ex:108
 #, elixir-autogen, elixir-format
 msgid "Custom field %{action} successfully"
 msgstr "Benutzerdefiniertes Feld erfolgreich %{action}"
@@ -633,7 +642,7 @@ msgstr "Benutzerdefinierter Feldwert erfolgreich %{action}"
 msgid "Please select a custom field first"
 msgstr "Bitte wähle zuerst ein Benutzerdefiniertes Feld"
 
-#: lib/mv_web/live/custom_field_live/form.ex:67
+#: lib/mv_web/live/custom_field_live/form_component.ex:64
 #, elixir-autogen, elixir-format
 msgid "Save Custom field"
 msgstr "Benutzerdefiniertes Feld speichern"
@@ -643,12 +652,7 @@ msgstr "Benutzerdefiniertes Feld speichern"
 msgid "Save Custom field value"
 msgstr "Benutzerdefinierten Feldwert speichern"
 
-#: lib/mv_web/live/custom_field_live/form.ex:46
-#, elixir-autogen, elixir-format
-msgid "Use this form to manage custom_field records in your database."
-msgstr "Verwende dieses Formular, um Benutzerdefinierte Felder in deiner Datenbank zu verwalten."
-
-#: lib/mv_web/components/layouts/navbar.ex:26
+#: lib/mv_web/live/custom_field_live/index_component.ex:20
 #, elixir-autogen, elixir-format
 msgid "Custom Fields"
 msgstr "Benutzerdefinierte Felder"
@@ -658,70 +662,64 @@ msgstr "Benutzerdefinierte Felder"
 msgid "Use this form to manage Custom Field Value records in your database."
 msgstr "Verwende dieses Formular, um Benutzerdefinierte Feldwerte in deiner Datenbank zu verwalten."
 
-#: lib/mv_web/live/custom_field_live/show.ex:56
-#, elixir-autogen, elixir-format
-msgid "Auto-generated identifier (immutable)"
-msgstr "Automatisch generierter Bezeichner (unveränderlich)"
-
-#: lib/mv_web/live/custom_field_live/index.ex:79
+#: lib/mv_web/live/custom_field_live/index_component.ex:97
 #, elixir-autogen, elixir-format
 msgid "%{count} member has a value assigned for this custom field."
 msgid_plural "%{count} members have values assigned for this custom field."
 msgstr[0] "%{count} Mitglied hat einen Wert für dieses benutzerdefinierte Feld zugewiesen."
 msgstr[1] "%{count} Mitglieder haben Werte für dieses benutzerdefinierte Feld zugewiesen."
 
-#: lib/mv_web/live/custom_field_live/index.ex:87
+#: lib/mv_web/live/custom_field_live/index_component.ex:105
 #, elixir-autogen, elixir-format
 msgid "All custom field values will be permanently deleted when you delete this custom field."
 msgstr "Alle benutzerdefinierten Feldwerte werden beim Löschen dieses benutzerdefinierten Feldes dauerhaft gelöscht."
 
-#: lib/mv_web/live/custom_field_live/index.ex:72
+#: lib/mv_web/live/custom_field_live/index_component.ex:90
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field"
 msgstr "Benutzerdefiniertes Feld löschen"
 
-#: lib/mv_web/live/custom_field_live/index.ex:127
+#: lib/mv_web/live/custom_field_live/index_component.ex:146
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field and All Values"
 msgstr "Benutzerdefiniertes Feld und alle Werte löschen"
 
-#: lib/mv_web/live/custom_field_live/index.ex:109
+#: lib/mv_web/live/custom_field_live/index_component.ex:127
 #, elixir-autogen, elixir-format
 msgid "Enter the text above to confirm"
 msgstr "Obigen Text zur Bestätigung eingeben"
 
-#: lib/mv_web/live/custom_field_live/index.ex:97
+#: lib/mv_web/live/custom_field_live/index_component.ex:115
 #, elixir-autogen, elixir-format, fuzzy
 msgid "To confirm deletion, please enter this text:"
 msgstr "Um die Löschung zu bestätigen, gib bitte folgenden Text ein:"
 
-#: lib/mv_web/live/custom_field_live/form.ex:64
+#: lib/mv_web/live/custom_field_live/form_component.ex:56
 #, elixir-autogen, elixir-format
 msgid "Show in overview"
 msgstr "In der Mitglieder-Übersicht anzeigen"
 
-#: lib/mv_web/live/global_settings_live.ex:51
+#: lib/mv_web/live/global_settings_live.ex:57
 #, elixir-autogen, elixir-format
 msgid "Association Name"
 msgstr "Vereinsname"
 
-#: lib/mv_web/live/global_settings_live.ex:31
-#: lib/mv_web/live/global_settings_live.ex:41
+#: lib/mv_web/live/global_settings_live.ex:51
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Club Settings"
 msgstr "Vereinsdaten"
 
-#: lib/mv_web/live/global_settings_live.ex:43
+#: lib/mv_web/live/global_settings_live.ex:45
 #, elixir-autogen, elixir-format
 msgid "Manage global settings for the association."
 msgstr "Passe übergreifende Einstellungen für den Verein an."
 
-#: lib/mv_web/live/global_settings_live.ex:56
+#: lib/mv_web/live/global_settings_live.ex:62
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: lib/mv_web/live/global_settings_live.ex:75
+#: lib/mv_web/live/global_settings_live.ex:88
 #, elixir-autogen, elixir-format
 msgid "Settings updated successfully"
 msgstr "Einstellungen erfolgreich gespeichert"
@@ -853,6 +851,51 @@ msgstr "Nicht bezahlt"
 msgid "Payment filter"
 msgstr "Zahlungsfilter"
 
+#: lib/mv_web/live/global_settings_live.ex:118
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Custom field deleted successfully"
+msgstr "Benutzerdefiniertes Feld erfolgreich %{action}"
+
+#: lib/mv_web/live/custom_field_live/form_component.ex:29
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Edit Custom Field"
+msgstr "Benutzerdefiniertes Feld bearbeiten"
+
+#: lib/mv_web/live/global_settings_live.ex:127
+#, elixir-autogen, elixir-format
+msgid "Failed to delete custom field: %{error}"
+msgstr "Konnte benutzerdefiniertes Feld nicht löschen: %{error}"
+
+#: lib/mv_web/live/custom_field_live/form_component.ex:29
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Custom Field"
+msgstr "Neues Benutzerdefiniertes Feld"
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:26
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Custom field"
+msgstr "Neues Benutzerdefiniertes Feld"
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:63
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Show in Overview"
+msgstr "In der Mitglieder-Übersicht anzeigen"
+
+#: lib/mv_web/live/global_settings_live.ex:133
+#, elixir-autogen, elixir-format
+msgid "Slug does not match. Deletion cancelled."
+msgstr "Eingegebener Text war nicht korrekt. Löschen wurde abgebrochen."
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:55
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Value Type"
+msgstr "Wertetyp"
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:22
+#, elixir-autogen, elixir-format
+msgid "These will appear in addition to other data when adding new members."
+msgstr "Diese Felder können zusätzlich zu den normalen Daten ausgefüllt werden, wenn ein neues Mitglied angelegt wird."
+
 #~ #: lib/mv_web/live/member_live/form.ex:48
 #~ #: lib/mv_web/live/member_live/show.ex:51
 #~ #, elixir-autogen, elixir-format
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 7229e28..d687d03 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -35,12 +35,14 @@ msgstr ""
 msgid "City"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:82
 #: lib/mv_web/live/member_live/index.html.heex:245
 #: lib/mv_web/live/user_live/index.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:76
 #: lib/mv_web/live/member_live/index.html.heex:237
 #: lib/mv_web/live/user_live/form.ex:265
 #: lib/mv_web/live/user_live/index.html.heex:66
@@ -156,9 +158,9 @@ msgstr ""
 msgid "Save Member"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:66
+#: lib/mv_web/live/custom_field_live/form_component.ex:63
 #: lib/mv_web/live/custom_field_value_live/form.ex:74
-#: lib/mv_web/live/global_settings_live.ex:55
+#: lib/mv_web/live/global_settings_live.ex:61
 #: lib/mv_web/live/member_live/form.ex:78
 #: lib/mv_web/live/user_live/form.ex:248
 #, elixir-autogen, elixir-format
@@ -177,6 +179,7 @@ msgstr ""
 msgid "Id"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:68
 #: lib/mv_web/live/member_live/index.html.heex:229
 #: lib/mv_web/live/member_live/index/formatter.ex:61
 #: lib/mv_web/live/member_live/show.ex:52
@@ -194,6 +197,7 @@ msgstr ""
 msgid "This is a member record from your database."
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:65
 #: lib/mv_web/live/member_live/index.html.heex:229
 #: lib/mv_web/live/member_live/index/formatter.ex:60
 #: lib/mv_web/live/member_live/show.ex:52
@@ -201,14 +205,14 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:110
+#: lib/mv_web/live/custom_field_live/form_component.ex:93
 #: lib/mv_web/live/custom_field_value_live/form.ex:233
 #: lib/mv_web/live/member_live/form.ex:137
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:111
+#: lib/mv_web/live/custom_field_live/form_component.ex:94
 #: lib/mv_web/live/custom_field_value_live/form.ex:234
 #: lib/mv_web/live/member_live/form.ex:138
 #, elixir-autogen, elixir-format
@@ -250,8 +254,8 @@ msgstr ""
 msgid "Your password has successfully been reset"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:69
-#: lib/mv_web/live/custom_field_live/index.ex:120
+#: lib/mv_web/live/custom_field_live/form_component.ex:61
+#: lib/mv_web/live/custom_field_live/index_component.ex:138
 #: lib/mv_web/live/custom_field_value_live/form.ex:77
 #: lib/mv_web/live/member_live/form.ex:81
 #: lib/mv_web/live/user_live/form.ex:251
@@ -264,7 +268,8 @@ msgstr ""
 msgid "Choose a member"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:61
+#: lib/mv_web/live/custom_field_live/form_component.ex:50
+#: lib/mv_web/live/custom_field_live/index_component.ex:59
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
@@ -284,7 +289,7 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:62
+#: lib/mv_web/live/custom_field_live/form_component.ex:51
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr ""
@@ -312,7 +317,8 @@ msgstr ""
 msgid "Members"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:51
+#: lib/mv_web/live/custom_field_live/form_component.ex:40
+#: lib/mv_web/live/custom_field_live/index_component.ex:53
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
@@ -355,7 +361,7 @@ msgstr ""
 msgid "Profil"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:63
+#: lib/mv_web/live/custom_field_live/form_component.ex:52
 #, elixir-autogen, elixir-format
 msgid "Required"
 msgstr ""
@@ -370,7 +376,10 @@ msgstr ""
 msgid "Select member"
 msgstr ""
 
+#: lib/mv_web/components/layouts/navbar.ex:26
 #: lib/mv_web/components/layouts/navbar.ex:99
+#: lib/mv_web/live/global_settings_live.ex:32
+#: lib/mv_web/live/global_settings_live.ex:43
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
@@ -411,7 +420,7 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:56
+#: lib/mv_web/live/custom_field_live/form_component.ex:45
 #, elixir-autogen, elixir-format
 msgid "Value type"
 msgstr ""
@@ -619,7 +628,7 @@ msgstr ""
 msgid "Custom field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:117
+#: lib/mv_web/live/global_settings_live.ex:108
 #, elixir-autogen, elixir-format
 msgid "Custom field %{action} successfully"
 msgstr ""
@@ -634,7 +643,7 @@ msgstr ""
 msgid "Please select a custom field first"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:67
+#: lib/mv_web/live/custom_field_live/form_component.ex:64
 #, elixir-autogen, elixir-format
 msgid "Save Custom field"
 msgstr ""
@@ -644,12 +653,7 @@ msgstr ""
 msgid "Save Custom field value"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:46
-#, elixir-autogen, elixir-format
-msgid "Use this form to manage custom_field records in your database."
-msgstr ""
-
-#: lib/mv_web/components/layouts/navbar.ex:26
+#: lib/mv_web/live/custom_field_live/index_component.ex:20
 #, elixir-autogen, elixir-format
 msgid "Custom Fields"
 msgstr ""
@@ -659,70 +663,64 @@ msgstr ""
 msgid "Use this form to manage Custom Field Value records in your database."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/show.ex:56
-#, elixir-autogen, elixir-format
-msgid "Auto-generated identifier (immutable)"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_live/index.ex:79
+#: lib/mv_web/live/custom_field_live/index_component.ex:97
 #, elixir-autogen, elixir-format
 msgid "%{count} member has a value assigned for this custom field."
 msgid_plural "%{count} members have values assigned for this custom field."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:87
+#: lib/mv_web/live/custom_field_live/index_component.ex:105
 #, elixir-autogen, elixir-format
 msgid "All custom field values will be permanently deleted when you delete this custom field."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:72
+#: lib/mv_web/live/custom_field_live/index_component.ex:90
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:127
+#: lib/mv_web/live/custom_field_live/index_component.ex:146
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field and All Values"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:109
+#: lib/mv_web/live/custom_field_live/index_component.ex:127
 #, elixir-autogen, elixir-format
 msgid "Enter the text above to confirm"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:97
+#: lib/mv_web/live/custom_field_live/index_component.ex:115
 #, elixir-autogen, elixir-format
 msgid "To confirm deletion, please enter this text:"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:64
+#: lib/mv_web/live/custom_field_live/form_component.ex:56
 #, elixir-autogen, elixir-format
 msgid "Show in overview"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:51
+#: lib/mv_web/live/global_settings_live.ex:57
 #, elixir-autogen, elixir-format
 msgid "Association Name"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:31
-#: lib/mv_web/live/global_settings_live.ex:41
+#: lib/mv_web/live/global_settings_live.ex:51
 #, elixir-autogen, elixir-format
 msgid "Club Settings"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:43
+#: lib/mv_web/live/global_settings_live.ex:45
 #, elixir-autogen, elixir-format
 msgid "Manage global settings for the association."
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:56
+#: lib/mv_web/live/global_settings_live.ex:62
 #, elixir-autogen, elixir-format
 msgid "Save Settings"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:75
+#: lib/mv_web/live/global_settings_live.ex:88
 #, elixir-autogen, elixir-format
 msgid "Settings updated successfully"
 msgstr ""
@@ -853,3 +851,48 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Payment filter"
 msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex:118
+#, elixir-autogen, elixir-format
+msgid "Custom field deleted successfully"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex:29
+#, elixir-autogen, elixir-format
+msgid "Edit Custom Field"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex:127
+#, elixir-autogen, elixir-format
+msgid "Failed to delete custom field: %{error}"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex:29
+#, elixir-autogen, elixir-format
+msgid "New Custom Field"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:26
+#, elixir-autogen, elixir-format
+msgid "New Custom field"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:63
+#, elixir-autogen, elixir-format
+msgid "Show in Overview"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex:133
+#, elixir-autogen, elixir-format
+msgid "Slug does not match. Deletion cancelled."
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:55
+#, elixir-autogen, elixir-format
+msgid "Value Type"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:22
+#, elixir-autogen, elixir-format
+msgid "These will appear in addition to other data when adding new members."
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 3b471d5..09d7a51 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -35,12 +35,14 @@ msgstr ""
 msgid "City"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:82
 #: lib/mv_web/live/member_live/index.html.heex:245
 #: lib/mv_web/live/user_live/index.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:76
 #: lib/mv_web/live/member_live/index.html.heex:237
 #: lib/mv_web/live/user_live/form.ex:265
 #: lib/mv_web/live/user_live/index.html.heex:66
@@ -156,9 +158,9 @@ msgstr ""
 msgid "Save Member"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:66
+#: lib/mv_web/live/custom_field_live/form_component.ex:63
 #: lib/mv_web/live/custom_field_value_live/form.ex:74
-#: lib/mv_web/live/global_settings_live.ex:55
+#: lib/mv_web/live/global_settings_live.ex:61
 #: lib/mv_web/live/member_live/form.ex:78
 #: lib/mv_web/live/user_live/form.ex:248
 #, elixir-autogen, elixir-format
@@ -177,6 +179,7 @@ msgstr ""
 msgid "Id"
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:68
 #: lib/mv_web/live/member_live/index.html.heex:229
 #: lib/mv_web/live/member_live/index/formatter.ex:61
 #: lib/mv_web/live/member_live/show.ex:52
@@ -194,6 +197,7 @@ msgstr ""
 msgid "This is a member record from your database."
 msgstr ""
 
+#: lib/mv_web/live/custom_field_live/index_component.ex:65
 #: lib/mv_web/live/member_live/index.html.heex:229
 #: lib/mv_web/live/member_live/index/formatter.ex:60
 #: lib/mv_web/live/member_live/show.ex:52
@@ -201,14 +205,14 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:110
+#: lib/mv_web/live/custom_field_live/form_component.ex:93
 #: lib/mv_web/live/custom_field_value_live/form.ex:233
 #: lib/mv_web/live/member_live/form.ex:137
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:111
+#: lib/mv_web/live/custom_field_live/form_component.ex:94
 #: lib/mv_web/live/custom_field_value_live/form.ex:234
 #: lib/mv_web/live/member_live/form.ex:138
 #, elixir-autogen, elixir-format
@@ -250,8 +254,8 @@ msgstr ""
 msgid "Your password has successfully been reset"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:69
-#: lib/mv_web/live/custom_field_live/index.ex:120
+#: lib/mv_web/live/custom_field_live/form_component.ex:61
+#: lib/mv_web/live/custom_field_live/index_component.ex:138
 #: lib/mv_web/live/custom_field_value_live/form.ex:77
 #: lib/mv_web/live/member_live/form.ex:81
 #: lib/mv_web/live/user_live/form.ex:251
@@ -264,7 +268,8 @@ msgstr ""
 msgid "Choose a member"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:61
+#: lib/mv_web/live/custom_field_live/form_component.ex:50
+#: lib/mv_web/live/custom_field_live/index_component.ex:59
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
@@ -284,7 +289,7 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:62
+#: lib/mv_web/live/custom_field_live/form_component.ex:51
 #, elixir-autogen, elixir-format
 msgid "Immutable"
 msgstr ""
@@ -312,7 +317,8 @@ msgstr ""
 msgid "Members"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:51
+#: lib/mv_web/live/custom_field_live/form_component.ex:40
+#: lib/mv_web/live/custom_field_live/index_component.ex:53
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
@@ -355,7 +361,7 @@ msgstr ""
 msgid "Profil"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:63
+#: lib/mv_web/live/custom_field_live/form_component.ex:52
 #, elixir-autogen, elixir-format
 msgid "Required"
 msgstr ""
@@ -370,7 +376,10 @@ msgstr ""
 msgid "Select member"
 msgstr ""
 
+#: lib/mv_web/components/layouts/navbar.ex:26
 #: lib/mv_web/components/layouts/navbar.ex:99
+#: lib/mv_web/live/global_settings_live.ex:32
+#: lib/mv_web/live/global_settings_live.ex:43
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
@@ -411,7 +420,7 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:56
+#: lib/mv_web/live/custom_field_live/form_component.ex:45
 #, elixir-autogen, elixir-format
 msgid "Value type"
 msgstr ""
@@ -619,7 +628,7 @@ msgstr ""
 msgid "Custom field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:117
+#: lib/mv_web/live/global_settings_live.ex:108
 #, elixir-autogen, elixir-format
 msgid "Custom field %{action} successfully"
 msgstr ""
@@ -634,7 +643,7 @@ msgstr ""
 msgid "Please select a custom field first"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:67
+#: lib/mv_web/live/custom_field_live/form_component.ex:64
 #, elixir-autogen, elixir-format
 msgid "Save Custom field"
 msgstr ""
@@ -644,12 +653,7 @@ msgstr ""
 msgid "Save Custom field value"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:46
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Use this form to manage custom_field records in your database."
-msgstr ""
-
-#: lib/mv_web/components/layouts/navbar.ex:26
+#: lib/mv_web/live/custom_field_live/index_component.ex:20
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Custom Fields"
 msgstr ""
@@ -659,70 +663,64 @@ msgstr ""
 msgid "Use this form to manage Custom Field Value records in your database."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/show.ex:56
-#, elixir-autogen, elixir-format
-msgid "Auto-generated identifier (immutable)"
-msgstr ""
-
-#: lib/mv_web/live/custom_field_live/index.ex:79
+#: lib/mv_web/live/custom_field_live/index_component.ex:97
 #, elixir-autogen, elixir-format
 msgid "%{count} member has a value assigned for this custom field."
 msgid_plural "%{count} members have values assigned for this custom field."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:87
+#: lib/mv_web/live/custom_field_live/index_component.ex:105
 #, elixir-autogen, elixir-format
 msgid "All custom field values will be permanently deleted when you delete this custom field."
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:72
+#: lib/mv_web/live/custom_field_live/index_component.ex:90
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:127
+#: lib/mv_web/live/custom_field_live/index_component.ex:146
 #, elixir-autogen, elixir-format
 msgid "Delete Custom Field and All Values"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:109
+#: lib/mv_web/live/custom_field_live/index_component.ex:127
 #, elixir-autogen, elixir-format
 msgid "Enter the text above to confirm"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/index.ex:97
+#: lib/mv_web/live/custom_field_live/index_component.ex:115
 #, elixir-autogen, elixir-format, fuzzy
 msgid "To confirm deletion, please enter this text:"
 msgstr ""
 
-#: lib/mv_web/live/custom_field_live/form.ex:64
+#: lib/mv_web/live/custom_field_live/form_component.ex:56
 #, elixir-autogen, elixir-format
 msgid "Show in overview"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:51
+#: lib/mv_web/live/global_settings_live.ex:57
 #, elixir-autogen, elixir-format
 msgid "Association Name"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:31
-#: lib/mv_web/live/global_settings_live.ex:41
+#: lib/mv_web/live/global_settings_live.ex:51
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Club Settings"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:43
+#: lib/mv_web/live/global_settings_live.ex:45
 #, elixir-autogen, elixir-format
 msgid "Manage global settings for the association."
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:56
+#: lib/mv_web/live/global_settings_live.ex:62
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Settings"
 msgstr ""
 
-#: lib/mv_web/live/global_settings_live.ex:75
+#: lib/mv_web/live/global_settings_live.ex:88
 #, elixir-autogen, elixir-format
 msgid "Settings updated successfully"
 msgstr ""
@@ -854,8 +852,68 @@ msgstr ""
 msgid "Payment filter"
 msgstr ""
 
+#: lib/mv_web/live/global_settings_live.ex:118
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Custom field deleted successfully"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex:29
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Edit Custom Field"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex:127
+#, elixir-autogen, elixir-format
+msgid "Failed to delete custom field: %{error}"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex:29
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Custom Field"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:26
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Custom field"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:63
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Show in Overview"
+msgstr ""
+
+#: lib/mv_web/live/global_settings_live.ex:133
+#, elixir-autogen, elixir-format
+msgid "Slug does not match. Deletion cancelled."
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:55
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Value Type"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/index_component.ex:22
+#, elixir-autogen, elixir-format
+msgid "These will appear in addition to other data when adding new members."
+msgstr ""
+
+#~ #: lib/mv_web/live/custom_field_live/show.ex:56
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Auto-generated identifier (immutable)"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/member_live/form.ex:48
 #~ #: lib/mv_web/live/member_live/show.ex:51
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Birth Date"
 #~ msgstr ""
+
+#~ #: lib/mv_web/live/custom_field_live/index_component.ex:22
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Manage custom field definitions for members."
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/custom_field_live/form.ex:46
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Use this form to manage custom_field records in your database."
+#~ msgstr ""