diff --git a/frontend/src/components/FieldLayoutEditor.vue b/frontend/src/components/FieldLayoutEditor.vue
index 29aa2e66..c30a15b4 100644
--- a/frontend/src/components/FieldLayoutEditor.vue
+++ b/frontend/src/components/FieldLayoutEditor.vue
@@ -6,7 +6,7 @@
       <Draggable
         v-if="tabs.length && tabs[tabIndex].label"
         :list="tabs"
-        item-key="label"
+        item-key="name"
         class="flex items-center gap-2"
         @end="(e) => (tabIndex = e.newIndex)"
       >
@@ -66,10 +66,10 @@
         </template>
       </Button>
     </div>
-    <div v-show="tabIndex == i" v-for="(tab, i) in tabs" :key="tab.label">
+    <div v-show="tabIndex == i" v-for="(tab, i) in tabs" :key="tab.name">
       <Draggable
         :list="tab.sections"
-        item-key="label"
+        item-key="name"
         class="flex flex-col gap-5.5"
       >
         <template #item="{ element: section, index: i }">
@@ -123,7 +123,7 @@
               class="flex gap-2"
               :list="section.columns"
               group="columns"
-              item-key="fields"
+              item-key="name"
             >
               <template #item="{ element: column }">
                 <div
@@ -132,7 +132,7 @@
                   <Draggable
                     :list="column.fields"
                     group="fields"
-                    item-key="label"
+                    item-key="name"
                     class="flex flex-col gap-1.5"
                     handle=".cursor-grab"
                   >
diff --git a/frontend/src/components/Modals/SidePanelModal.vue b/frontend/src/components/Modals/SidePanelModal.vue
index fb0fa183..29130a01 100644
--- a/frontend/src/components/Modals/SidePanelModal.vue
+++ b/frontend/src/components/Modals/SidePanelModal.vue
@@ -39,7 +39,7 @@
           <div v-if="preview" class="flex flex-1 flex-col border rounded">
             <div
               v-for="(section, i) in tabs.data[0].sections"
-              :key="section.label"
+              :key="section.name"
               class="flex flex-col py-1.5 px-1"
               :class="{
                 'border-b': i !== tabs.data[0].sections?.length - 1,
@@ -51,8 +51,8 @@
                 :opened="section.opened"
               >
                 <SidePanelLayout
-                  :fields="section.columns[0].fields"
-                  :isLastSection="i == section.data?.length - 1"
+                  :fields="section.columns?.[0].fields || []"
+                  :isLastSection="i == tabs.data[0].sections?.length - 1"
                   v-model="data"
                 />
               </Section>
diff --git a/frontend/src/components/SidePanelLayout.vue b/frontend/src/components/SidePanelLayout.vue
index 788f7dd1..bf085ec6 100644
--- a/frontend/src/components/SidePanelLayout.vue
+++ b/frontend/src/components/SidePanelLayout.vue
@@ -5,7 +5,7 @@
   >
     <div
       v-for="field in _fields"
-      :key="field.label"
+      :key="field.name"
       :class="[field.hidden && 'hidden']"
       class="section-field flex items-center gap-2 px-3 leading-5 first:mt-3"
     >
diff --git a/frontend/src/components/SidePanelLayoutEditor.vue b/frontend/src/components/SidePanelLayoutEditor.vue
index b9213070..d852b243 100644
--- a/frontend/src/components/SidePanelLayoutEditor.vue
+++ b/frontend/src/components/SidePanelLayoutEditor.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Draggable :list="sections" item-key="label" class="flex flex-col gap-5.5">
+    <Draggable :list="sections" item-key="name" class="flex flex-col gap-5.5">
       <template #item="{ element: section }">
         <div class="flex flex-col gap-3">
           <div
@@ -56,7 +56,7 @@
             <Draggable
               :list="section.columns?.[0].fields || []"
               group="fields"
-              item-key="label"
+              item-key="name"
               class="flex flex-col gap-1.5"
               handle=".cursor-grab"
             >
diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue
index 68ada588..418bfc46 100644
--- a/frontend/src/pages/Contact.vue
+++ b/frontend/src/pages/Contact.vue
@@ -123,7 +123,7 @@
         <div class="flex flex-col overflow-y-auto">
           <div
             v-for="(section, i) in fieldsLayout.data"
