diff --git a/lib/libs/webforms/G2A/v202401.ts b/lib/libs/webforms/G2A/v202401.ts
index 22d205a874..823a68b4eb 100644
--- a/lib/libs/webforms/G2A/v202401.ts
+++ b/lib/libs/webforms/G2A/v202401.ts
@@ -53,6 +53,8 @@ export const v202401: FormSchema = {
                 ...DefaultFieldGroupProps,
                 appendText: "Add service or item",
                 removeText: "Remove",
+                fieldArrayClassName:
+                  DefaultFieldGroupProps.fieldArrayClassName + "space-y-6",
               },
               fields: [
                 {
@@ -165,6 +167,8 @@ export const v202401: FormSchema = {
                 ...DefaultFieldGroupProps,
                 appendText: "Add service or item",
                 removeText: "Remove",
+                fieldArrayClassName:
+                  DefaultFieldGroupProps.fieldArrayClassName + "space-y-6",
               },
               fields: [
                 {
@@ -184,11 +188,13 @@ export const v202401: FormSchema = {
                 {
                   rhf: "FieldArray",
                   name: "inc-range-cost-share-amount",
-                  formItemClassName:
-                    "ml-[0.6rem] px-4  border-l-4 border-l-primary mt-2",
                   props: {
                     appendText: "Add range",
-                    fieldArrayClassName: "flex-col",
+                    fieldArrayClassName:
+                      DefaultFieldGroupProps.fieldArrayClassName +
+                      "space-y-6 " +
+                      "ml-[0.6rem] px-4 border-l-4 border-l-primary mb-4",
+                    divider: true,
                   },
                   fields: [
                     {
@@ -375,7 +381,11 @@ export const v202401: FormSchema = {
               rhf: "FieldArray",
               props: {
                 appendText: "Add charge",
-                fieldArrayClassName: "flex-col",
+                fieldArrayClassName:
+                  DefaultFieldGroupProps.fieldArrayClassName +
+                  "space-y-6 " +
+                  "ml-[0.6rem] px-4 border-l-4 border-l-primary mb-4",
+                divider: true,
               },
               dependency: {
                 conditions: [
@@ -387,8 +397,6 @@ export const v202401: FormSchema = {
                 ],
                 effect: { type: "show" },
               },
-              formItemClassName:
-                "ml-[0.6rem] px-4  border-l-4 border-l-primary mt-2",
               fields: [
                 {
                   rhf: "WrappedGroup",
@@ -533,7 +541,11 @@ export const v202401: FormSchema = {
               rules: { required: "* Required" },
               props: {
                 appendText: "Add charge",
-                fieldArrayClassName: "flex-col",
+                fieldArrayClassName:
+                  DefaultFieldGroupProps.fieldArrayClassName +
+                  "space-y-6 " +
+                  "ml-[0.6rem] px-4 border-l-4 border-l-primary mb-4",
+                divider: true,
               },
               dependency: {
                 conditions: [
@@ -545,8 +557,6 @@ export const v202401: FormSchema = {
                 ],
                 effect: { type: "show" },
               },
-              formItemClassName:
-                "ml-[0.6rem] px-4 border-l-4 border-l-primary mt-2",
               fields: [
                 {
                   rhf: "WrappedGroup",
diff --git a/lib/libs/webforms/G2B/v202401.ts b/lib/libs/webforms/G2B/v202401.ts
index 2bc945def4..f86b5665a3 100644
--- a/lib/libs/webforms/G2B/v202401.ts
+++ b/lib/libs/webforms/G2B/v202401.ts
@@ -207,11 +207,13 @@ export const v202401: FormSchema = {
                 {
                   rhf: "FieldArray",
                   name: "inc-range-cost-share-amount",
-                  formItemClassName:
-                    "ml-[0.6rem] px-4  border-l-4 border-l-primary mt-2",
                   props: {
                     appendText: "Add range",
-                    fieldArrayClassName: "flex-col",
+                    fieldArrayClassName:
+                      DefaultFieldGroupProps.fieldArrayClassName +
+                      "space-y-6 " +
+                      "ml-[0.6rem] px-4 border-l-4 border-l-primary mb-4",
+                    divider: true,
                   },
                   fields: [
                     {
@@ -399,7 +401,11 @@ export const v202401: FormSchema = {
               rhf: "FieldArray",
               props: {
                 appendText: "Add charge",
-                fieldArrayClassName: "flex-col",
+                fieldArrayClassName:
+                  DefaultFieldGroupProps.fieldArrayClassName +
+                  "space-y-6 " +
+                  "ml-[0.6rem] px-4 border-l-4 border-l-primary mb-4",
+                divider: true,
               },
               dependency: {
                 conditions: [
@@ -411,8 +417,6 @@ export const v202401: FormSchema = {
                 ],
                 effect: { type: "show" },
               },
-              formItemClassName:
-                "ml-[0.6rem] px-4  border-l-4 border-l-primary mt-2",
               fields: [
                 {
                   rhf: "WrappedGroup",
@@ -558,7 +562,11 @@ export const v202401: FormSchema = {
               rules: { required: "* Required" },
               props: {
                 appendText: "Add charge",
-                fieldArrayClassName: "flex-col",
+                fieldArrayClassName:
+                  DefaultFieldGroupProps.fieldArrayClassName +
+                  "space-y-6 " +
+                  "ml-[0.6rem] px-4 border-l-4 border-l-primary mb-4",
+                divider: true,
               },
               dependency: {
                 conditions: [
@@ -570,8 +578,6 @@ export const v202401: FormSchema = {
                 ],
                 effect: { type: "show" },
               },
-              formItemClassName:
-                "ml-[0.6rem] px-4 border-l-4 border-l-primary mt-2",
               fields: [
                 {
                   rhf: "WrappedGroup",