diff --git a/frontend/src/components/DocFields.vue b/frontend/src/components/DocFields.vue
index bee3c890..dda99bb3 100644
--- a/frontend/src/components/DocFields.vue
+++ b/frontend/src/components/DocFields.vue
@@ -2,7 +2,7 @@
   <div
     class="my-3 flex items-center justify-between text-lg font-medium sm:mb-4 sm:mt-8"
   >
-    <div class="flex h-8 items-center text-xl font-semibold text-gray-800">
+    <div class="flex h-8 items-center text-xl font-semibold text-ink-gray-8 ">
       {{ __('Data') }}
       <Badge
         v-if="data.isDirty"
@@ -33,7 +33,7 @@
   </div>
   <div
     v-else
-    class="flex flex-col gap-3 mb-3 border border-outline-gray-1 p-3 sm:p-5 rounded-lg"
+    class="flex flex-col gap-3 border border-outline-gray-1 rounded-lg"
   >
     <Fields v-if="sections.data" :sections="sections.data" :data="data.doc" />
   </div>
diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index c26c73eb..ea4359bd 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -37,7 +37,7 @@
         <Section
           :label="view.name"
           :hideLabel="view.hideLabel"
-          :isOpened="view.opened"
+          :opened="view.opened"
         >
           <template #header="{ opened, hide, toggle }">
             <div
diff --git a/frontend/src/components/Mobile/MobileSidebar.vue b/frontend/src/components/Mobile/MobileSidebar.vue
index 1365f7a4..c13da7e2 100644
--- a/frontend/src/components/Mobile/MobileSidebar.vue
+++ b/frontend/src/components/Mobile/MobileSidebar.vue
@@ -38,7 +38,7 @@
               <Section
                 :label="view.name"
                 :hideLabel="view.hideLabel"
-                :isOpened="view.opened"
+                :opened="view.opened"
               >
                 <template #header="{ opened, hide, toggle }">
                   <div
diff --git a/frontend/src/components/Section.vue b/frontend/src/components/Section.vue
index b96cd914..d2ddf740 100644
--- a/frontend/src/components/Section.vue
+++ b/frontend/src/components/Section.vue
@@ -2,15 +2,25 @@
   <slot name="header" v-bind="{ opened, hide, open, close, toggle }">
     <div v-if="!hide" class="flex items-center justify-between">
       <div
-        class="flex h-7 text-ink-gray-9 max-w-fit cursor-pointer items-center gap-2 pl-2 pr-3 text-base font-semibold leading-5"
+        class="flex text-ink-gray-9 max-w-fit cursor-pointer items-center gap-2 text-base"
+        v-bind="$attrs"
         @click="toggle()"
       >
         <FeatherIcon
+          v-if="collapseIconPosition === 'left'"
+          name="chevron-right"
+          class="h-4 transition-all duration-300 ease-in-out"
+          :class="{ 'rotate-90': opened }"
+        />
+        <span>
+          {{ __(label) || __('Untitled') }}
+        </span>
+        <FeatherIcon
+          v-if="collapseIconPosition === 'right'"
           name="chevron-right"
           class="h-4 transition-all duration-300 ease-in-out"
           :class="{ 'rotate-90': opened }"
         />
-        {{ __(label) || __('Untitled') }}
       </div>
       <slot name="actions"></slot>
     </div>
@@ -23,13 +33,14 @@
     enter-from-class="max-h-0 overflow-hidden"
     leave-to-class="max-h-0 overflow-hidden"
   >
-    <div v-if="opened">
+    <div v-show="opened">
       <slot v-bind="{ opened, open, close, toggle }" />
     </div>
   </transition>
 </template>
 <script setup>
 import { ref } from 'vue'