-            :key="section.label"
+            :key="section.name"
             class="flex flex-col p-3"
             :class="{ 'border-b': i !== fieldsLayout.data.length - 1 }"
           >
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index 6154ecc8..d2097c1b 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -120,7 +120,7 @@
         <div class="flex flex-col overflow-y-auto">
           <div
             v-for="(section, i) in fieldsLayout.data"
-            :key="section.label"
+            :key="section.name"
             class="section flex flex-col p-3"
             :class="{ 'border-b': i !== fieldsLayout.data.length - 1 }"
           >
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index ba586364..af6cca2f 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -173,7 +173,7 @@
         <div class="flex flex-col overflow-y-auto">
           <div
             v-for="(section, i) in fieldsLayout.data"
-            :key="section.label"
+            :key="section.name"
             class="flex flex-col p-3"
             :class="{ 'border-b': i !== fieldsLayout.data.length - 1 }"
           >
diff --git a/frontend/src/pages/MobileContact.vue b/frontend/src/pages/MobileContact.vue
index af10a11c..c97e6b5f 100644
--- a/frontend/src/pages/MobileContact.vue
+++ b/frontend/src/pages/MobileContact.vue
@@ -137,7 +137,7 @@
             <div class="flex flex-col overflow-y-auto">
               <div
                 v-for="(section, i) in fieldsLayout.data"
-                :key="section.label"
+                :key="section.name"
                 class="flex flex-col px-2 py-3 sm:p-3"
                 :class="{ 'border-b': i !== fieldsLayout.data.length - 1 }"
               >
diff --git a/frontend/src/pages/MobileDeal.vue b/frontend/src/pages/MobileDeal.vue
index 3af5ff1c..58efd5b9 100644
--- a/frontend/src/pages/MobileDeal.vue
+++ b/frontend/src/pages/MobileDeal.vue
@@ -65,7 +65,7 @@
           <div class="flex flex-col overflow-y-auto">
             <div
               v-for="(section, i) in fieldsLayout.data"
-              :key="section.label"
+              :key="section.name"
               class="flex flex-col px-2 py-3 sm:p-3"
               :class="{ 'border-b': i !== fieldsLayout.data.length - 1 }"
             >
diff --git a/frontend/src/pages/MobileLead.vue b/frontend/src/pages/MobileLead.vue
index 91e4b30b..56d39589 100644
--- a/frontend/src/pages/MobileLead.vue
+++ b/frontend/src/pages/MobileLead.vue
@@ -70,7 +70,7 @@
           <div class="flex flex-col overflow-y-auto">
             <div
               v-for="(section, i) in fieldsLayout.data"
-              :key="section.label"
+              :key="section.name"
               class="flex flex-col px-2 py-3 sm:p-3"
               :class="{ 'border-b': i !== fieldsLayout.data.length - 1 }"
             >
diff --git a/frontend/src/pages/MobileOrganization.vue b/frontend/src/pages/MobileOrganization.vue
index 5f84ba16..8b74f968 100644
--- a/frontend/src/pages/MobileOrganization.vue
+++ b/frontend/src/pages/MobileOrganization.vue
@@ -119,7 +119,7 @@
             <div class="flex flex-col overflow-y-auto">
               <div
                 v-for="(section, i) in fieldsLayout.data"
-                :key="section.label"
+                :key="section.name"
                 class="flex flex-col px-2 py-3 sm:p-3"
                 :class="{ 'border-b': i !== fieldsLayout.data.length - 1 }"
               >
diff --git a/frontend/src/pages/Organization.vue b/frontend/src/pages/Organization.vue
index 777be19b..0b4d63ac 100644
--- a/frontend/src/pages/Organization.vue
+++ b/frontend/src/pages/Organization.vue
@@ -108,7 +108,7 @@
         <div class="flex flex-col overflow-y-auto">
           <div
             v-for="(section, i) in fieldsLayout.data"
-            :key="section.label"
+            :key="section.name"
             class="flex flex-col p-3"
             :class="{ 'border-b': i !== fieldsLayout.data.length - 1 }"
           >