diff --git a/lib/membership/member.ex b/lib/membership/member.ex
index 055cc48..54cc546 100644
--- a/lib/membership/member.ex
+++ b/lib/membership/member.ex
@@ -64,65 +64,6 @@ defmodule Mv.Membership.Member do
     end
   end
 
-  attributes do
-    uuid_v7_primary_key :id
-
-    attribute :first_name, :string do
-      allow_nil? false
-      constraints min_length: 1
-    end
-
-    attribute :last_name, :string do
-      allow_nil? false
-      constraints min_length: 1
-    end
-
-    attribute :email, :string do
-      allow_nil? false
-      constraints min_length: 5, max_length: 254
-    end
-
-    attribute :birth_date, :date do
-      allow_nil? true
-    end
-
-    attribute :paid, :boolean do
-      allow_nil? true
-    end
-
-    attribute :phone_number, :string do
-      allow_nil? true
-    end
-
-    attribute :join_date, :date do
-      allow_nil? true
-    end
-
-    attribute :exit_date, :date do
-      allow_nil? true
-    end
-
-    attribute :notes, :string do
-      allow_nil? true
-    end
-
-    attribute :city, :string do
-      allow_nil? true
-    end
-
-    attribute :street, :string do
-      allow_nil? true
-    end
-
-    attribute :house_number, :string do
-      allow_nil? true
-    end
-
-    attribute :postal_code, :string do
-      allow_nil? true
-    end
-  end
-
   validations do
     # Required fields are covered by allow_nil? false
 
@@ -215,6 +156,65 @@ defmodule Mv.Membership.Member do
     end
   end
 
+  attributes do
+    uuid_v7_primary_key :id
+
+    attribute :first_name, :string do
+      allow_nil? false
+      constraints min_length: 1
+    end
+
+    attribute :last_name, :string do
+      allow_nil? false
+      constraints min_length: 1
+    end
+
+    attribute :email, :string do
+      allow_nil? false
+      constraints min_length: 5, max_length: 254
+    end
+
+    attribute :birth_date, :date do
+      allow_nil? true
+    end
+
+    attribute :paid, :boolean do
+      allow_nil? true
+    end
+
+    attribute :phone_number, :string do
+      allow_nil? true
+    end
+
+    attribute :join_date, :date do
+      allow_nil? true
+    end
+
+    attribute :exit_date, :date do
+      allow_nil? true
+    end
+
+    attribute :notes, :string do
+      allow_nil? true
+    end
+
+    attribute :city, :string do
+      allow_nil? true
+    end
+
+    attribute :street, :string do
+      allow_nil? true
+    end
+
+    attribute :house_number, :string do
+      allow_nil? true
+    end
+
+    attribute :postal_code, :string do
+      allow_nil? true
+    end
+  end
+
   relationships do
     has_many :properties, Mv.Membership.Property, destination_attribute: :member_id
   end
diff --git a/lib/mv_web/member_live/show.ex b/lib/mv_web/member_live/show.ex
index 1608a9a..c58b0e3 100644
--- a/lib/mv_web/member_live/show.ex
+++ b/lib/mv_web/member_live/show.ex
@@ -34,14 +34,19 @@ defmodule MvWeb.MemberLive.Show do
     </.list>
 
     <h3 class="mt-8 mb-2 text-lg font-semibold">Custom Properties</h3>
-    <.generic_list
-      items={Enum.map(@member.properties, fn p -> 
+    <.generic_list items={
+      Enum.map(@member.properties, fn p ->
         {
-          p.property_type && p.property_type.name,  # name
-          case p.value do %{value: v} -> v; v -> v end  # value
+          # name
+          p.property_type && p.property_type.name,
+          # value
+          case p.value do
+            %{value: v} -> v
+            v -> v
+          end
         }
-      end)}
-    />
+      end)
+    } />
     <.back navigate={~p"/members"}>Back to members</.back>
 
     <.modal