+
 const props = defineProps({
   label: {
     type: String,
@@ -39,11 +50,19 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
-  isOpened: {
+  opened: {
     type: Boolean,
     default: true,
   },
+  collapseIconPosition: {
+    type: String,
+    default: 'left',
+  },
 })
+
+const hide = ref(props.hideLabel)
+const opened = ref(props.opened)
+
 function toggle() {
   opened.value = !opened.value
 }
@@ -55,7 +74,4 @@ function open() {
 function close() {
   opened.value = false
 }
-
-let opened = ref(props.isOpened)
-let hide = ref(props.hideLabel)
 </script>
diff --git a/frontend/src/components/Settings/SidePanelModal.vue b/frontend/src/components/Settings/SidePanelModal.vue
index 13d853c7..5d70ac68 100644
--- a/frontend/src/components/Settings/SidePanelModal.vue
+++ b/frontend/src/components/Settings/SidePanelModal.vue
@@ -42,7 +42,11 @@
               class="flex flex-col py-1.5 px-1"
               :class="{ 'border-b': i !== sections.data?.length - 1 }"
             >
-              <Section :is-opened="section.opened" :label="section.label">
+              <Section
+                class="p-2"
+                :label="section.label"
+                :opened="section.opened"
+              >
                 <SectionFields
                   :fields="section.fields"
                   :isLastSection="i == section.data?.length - 1"
diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue
index ec4ec256..db04f07b 100644
--- a/frontend/src/pages/Contact.vue
+++ b/frontend/src/pages/Contact.vue
@@ -60,9 +60,7 @@
                         clip-path: inset(22px 0 0 0);
                       "
                     >
-                      <CameraIcon
-                        class="h-6 w-6 cursor-pointer text-white"
-                      />
+                      <CameraIcon class="h-6 w-6 cursor-pointer text-white" />
                     </div>
                   </component>
                 </div>
@@ -129,7 +127,7 @@
             class="flex flex-col p-3"
             :class="{ 'border-b': i !== fieldsLayout.data.length - 1 }"
           >
-            <Section :is-opened="section.opened" :label="section.label">
+            <Section :label="section.label" :opened="section.opened">
               <template #actions>
                 <Button
                   v-if="i == 0 && isManager()"
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index 7040711f..a7a69e49 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -124,7 +124,11 @@
             class="section flex flex-col p-3"
             :class="{ 'border-b': i !== fieldsLayout.data.length - 1 }"
           >
-            <Section :is-opened="section.opened" :label="section.label">
+            <Section
+              class="px-2 font-semibold"
+              :label="section.label"
+              :opened="section.opened"
+            >
               <template #actions>
                 <div v-if="section.contacts" class="pr-2">
                   <Link
@@ -189,7 +193,7 @@
                     class="px-2 pb-2.5"
                     :class="[i == 0 ? 'pt-5' : 'pt-2.5']"
                   >
-                    <Section :is-opened="contact.opened">
+                    <Section :opened="contact.opened">
                       <template #header="{ opened, toggle }">
                         <div
                           class="flex cursor-pointer items-center justify-between gap-2 pr-1 text-base leading-5 text-ink-gray-7"
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index 939f3ee9..d7f226f8 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -177,7 +177,11 @@
             class="flex flex-col p-3"
             :class="{ 'border-b': i !== fieldsLayout.data.length - 1 }"
           >
-            <Section :is-opened="section.opened" :label="section.label">
+            <Section
+              class="px-2 font-semibold"
+              :label="section.label"
+              :opened="section.opened"
+            >
               <SectionFields
                 :fields="section.fields"
                 :isLastSection="i == fieldsLayout.data.length - 1"
diff --git a/frontend/src/pages/MobileContact.vue b/frontend/src/pages/MobileContact.vue
index 601c16c6..b4d00ba0 100644
--- a/frontend/src/pages/MobileContact.vue
+++ b/frontend/src/pages/MobileContact.vue
@@ -141,7 +141,7 @@
                 class="flex flex-col px-2 py-3 sm:p-3"
                 :class="{ 'border-b': i !== fieldsLayout.data.length - 1 }"
               >
-                <Section :is-opened="section.opened" :label="section.label">
+                <Section :label="section.label" :opened="section.opened">
                   <SectionFields
                     :fields="section.fields"
                     :isLastSection="i == fieldsLayout.data.length - 1"
diff --git a/frontend/src/pages/MobileDeal.vue b/frontend/src/pages/MobileDeal.vue
index ad87bf2b..29b29d83 100644
--- a/frontend/src/pages/MobileDeal.vue
+++ b/frontend/src/pages/MobileDeal.vue
@@ -69,7 +69,7 @@
               class="flex flex-col px-2 py-3 sm:p-3"
               :class="{ 'border-b': i !== fieldsLayout.data.length - 1 }"
             >
-              <Section :is-opened="section.opened" :label="section.label">
+              <Section :label="section.label" :opened="section.opened">
                 <template #actions>
                   <div v-if="section.contacts" class="pr-2">
                     <Link
@@ -124,7 +124,7 @@
                       class="px-2 pb-2.5"
                       :class="[i == 0 ? 'pt-5' : 'pt-2.5']"
                     >
-                      <Section :is-opened="contact.opened">
+                      <Section :opened="contact.opened">
                         <template #header="{ opened, toggle }">
                           <div
                             class="flex cursor-pointer items-center justify-between gap-2 pr-1 text-base leading-5 text-ink-gray-7"
diff --git a/frontend/src/pages/MobileLead.vue b/frontend/src/pages/MobileLead.vue
index dac90935..63a5d308 100644
--- a/frontend/src/pages/MobileLead.vue
+++ b/frontend/src/pages/MobileLead.vue
@@ -74,7 +74,7 @@
               class="flex flex-col px-2 py-3 sm:p-3"
               :class="{ 'border-b': i !== fieldsLayout.data.length - 1 }"
             >
-              <Section :is-opened="section.opened" :label="section.label">
+              <Section :label="section.label" :opened="section.opened">
                 <SectionFields
                   :fields="section.fields"
                   :isLastSection="i == fieldsLayout.data.length - 1"
diff --git a/frontend/src/pages/MobileOrganization.vue b/frontend/src/pages/MobileOrganization.vue
index dd81e07c..c3afd539 100644
--- a/frontend/src/pages/MobileOrganization.vue
+++ b/frontend/src/pages/MobileOrganization.vue
@@ -123,7 +123,7 @@
                 class="flex flex-col px-2 py-3 sm:p-3"
                 :class="{ 'border-b': i !== fieldsLayout.data.length - 1 }"
               >
-                <Section :is-opened="section.opened" :label="section.label">
+                <Section :label="section.label" :opened="section.opened">
                   <SectionFields
                     :fields="section.fields"
                     :isLastSection="i == fieldsLayout.data.length - 1"
diff --git a/frontend/src/pages/Organization.vue b/frontend/src/pages/Organization.vue
index 04baa9e0..10d357e2 100644
--- a/frontend/src/pages/Organization.vue
+++ b/frontend/src/pages/Organization.vue
@@ -112,7 +112,7 @@
             class="flex flex-col p-3"
             :class="{ 'border-b': i !== fieldsLayout.data.length - 1 }"
           >
-            <Section :is-opened="section.opened" :label="section.label">
+            <Section :label="section.label" :opened="section.opened">
               <template #actions>
                 <Button
                   v-if="i == 0 && isManager()"