From 54e5129fd4994e3db24fb4a1e76f75369db7c2a7 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 7 Apr 2021 17:39:46 -0700
Subject: [PATCH] Cleanup Shop Config.

---
 bodyshop_translations.babel                   |  191 +-
 .../colorpicker-form-item.component.jsx       |   10 +-
 .../layout-form-row.component.jsx             |   35 +-
 .../shop-info/shop-info.component.jsx         |  848 +--------
 .../shop-info/shop-info.general.component.jsx |  690 +++++++
 .../shop-info/shop-info.intake.component.jsx  |  574 +++---
 .../shop-info.orderstatus.component.jsx       |  103 +-
 ...p-info.responsibilitycenters.component.jsx | 1649 ++++++++---------
 .../shop-info.rostatus.component.jsx          |  525 +++---
 .../shop-info.scheduling.component.jsx        |  453 +++--
 .../shop-info.speedprint.component.jsx        |  155 +-
 .../tech-lookup-jobs-drawer.component.jsx     |    4 +-
 .../time-ticket-list.component.jsx            |    1 -
 client/src/translations/en_us/common.json     |   11 +-
 client/src/translations/es/common.json        |    9 +
 client/src/translations/fr/common.json        |    9 +
 16 files changed, 2682 insertions(+), 2585 deletions(-)
 create mode 100644 client/src/components/shop-info/shop-info.general.component.jsx

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index bbd145616..8f59d82c8 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -6451,6 +6451,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>accountingsetup</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>accountingtiers</name>
                                         <definition_loaded>false</definition_loaded>
@@ -6535,6 +6556,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>businessinformation</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>checklists</name>
                                         <definition_loaded>false</definition_loaded>
@@ -6682,6 +6724,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>insurancecos</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>intakechecklist</name>
                                         <definition_loaded>false</definition_loaded>
@@ -6766,6 +6829,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>messagingpresets</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>notemplatesavailable</name>
                                         <definition_loaded>false</definition_loaded>
@@ -6787,6 +6871,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>notespresets</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>orderstatuses</name>
                                         <definition_loaded>false</definition_loaded>
@@ -6808,6 +6913,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>partslocations</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>rbac</name>
                                         <definition_loaded>false</definition_loaded>
@@ -6960,6 +7086,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>scoreboardsetup</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>shopinfo</name>
                                         <definition_loaded>false</definition_loaded>
@@ -7002,6 +7149,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>ssbuckets</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>systemsettings</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>workingdays</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/form-items-formatted/colorpicker-form-item.component.jsx b/client/src/components/form-items-formatted/colorpicker-form-item.component.jsx
index 41de4e995..10734e291 100644
--- a/client/src/components/form-items-formatted/colorpicker-form-item.component.jsx
+++ b/client/src/components/form-items-formatted/colorpicker-form-item.component.jsx
@@ -1,14 +1,14 @@
-import React, { forwardRef } from "react";
-import { BlockPicker } from "react-color";
+import React from "react";
+import { SliderPicker } from "react-color";
 //To be used as a form element only.
 
-const ColorPickerFormItem = ({ value, onChange, style, ...restProps }, ref) => {
+const ColorPickerFormItem = ({ value, onChange, style, ...restProps }) => {
   const handleChangeComplete = (color) => {
     if (onChange) onChange(color);
   };
 
   return (
-    <BlockPicker
+    <SliderPicker
       {...restProps}
       style={{ width: "100%", ...style }}
       color={value}
@@ -17,4 +17,4 @@ const ColorPickerFormItem = ({ value, onChange, style, ...restProps }, ref) => {
     />
   );
 };
-export default forwardRef(ColorPickerFormItem);
+export default ColorPickerFormItem;
diff --git a/client/src/components/layout-form-row/layout-form-row.component.jsx b/client/src/components/layout-form-row/layout-form-row.component.jsx
index df3ca3c03..d2db2f23f 100644
--- a/client/src/components/layout-form-row/layout-form-row.component.jsx
+++ b/client/src/components/layout-form-row/layout-form-row.component.jsx
@@ -1,4 +1,4 @@
-import { Col, Divider, Row, Typography } from "antd";
+import { Col, Divider, Row } from "antd";
 import React from "react";
 import "./layout-form-row.styles.scss";
 
@@ -9,13 +9,26 @@ export default function LayoutFormRow({
   noDivider = false,
   ...restProps
 }) {
+  const DividerHeader = () =>
+    !noDivider && (
+      <Divider
+        orientation="left"
+        type="horizontal"
+        style={{ marginTop: ".8rem" }}
+      >
+        {header}
+      </Divider>
+    );
+
   if (!!!children.length) {
     //We have only one element. It's going to get the whole thing.
     return (
-      <div className="imex-form-row">
-        {header ? (
-          <Typography.Title level={4}>{header}</Typography.Title>
-        ) : null}
+      <div
+        className="imex-form-row"
+        {...restProps}
+        style={{ marginBottom: ".8rem", ...restProps.style }}
+      >
+        <DividerHeader />
         {children}
       </div>
     );
@@ -44,12 +57,12 @@ export default function LayoutFormRow({
   };
   //{header ? <Typography.Title level={4}>{header}</Typography.Title> : null}
   return (
-    <div className="imex-form-row" {...restProps}>
-      {!noDivider && (
-        <Divider orientation="left" type="horizontal">
-          {header}
-        </Divider>
-      )}
+    <div
+      className="imex-form-row"
+      {...restProps}
+      style={{ marginBottom: ".8rem", ...restProps.style }}
+    >
+      <DividerHeader />
       <Row {...rowGutter}>
         {children.map(
           (c, idx) =>
diff --git a/client/src/components/shop-info/shop-info.component.jsx b/client/src/components/shop-info/shop-info.component.jsx
index d0246857b..da993d9c7 100644
--- a/client/src/components/shop-info/shop-info.component.jsx
+++ b/client/src/components/shop-info/shop-info.component.jsx
@@ -1,21 +1,7 @@
-import { DeleteFilled } from "@ant-design/icons";
-import {
-  Button,
-  Collapse,
-  Form,
-  Input,
-  InputNumber,
-  Radio,
-  Select,
-  Switch,
-} from "antd";
+import { Button, Card, Tabs } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import PhoneFormItem, {
-  PhoneItemFormatterValidation,
-} from "../form-items-formatted/phone-form-item.component";
-import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
-import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import ShopInfoGeneral from "./shop-info.general.component";
 import ShopInfoIntakeChecklistComponent from "./shop-info.intake.component";
 import ShopInfoLaborRates from "./shop-info.laborrates.component";
 import ShopInfoOrderStatusComponent from "./shop-info.orderstatus.component";
@@ -28,814 +14,52 @@ import ShopInfoSpeedPrint from "./shop-info.speedprint.component";
 export default function ShopInfoComponent({ form, saveLoading }) {
   const { t } = useTranslation();
   return (
-    <div>
-      <Button
-        type="primary"
-        loading={saveLoading}
-        onClick={() => form.submit()}
-      >
-        {t("general.actions.save")}
-      </Button>
-      <Collapse>
-        <Collapse.Panel key="shopinfo" header={t("bodyshop.labels.shopinfo")}>
-          <LayoutFormRow>
-            <Form.Item
-              label={t("bodyshop.fields.shopname")}
-              name="shopname"
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <Input />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.address1")}
-              name="address1"
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <Input />
-            </Form.Item>
-            <Form.Item label={t("bodyshop.fields.address2")} name="address2">
-              <Input />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.city")}
-              name="city"
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <Input />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.state")}
-              name="state"
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <Input />
-            </Form.Item>
-            <Form.Item label={t("bodyshop.fields.zip_post")} name="zip_post">
-              <Input />
-            </Form.Item>
-          </LayoutFormRow>
-          <LayoutFormRow>
-            <Form.Item label={t("bodyshop.fields.country")} name="country">
-              <Input />
-            </Form.Item>
-            <Form.Item label={t("bodyshop.fields.email")} name="email">
-              <Input />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.phone")}
-              name="phone"
-              rules={[
-                ({ getFieldValue }) =>
-                  PhoneItemFormatterValidation(getFieldValue, "phone"),
-              ]}
-            >
-              <PhoneFormItem />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.federal_tax_id")}
-              name="federal_tax_id"
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <Input />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.insurance_vendor_id")}
-              name="insurance_vendor_id"
-            >
-              <Input />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.logo_img_path")}
-              name={["logo_img_path", "src"]}
-            >
-              <Input />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.logo_img_path_height")}
-              name={["logo_img_path", "height"]}
-            >
-              <Input />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.logo_img_path_width")}
-              name={["logo_img_path", "width"]}
-            >
-              <Input />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.state_tax_id")}
-              name="state_tax_id"
-            >
-              <Input />
-            </Form.Item>
-          </LayoutFormRow>
-          <LayoutFormRow>
-            <Form.Item
-              label={t("bodyshop.fields.invoice_federal_tax_rate")}
-              name={["bill_tax_rates", "federal_tax_rate"]}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.invoice_state_tax_rate")}
-              name={["bill_tax_rates", "state_tax_rate"]}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.invoice_local_tax_rate")}
-              name={["bill_tax_rates", "local_tax_rate"]}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <InputNumber />
-            </Form.Item>
-
-            <Form.Item
-              label={t("bodyshop.fields.appt_length")}
-              name={"appt_length"}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <InputNumber min={15} precision={0} />
-            </Form.Item>
-          </LayoutFormRow>
-          <LayoutFormRow header={t("bodyshop.labels.workingdays")}>
-            <Form.Item
-              label={t("general.labels.sunday")}
-              name={["workingdays", "sunday"]}
-              valuePropName="checked"
-            >
-              <Switch />
-            </Form.Item>
-            <Form.Item
-              label={t("general.labels.monday")}
-              name={["workingdays", "monday"]}
-              valuePropName="checked"
-            >
-              <Switch />
-            </Form.Item>
-            <Form.Item
-              label={t("general.labels.tuesday")}
-              name={["workingdays", "tuesday"]}
-              valuePropName="checked"
-            >
-              <Switch />
-            </Form.Item>
-            <Form.Item
-              label={t("general.labels.wednesday")}
-              name={["workingdays", "wednesday"]}
-              valuePropName="checked"
-            >
-              <Switch />
-            </Form.Item>
-            <Form.Item
-              label={t("general.labels.thursday")}
-              name={["workingdays", "thursday"]}
-              valuePropName="checked"
-            >
-              <Switch />
-            </Form.Item>
-            <Form.Item
-              label={t("general.labels.friday")}
-              name={["workingdays", "friday"]}
-              valuePropName="checked"
-            >
-              <Switch />
-            </Form.Item>
-            <Form.Item
-              label={t("general.labels.saturday")}
-              name={["workingdays", "saturday"]}
-              valuePropName="checked"
-            >
-              <Switch />
-            </Form.Item>
-          </LayoutFormRow>
-          <LayoutFormRow>
-            <Form.Item
-              label={t("bodyshop.fields.dailypainttarget")}
-              name={["scoreboard_target", "dailyPaintTarget"]}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <InputNumber min={0} precision={0} />
-            </Form.Item>
-
-            <Form.Item
-              label={t("bodyshop.fields.dailybodytarget")}
-              name={["scoreboard_target", "dailyBodyTarget"]}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <InputNumber min={0} precision={0} />
-            </Form.Item>
-
-            <Form.Item
-              label={t("bodyshop.fields.lastnumberworkingdays")}
-              name={["scoreboard_target", "lastNumberWorkingDays"]}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <InputNumber min={0} max={12} precision={0} />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.prodtargethrs")}
-              name={["prodtargethrs"]}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <InputNumber min={1} precision={1} />
-            </Form.Item>
-            <Form.Item
-              name={["md_referral_sources"]}
-              label={t("bodyshop.fields.md_referral_sources")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                  type: "array",
-                },
-              ]}
-            >
-              <Select mode="tags" />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.labels.accountingtiers")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["accountingconfig", "tiers"]}
-            >
-              <Radio.Group>
-                <Radio value={2}>2</Radio>
-                <Radio value={3}>3</Radio>
-              </Radio.Group>
-            </Form.Item>
-
-            <Form.Item
-              label={t("bodyshop.fields.inhousevendorid")}
-              name={"inhousevendorid"}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <Input />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.default_adjustment_rate")}
-              name={"default_adjustment_rate"}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <InputNumber min={0} precision={2} />
-            </Form.Item>
-            <Form.Item shouldUpdate>
-              {() => {
-                return (
-                  <Form.Item
-                    label={t("bodyshop.labels.2tiersetup")}
-                    shouldUpdate
-                    rules={[
-                      {
-                        required:
-                          form.getFieldValue(["accountingconfig", "tiers"]) ===
-                          2,
-                        message: t("general.validation.required"),
-                      },
-                    ]}
-                    name={["accountingconfig", "twotierpref"]}
-                  >
-                    <Radio.Group
-                      disabled={
-                        form.getFieldValue(["accountingconfig", "tiers"]) === 3
-                      }
-                    >
-                      <Radio value="name">
-                        {t("bodyshop.labels.2tiername")}
-                      </Radio>
-                      <Radio value="source">
-                        {t("bodyshop.labels.2tiersource")}
-                      </Radio>
-                    </Radio.Group>
-                  </Form.Item>
-                );
-              }}
-            </Form.Item>
-          </LayoutFormRow>
-          <Form.List name={["md_messaging_presets"]}>
-            {(fields, { add, remove, move }) => {
-              return (
-                <div>
-                  {fields.map((field, index) => (
-                    <Form.Item
-                      key={field.key}
-                      style={{ padding: 0, margin: 2 }}
-                    >
-                      <div style={{ display: "flex" }}>
-                        <Form.Item
-                          style={{ padding: 0, margin: 2 }}
-                          label={t("bodyshop.fields.messaginglabel")}
-                          key={`${index}label`}
-                          name={[field.name, "label"]}
-                          rules={[
-                            {
-                              required: true,
-                              message: t("general.validation.required"),
-                            },
-                          ]}
-                        >
-                          <Input />
-                        </Form.Item>
-                        <Form.Item
-                          style={{ padding: 0, margin: 2 }}
-                          label={t("bodyshop.fields.messagingtext")}
-                          key={`${index}text`}
-                          name={[field.name, "text"]}
-                          rules={[
-                            {
-                              required: true,
-                              message: t("general.validation.required"),
-                            },
-                          ]}
-                        >
-                          <Input />
-                        </Form.Item>
-                        <DeleteFilled
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                        <FormListMoveArrows
-                          move={move}
-                          index={index}
-                          total={fields.length}
-                        />
-                      </div>
-                    </Form.Item>
-                  ))}
-                  <Form.Item>
-                    <Button
-                      type="dashed"
-                      onClick={() => {
-                        add();
-                      }}
-                      style={{ width: "100%" }}
-                    >
-                      {t("general.actions.add")}
-                    </Button>
-                  </Form.Item>
-                </div>
-              );
-            }}
-          </Form.List>
-
-          <Form.List name={["md_notes_presets"]}>
-            {(fields, { add, remove, move }) => {
-              return (
-                <div>
-                  {fields.map((field, index) => (
-                    <Form.Item
-                      key={field.key}
-                      style={{ padding: 0, margin: 2 }}
-                    >
-                      <div style={{ display: "flex" }}>
-                        <Form.Item
-                          style={{ padding: 0, margin: 2 }}
-                          label={t("bodyshop.fields.noteslabel")}
-                          key={`${index}label`}
-                          name={[field.name, "label"]}
-                          rules={[
-                            {
-                              required: true,
-                              message: t("general.validation.required"),
-                            },
-                          ]}
-                        >
-                          <Input />
-                        </Form.Item>
-                        <Form.Item
-                          style={{ padding: 0, margin: 2 }}
-                          label={t("bodyshop.fields.notestext")}
-                          key={`${index}text`}
-                          name={[field.name, "text"]}
-                          rules={[
-                            {
-                              required: true,
-                              message: t("general.validation.required"),
-                            },
-                          ]}
-                        >
-                          <Input />
-                        </Form.Item>
-                        <DeleteFilled
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                        <FormListMoveArrows
-                          move={move}
-                          index={index}
-                          total={fields.length}
-                        />
-                      </div>
-                    </Form.Item>
-                  ))}
-                  <Form.Item>
-                    <Button
-                      type="dashed"
-                      onClick={() => {
-                        add();
-                      }}
-                      style={{ width: "100%" }}
-                    >
-                      {t("general.actions.add")}
-                    </Button>
-                  </Form.Item>
-                </div>
-              );
-            }}
-          </Form.List>
-
-          <Form.List name={["md_parts_locations"]}>
-            {(fields, { add, remove, move }) => {
-              return (
-                <div>
-                  {fields.map((field, index) => (
-                    <Form.Item
-                      key={field.key}
-                      style={{ padding: 0, margin: 2 }}
-                    >
-                      <div className="imex-flex-row">
-                        <Form.Item
-                          className="imex-flex-row__margin"
-                          label={t("bodyshop.fields.partslocation")}
-                          key={`${index}`}
-                          name={[field.name]}
-                          rules={[
-                            {
-                              required: true,
-                              message: t("general.validation.required"),
-                            },
-                          ]}
-                        >
-                          <Input />
-                        </Form.Item>
-
-                        <DeleteFilled
-                          className="imex-flex-row__margin"
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                        <FormListMoveArrows
-                          move={move}
-                          index={index}
-                          total={fields.length}
-                        />
-                      </div>
-                    </Form.Item>
-                  ))}
-                  <Form.Item>
-                    <Button
-                      type="dashed"
-                      onClick={() => {
-                        add();
-                      }}
-                      style={{ width: "100%" }}
-                    >
-                      {t("bodyshop.actions.addpartslocation")}
-                    </Button>
-                  </Form.Item>
-                </div>
-              );
-            }}
-          </Form.List>
-
-          <Form.List name={["md_ins_cos"]}>
-            {(fields, { add, remove, move }) => {
-              return (
-                <div>
-                  {fields.map((field, index) => (
-                    <Form.Item
-                      key={field.key}
-                      style={{ padding: 0, margin: 2 }}
-                    >
-                      <div style={{ display: "flex" }}>
-                        <Form.Item
-                          style={{ padding: 0, margin: 2 }}
-                          label={t("bodyshop.fields.md_ins_co.name")}
-                          key={`${index}name`}
-                          name={[field.name, "name"]}
-                          rules={[
-                            {
-                              required: true,
-                              message: t("general.validation.required"),
-                            },
-                          ]}
-                        >
-                          <Input />
-                        </Form.Item>
-                        <Form.Item
-                          style={{ padding: 0, margin: 2 }}
-                          label={t("bodyshop.fields.md_ins_co.street1")}
-                          key={`${index}street1`}
-                          name={[field.name, "street1"]}
-                        >
-                          <Input />
-                        </Form.Item>
-                        <Form.Item
-                          style={{ padding: 0, margin: 2 }}
-                          label={t("bodyshop.fields.md_ins_co.street2")}
-                          key={`${index}street2`}
-                          name={[field.name, "street2"]}
-                        >
-                          <Input />
-                        </Form.Item>
-                        <Form.Item
-                          style={{ padding: 0, margin: 2 }}
-                          label={t("bodyshop.fields.md_ins_co.city")}
-                          key={`${index}city`}
-                          name={[field.name, "city"]}
-                        >
-                          <Input />
-                        </Form.Item>
-                        <Form.Item
-                          style={{ padding: 0, margin: 2 }}
-                          label={t("bodyshop.fields.md_ins_co.state")}
-                          key={`${index}state`}
-                          name={[field.name, "state"]}
-                        >
-                          <Input />
-                        </Form.Item>
-                        <Form.Item
-                          style={{ padding: 0, margin: 2 }}
-                          label={t("bodyshop.fields.md_ins_co.zip")}
-                          key={`${index}zip`}
-                          name={[field.name, "zip"]}
-                        >
-                          <Input />
-                        </Form.Item>
-                        <DeleteFilled
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                        <FormListMoveArrows
-                          move={move}
-                          index={index}
-                          total={fields.length}
-                        />
-                      </div>
-                    </Form.Item>
-                  ))}
-                  <Form.Item>
-                    <Button
-                      type="dashed"
-                      onClick={() => {
-                        add();
-                      }}
-                      style={{ width: "100%" }}
-                    >
-                      {t("general.actions.add")}
-                    </Button>
-                  </Form.Item>
-                </div>
-              );
-            }}
-          </Form.List>
-
-          <LayoutFormRow>
-            <Form.Item
-              name={["md_payment_types"]}
-              label={t("bodyshop.fields.md_payment_types")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                  type: "array",
-                },
-              ]}
-            >
-              <Select mode="tags" />
-            </Form.Item>
-            <Form.Item
-              name={["md_classes"]}
-              label={t("bodyshop.fields.md_classes")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                  type: "array",
-                },
-              ]}
-            >
-              <Select mode="tags" />
-            </Form.Item>
-            <Form.Item
-              name={["md_categories"]}
-              label={t("bodyshop.fields.md_categories")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                  type: "array",
-                },
-              ]}
-            >
-              <Select mode="tags" />
-            </Form.Item>
-
-            <Form.Item
-              name={["enforce_class"]}
-              label={t("bodyshop.fields.enforce_class")}
-              valuePropName="checked"
-            >
-              <Switch />
-            </Form.Item>
-            <Form.Item
-              name={["target_touchtime"]}
-              label={t("bodyshop.fields.target_touchtime")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <InputNumber min={0.1} precision={1} />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.use_fippa")}
-              name={["use_fippa"]}
-              valuePropName="checked"
-            >
-              <Switch />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.md_hour_split.prep")}
-              name={["md_hour_split", "prep"]}
-              dependencies={[["md_hour_split", "paint"]]}
-              rules={[
-                ({ getFieldValue }) => ({
-                  validator(rule, value) {
-                    if (!value && !getFieldValue(["md_hour_split", "paint"])) {
-                      return Promise.resolve();
-                    }
-                    if (
-                      value + getFieldValue(["md_hour_split", "paint"]) ===
-                      1
-                    ) {
-                      return Promise.resolve();
-                    }
-                    return Promise.reject(t("bodyshop.validation.larsplit"));
-                  },
-                }),
-              ]}
-            >
-              <InputNumber min={0} max={1} precision={2} />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.md_hour_split.paint")}
-              name={["md_hour_split", "paint"]}
-              dependencies={[["md_hour_split", "prep"]]}
-              rules={[
-                ({ getFieldValue }) => ({
-                  validator(rule, value) {
-                    if (!value && !getFieldValue(["md_hour_split", "paint"])) {
-                      return Promise.resolve();
-                    }
-                    if (
-                      value + getFieldValue(["md_hour_split", "prep"]) ===
-                      1
-                    ) {
-                      return Promise.resolve();
-                    }
-                    return Promise.reject(t("bodyshop.validation.larsplit"));
-                  },
-                }),
-              ]}
-            >
-              <InputNumber min={0} max={1} precision={2} />
-            </Form.Item>
-          </LayoutFormRow>
-        </Collapse.Panel>
-        <Collapse.Panel
-          key="speedprint"
-          header={t("bodyshop.labels.speedprint")}
+    <Card
+      extra={
+        <Button
+          type="primary"
+          loading={saveLoading}
+          onClick={() => form.submit()}
         >
+          {t("general.actions.save")}
+        </Button>
+      }
+    >
+      <Tabs>
+        <Tabs.TabPane key="general" tab={t("bodyshop.labels.shopinfo")}>
+          <ShopInfoGeneral form={form} />
+        </Tabs.TabPane>
+        <Tabs.TabPane key="speedprint" tab={t("bodyshop.labels.speedprint")}>
           <ShopInfoSpeedPrint form={form} />
-        </Collapse.Panel>
-        <Collapse.Panel key="rbac" header={t("bodyshop.labels.rbac")}>
+        </Tabs.TabPane>
+        <Tabs.TabPane key="rbac" tab={t("bodyshop.labels.rbac")}>
           <ShopInfoRbacComponent form={form} />
-        </Collapse.Panel>
-        <Collapse.Panel
-          key="roStatus"
-          header={t("bodyshop.labels.jobstatuses")}
-        >
+        </Tabs.TabPane>
+        <Tabs.TabPane key="roStatus" tab={t("bodyshop.labels.jobstatuses")}>
           <ShopInfoROStatusComponent form={form} />
-        </Collapse.Panel>
-        <Collapse.Panel
-          key="scheduling"
-          header={t("bodyshop.labels.scheduling")}
-        >
+        </Tabs.TabPane>
+        <Tabs.TabPane key="scheduling" tab={t("bodyshop.labels.scheduling")}>
           <ShopInfoSchedulingComponent form={form} />
-        </Collapse.Panel>
-        <Collapse.Panel
+        </Tabs.TabPane>
+        <Tabs.TabPane
           key="orderStatus"
-          header={t("bodyshop.labels.orderstatuses")}
+          tab={t("bodyshop.labels.orderstatuses")}
         >
           <ShopInfoOrderStatusComponent form={form} />
-        </Collapse.Panel>
-        <Collapse.Panel
+        </Tabs.TabPane>
+        <Tabs.TabPane
           key="responsibilityCenters"
-          header={t("bodyshop.labels.responsibilitycenters.title")}
+          tab={t("bodyshop.labels.responsibilitycenters.title")}
         >
           <ShopInfoResponsibilityCenterComponent form={form} />
-        </Collapse.Panel>
-        <Collapse.Panel
-          key="checklists"
-          header={t("bodyshop.labels.checklists")}
-        >
+        </Tabs.TabPane>
+        <Tabs.TabPane key="checklists" tab={t("bodyshop.labels.checklists")}>
           <ShopInfoIntakeChecklistComponent form={form} />
-        </Collapse.Panel>
-        <Collapse.Panel
-          key="laborrates"
-          header={t("bodyshop.labels.laborrates")}
-        >
+        </Tabs.TabPane>
+        <Tabs.TabPane key="laborrates" tab={t("bodyshop.labels.laborrates")}>
           <ShopInfoLaborRates form={form} />
-        </Collapse.Panel>
-      </Collapse>
-    </div>
+        </Tabs.TabPane>
+      </Tabs>
+    </Card>
   );
 }
diff --git a/client/src/components/shop-info/shop-info.general.component.jsx b/client/src/components/shop-info/shop-info.general.component.jsx
new file mode 100644
index 000000000..1000af7b3
--- /dev/null
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -0,0 +1,690 @@
+import { DeleteFilled } from "@ant-design/icons";
+import {
+  Button,
+  Form,
+  Input,
+  InputNumber,
+  Radio,
+  Select,
+  Space,
+  Switch,
+} from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import PhoneFormItem, {
+  PhoneItemFormatterValidation,
+} from "../form-items-formatted/phone-form-item.component";
+import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+
+export default function ShopInfoGeneral({ form }) {
+  const { t } = useTranslation();
+  return (
+    <div>
+      <LayoutFormRow header={t("bodyshop.labels.businessinformation")}>
+        <Form.Item
+          label={t("bodyshop.fields.shopname")}
+          name="shopname"
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.address1")}
+          name="address1"
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item label={t("bodyshop.fields.address2")} name="address2">
+          <Input />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.city")}
+          name="city"
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.state")}
+          name="state"
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item label={t("bodyshop.fields.zip_post")} name="zip_post">
+          <Input />
+        </Form.Item>
+        <Form.Item label={t("bodyshop.fields.country")} name="country">
+          <Input />
+        </Form.Item>
+        <Form.Item label={t("bodyshop.fields.email")} name="email">
+          <Input />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.phone")}
+          name="phone"
+          rules={[
+            ({ getFieldValue }) =>
+              PhoneItemFormatterValidation(getFieldValue, "phone"),
+          ]}
+        >
+          <PhoneFormItem />
+        </Form.Item>
+
+        <Form.Item
+          label={t("bodyshop.fields.insurance_vendor_id")}
+          name="insurance_vendor_id"
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.logo_img_path")}
+          name={["logo_img_path", "src"]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.logo_img_path_height")}
+          name={["logo_img_path", "height"]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.logo_img_path_width")}
+          name={["logo_img_path", "width"]}
+        >
+          <Input />
+        </Form.Item>
+      </LayoutFormRow>
+      <LayoutFormRow header={t("bodyshop.labels.accountingsetup")}>
+        <Form.Item
+          label={t("bodyshop.labels.accountingtiers")}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+          name={["accountingconfig", "tiers"]}
+        >
+          <Radio.Group>
+            <Radio value={2}>2</Radio>
+            <Radio value={3}>3</Radio>
+          </Radio.Group>
+        </Form.Item>
+        <Form.Item shouldUpdate>
+          {() => {
+            return (
+              <Form.Item
+                label={t("bodyshop.labels.2tiersetup")}
+                shouldUpdate
+                rules={[
+                  {
+                    required:
+                      form.getFieldValue(["accountingconfig", "tiers"]) === 2,
+                    message: t("general.validation.required"),
+                  },
+                ]}
+                name={["accountingconfig", "twotierpref"]}
+              >
+                <Radio.Group
+                  disabled={
+                    form.getFieldValue(["accountingconfig", "tiers"]) === 3
+                  }
+                >
+                  <Radio value="name">{t("bodyshop.labels.2tiername")}</Radio>
+                  <Radio value="source">
+                    {t("bodyshop.labels.2tiersource")}
+                  </Radio>
+                </Radio.Group>
+              </Form.Item>
+            );
+          }}
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.inhousevendorid")}
+          name={"inhousevendorid"}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.default_adjustment_rate")}
+          name={"default_adjustment_rate"}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <InputNumber min={0} precision={2} />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.federal_tax_id")}
+          name="federal_tax_id"
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.state_tax_id")}
+          name="state_tax_id"
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.invoice_federal_tax_rate")}
+          name={["bill_tax_rates", "federal_tax_rate"]}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.invoice_state_tax_rate")}
+          name={["bill_tax_rates", "state_tax_rate"]}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.invoice_local_tax_rate")}
+          name={["bill_tax_rates", "local_tax_rate"]}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          name={["md_payment_types"]}
+          label={t("bodyshop.fields.md_payment_types")}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+              type: "array",
+            },
+          ]}
+        >
+          <Select mode="tags" />
+        </Form.Item>
+        <Form.Item
+          name={["md_categories"]}
+          label={t("bodyshop.fields.md_categories")}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+              type: "array",
+            },
+          ]}
+        >
+          <Select mode="tags" />
+        </Form.Item>
+        <Form.Item
+          name={["md_classes"]}
+          label={t("bodyshop.fields.md_classes")}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+              type: "array",
+            },
+          ]}
+        >
+          <Select mode="tags" />
+        </Form.Item>
+        <Form.Item
+          name={["enforce_class"]}
+          label={t("bodyshop.fields.enforce_class")}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
+      </LayoutFormRow>
+      <LayoutFormRow header={t("bodyshop.labels.scoreboardsetup")}>
+        <Form.Item
+          label={t("bodyshop.fields.dailypainttarget")}
+          name={["scoreboard_target", "dailyPaintTarget"]}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <InputNumber min={0} precision={0} />
+        </Form.Item>
+
+        <Form.Item
+          label={t("bodyshop.fields.dailybodytarget")}
+          name={["scoreboard_target", "dailyBodyTarget"]}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <InputNumber min={0} precision={0} />
+        </Form.Item>
+
+        <Form.Item
+          label={t("bodyshop.fields.lastnumberworkingdays")}
+          name={["scoreboard_target", "lastNumberWorkingDays"]}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <InputNumber min={0} max={12} precision={0} />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.prodtargethrs")}
+          name={["prodtargethrs"]}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <InputNumber min={1} precision={1} />
+        </Form.Item>
+      </LayoutFormRow>
+      <LayoutFormRow header={t("bodyshop.labels.systemsettings")}>
+        <Form.Item
+          name={["md_referral_sources"]}
+          label={t("bodyshop.fields.md_referral_sources")}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+              type: "array",
+            },
+          ]}
+        >
+          <Select mode="tags" />
+        </Form.Item>
+        <Form.Item
+          name={["target_touchtime"]}
+          label={t("bodyshop.fields.target_touchtime")}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <InputNumber min={0.1} precision={1} />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.use_fippa")}
+          name={["use_fippa"]}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.md_hour_split.prep")}
+          name={["md_hour_split", "prep"]}
+          dependencies={[["md_hour_split", "paint"]]}
+          rules={[
+            ({ getFieldValue }) => ({
+              validator(rule, value) {
+                if (!value && !getFieldValue(["md_hour_split", "paint"])) {
+                  return Promise.resolve();
+                }
+                if (value + getFieldValue(["md_hour_split", "paint"]) === 1) {
+                  return Promise.resolve();
+                }
+                return Promise.reject(t("bodyshop.validation.larsplit"));
+              },
+            }),
+          ]}
+        >
+          <InputNumber min={0} max={1} precision={2} />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.md_hour_split.paint")}
+          name={["md_hour_split", "paint"]}
+          dependencies={[["md_hour_split", "prep"]]}
+          rules={[
+            ({ getFieldValue }) => ({
+              validator(rule, value) {
+                if (!value && !getFieldValue(["md_hour_split", "paint"])) {
+                  return Promise.resolve();
+                }
+                if (value + getFieldValue(["md_hour_split", "prep"]) === 1) {
+                  return Promise.resolve();
+                }
+                return Promise.reject(t("bodyshop.validation.larsplit"));
+              },
+            }),
+          ]}
+        >
+          <InputNumber min={0} max={1} precision={2} />
+        </Form.Item>
+      </LayoutFormRow>
+      <LayoutFormRow grow header={t("bodyshop.labels.messagingpresets")}>
+        <Form.List name={["md_messaging_presets"]}>
+          {(fields, { add, remove, move }) => {
+            return (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <LayoutFormRow noDivider>
+                      <Form.Item
+                        label={t("bodyshop.fields.messaginglabel")}
+                        key={`${index}label`}
+                        name={[field.name, "label"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("bodyshop.fields.messagingtext")}
+                        key={`${index}text`}
+                        name={[field.name, "text"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Space wrap>
+                        <DeleteFilled
+                          onClick={() => {
+                            remove(field.name);
+                          }}
+                        />
+                        <FormListMoveArrows
+                          move={move}
+                          index={index}
+                          total={fields.length}
+                        />
+                      </Space>
+                    </LayoutFormRow>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <Button
+                    type="dashed"
+                    onClick={() => {
+                      add();
+                    }}
+                    style={{ width: "100%" }}
+                  >
+                    {t("general.actions.add")}
+                  </Button>
+                </Form.Item>
+              </div>
+            );
+          }}
+        </Form.List>
+      </LayoutFormRow>
+      <LayoutFormRow grow header={t("bodyshop.labels.notespresets")}>
+        <Form.List name={["md_notes_presets"]}>
+          {(fields, { add, remove, move }) => {
+            return (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <LayoutFormRow noDivider>
+                      <Form.Item
+                        label={t("bodyshop.fields.noteslabel")}
+                        key={`${index}label`}
+                        name={[field.name, "label"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("bodyshop.fields.notestext")}
+                        key={`${index}text`}
+                        name={[field.name, "text"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Space wrap>
+                        <DeleteFilled
+                          onClick={() => {
+                            remove(field.name);
+                          }}
+                        />
+                        <FormListMoveArrows
+                          move={move}
+                          index={index}
+                          total={fields.length}
+                        />
+                      </Space>
+                    </LayoutFormRow>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <Button
+                    type="dashed"
+                    onClick={() => {
+                      add();
+                    }}
+                    style={{ width: "100%" }}
+                  >
+                    {t("general.actions.add")}
+                  </Button>
+                </Form.Item>
+              </div>
+            );
+          }}
+        </Form.List>
+      </LayoutFormRow>
+      <LayoutFormRow grow header={t("bodyshop.labels.partslocations")}>
+        <Form.List name={["md_parts_locations"]}>
+          {(fields, { add, remove, move }) => {
+            return (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <LayoutFormRow noDivider>
+                      <Form.Item
+                        className="imex-flex-row__margin"
+                        label={t("bodyshop.fields.partslocation")}
+                        key={`${index}`}
+                        name={[field.name]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Space wrap>
+                        <DeleteFilled
+                          className="imex-flex-row__margin"
+                          onClick={() => {
+                            remove(field.name);
+                          }}
+                        />
+                        <FormListMoveArrows
+                          move={move}
+                          index={index}
+                          total={fields.length}
+                        />
+                      </Space>
+                    </LayoutFormRow>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <Button
+                    type="dashed"
+                    onClick={() => {
+                      add();
+                    }}
+                    style={{ width: "100%" }}
+                  >
+                    {t("bodyshop.actions.addpartslocation")}
+                  </Button>
+                </Form.Item>
+              </div>
+            );
+          }}
+        </Form.List>
+      </LayoutFormRow>
+      <LayoutFormRow grow header={t("bodyshop.labels.insurancecos")}>
+        <Form.List name={["md_ins_cos"]}>
+          {(fields, { add, remove, move }) => {
+            return (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <LayoutFormRow noDivider>
+                      <Form.Item
+                        label={t("bodyshop.fields.md_ins_co.name")}
+                        key={`${index}name`}
+                        name={[field.name, "name"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("bodyshop.fields.md_ins_co.street1")}
+                        key={`${index}street1`}
+                        name={[field.name, "street1"]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("bodyshop.fields.md_ins_co.street2")}
+                        key={`${index}street2`}
+                        name={[field.name, "street2"]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("bodyshop.fields.md_ins_co.city")}
+                        key={`${index}city`}
+                        name={[field.name, "city"]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("bodyshop.fields.md_ins_co.state")}
+                        key={`${index}state`}
+                        name={[field.name, "state"]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Space wrap>
+                        <Form.Item
+                          label={t("bodyshop.fields.md_ins_co.zip")}
+                          key={`${index}zip`}
+                          name={[field.name, "zip"]}
+                        >
+                          <Input />
+                        </Form.Item>
+                        <DeleteFilled
+                          onClick={() => {
+                            remove(field.name);
+                          }}
+                        />
+                        <FormListMoveArrows
+                          move={move}
+                          index={index}
+                          total={fields.length}
+                        />
+                      </Space>
+                    </LayoutFormRow>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <Button
+                    type="dashed"
+                    onClick={() => {
+                      add();
+                    }}
+                    style={{ width: "100%" }}
+                  >
+                    {t("general.actions.add")}
+                  </Button>
+                </Form.Item>
+              </div>
+            );
+          }}
+        </Form.List>
+      </LayoutFormRow>
+    </div>
+  );
+}
diff --git a/client/src/components/shop-info/shop-info.intake.component.jsx b/client/src/components/shop-info/shop-info.intake.component.jsx
index 0c6151185..a6c9a3306 100644
--- a/client/src/components/shop-info/shop-info.intake.component.jsx
+++ b/client/src/components/shop-info/shop-info.intake.component.jsx
@@ -1,13 +1,5 @@
 import { DeleteFilled } from "@ant-design/icons";
-import {
-  Button,
-  Form,
-  Input,
-  InputNumber,
-  Select,
-  Switch,
-  Typography,
-} from "antd";
+import { Button, Form, Input, InputNumber, Select, Space, Switch } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
@@ -28,149 +20,143 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
   const TemplateListGenerated = TemplateList();
   return (
     <div>
-      <Typography.Title level={4}>
-        {t("bodyshop.labels.intakechecklist")}
-      </Typography.Title>
-      <Form.List name={["intakechecklist", "form"]}>
-        {(fields, { add, remove, move }) => {
-          return (
-            <div>
-              {fields.map((field, index) => (
-                <Form.Item key={field.key} style={{ padding: 0, margin: 2 }}>
-                  <LayoutFormRow grow>
-                    <Form.Item
-                      className="imex-flex-row__margin"
-                      label={t("jobs.fields.intake.name")}
-                      key={`${index}name`}
-                      name={[field.name, "name"]}
-                      rules={[
-                        {
-                          required: true,
-                          message: t("general.validation.required"),
-                        },
-                      ]}
-                    >
-                      <Input />
-                    </Form.Item>
-                    <Form.Item
-                      className="imex-flex-row__margin"
-                      label={t("jobs.fields.intake.type")}
-                      key={`${index}type`}
-                      name={[field.name, "type"]}
-                      rules={[
-                        {
-                          required: true,
-                          message: t("general.validation.required"),
-                        },
-                      ]}
-                    >
-                      <Select>
-                        {Object.keys(ConfigFormTypes).map((i, idx) => (
-                          <Select.Option key={i} value={i}>
-                            {i}
-                          </Select.Option>
-                        ))}
-                      </Select>
-                    </Form.Item>
-                    <Form.Item
-                      className="imex-flex-row__margin"
-                      label={t("jobs.fields.intake.label")}
-                      key={`${index}label`}
-                      name={[field.name, "label"]}
-                      rules={[
-                        {
-                          required: true,
-                          message: t("general.validation.required"),
-                        },
-                      ]}
-                    >
-                      <Input />
-                    </Form.Item>
-                    <Form.Item
-                      className="imex-flex-row__margin"
-                      label={t("jobs.fields.intake.required")}
-                      key={`${index}required`}
-                      name={[field.name, "required"]}
-                      valuePropName="checked"
-                    >
-                      <Switch />
-                    </Form.Item>
-                    <Form.Item shouldUpdate>
-                      {() => {
-                        if (
-                          form.getFieldValue([
-                            "intakechecklist",
-                            "form",
-                            index,
-                            "type",
-                          ]) !== "slider"
-                        )
-                          return null;
-                        return (
-                          <>
-                            <Form.Item
-                              className="imex-flex-row__margin"
-                              label={t("jobs.fields.intake.min")}
-                              key={`${index}min`}
-                              name={[field.name, "min"]}
-                              dependencies={[[field.name, "type"]]}
-                              rules={[
-                                {
-                                  required: true,
-                                  message: t("general.validation.required"),
-                                },
-                              ]}
-                            >
-                              <InputNumber />
-                            </Form.Item>
-                            <Form.Item
-                              className="imex-flex-row__margin"
-                              label={t("jobs.fields.intake.max")}
-                              key={`${index}max`}
-                              name={[field.name, "max"]}
-                              rules={[
-                                {
-                                  required: true,
-                                  message: t("general.validation.required"),
-                                },
-                              ]}
-                            >
-                              <InputNumber />
-                            </Form.Item>
-                          </>
-                        );
-                      }}
-                    </Form.Item>
+      <LayoutFormRow header={t("bodyshop.labels.intakechecklist")}>
+        <Form.List name={["intakechecklist", "form"]}>
+          {(fields, { add, remove, move }) => {
+            return (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <LayoutFormRow noDivider>
+                      <Form.Item
+                        label={t("jobs.fields.intake.name")}
+                        key={`${index}name`}
+                        name={[field.name, "name"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.intake.type")}
+                        key={`${index}type`}
+                        name={[field.name, "type"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Select>
+                          {Object.keys(ConfigFormTypes).map((i, idx) => (
+                            <Select.Option key={i} value={i}>
+                              {i}
+                            </Select.Option>
+                          ))}
+                        </Select>
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.intake.label")}
+                        key={`${index}label`}
+                        name={[field.name, "label"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
 
-                    <DeleteFilled
-                      onClick={() => {
-                        remove(field.name);
-                      }}
-                    />
-                    <FormListMoveArrows
-                      move={move}
-                      index={index}
-                      total={fields.length}
-                    />
-                  </LayoutFormRow>
+                      <Form.Item shouldUpdate>
+                        {() => {
+                          if (
+                            form.getFieldValue([
+                              "intakechecklist",
+                              "form",
+                              index,
+                              "type",
+                            ]) !== "slider"
+                          )
+                            return null;
+                          return (
+                            <>
+                              <Form.Item
+                                label={t("jobs.fields.intake.min")}
+                                key={`${index}min`}
+                                name={[field.name, "min"]}
+                                dependencies={[[field.name, "type"]]}
+                                rules={[
+                                  {
+                                    required: true,
+                                    message: t("general.validation.required"),
+                                  },
+                                ]}
+                              >
+                                <InputNumber />
+                              </Form.Item>
+                              <Form.Item
+                                label={t("jobs.fields.intake.max")}
+                                key={`${index}max`}
+                                name={[field.name, "max"]}
+                                rules={[
+                                  {
+                                    required: true,
+                                    message: t("general.validation.required"),
+                                  },
+                                ]}
+                              >
+                                <InputNumber />
+                              </Form.Item>
+                            </>
+                          );
+                        }}
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.intake.required")}
+                        key={`${index}required`}
+                        name={[field.name, "required"]}
+                        valuePropName="checked"
+                      >
+                        <Switch />
+                      </Form.Item>
+                      <Space wrap>
+                        <DeleteFilled
+                          onClick={() => {
+                            remove(field.name);
+                          }}
+                        />
+                        <FormListMoveArrows
+                          move={move}
+                          index={index}
+                          total={fields.length}
+                        />
+                      </Space>
+                    </LayoutFormRow>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <Button
+                    type="dashed"
+                    onClick={() => {
+                      add();
+                    }}
+                    style={{ width: "100%" }}
+                  >
+                    {t("general.actions.add")}
+                  </Button>
                 </Form.Item>
-              ))}
-              <Form.Item>
-                <Button
-                  type="dashed"
-                  onClick={() => {
-                    add();
-                  }}
-                  style={{ width: "100%" }}
-                >
-                  {t("general.actions.add")}
-                </Button>
-              </Form.Item>
-            </div>
-          );
-        }}
-      </Form.List>
-
+              </div>
+            );
+          }}
+        </Form.List>
+      </LayoutFormRow>
       <SelectorDiv>
         <Form.Item
           name={["intakechecklist", "templates"]}
@@ -195,157 +181,153 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
           </Select>
         </Form.Item>
       </SelectorDiv>
-      <Typography.Title level={4}>
-        {t("bodyshop.labels.deliverchecklist")}
-      </Typography.Title>
-      <Form.List name={["deliverchecklist", "form"]}>
-        {(fields, { add, remove, move }) => {
-          return (
-            <div>
-              {fields.map((field, index) => (
-                <Form.Item key={field.key} style={{ padding: 0, margin: 2 }}>
-                  <LayoutFormRow grow>
-                    <Form.Item
-                      className="imex-flex-row__margin"
-                      label={t("jobs.fields.intake.name")}
-                      key={`${index}named`}
-                      name={[field.name, "name"]}
-                      rules={[
-                        {
-                          required: true,
-                          message: t("general.validation.required"),
-                        },
-                      ]}
-                    >
-                      <Input />
-                    </Form.Item>
 
-                    <Form.Item
-                      className="imex-flex-row__margin"
-                      label={t("jobs.fields.intake.type")}
-                      key={`${index}typed`}
-                      name={[field.name, "type"]}
-                      rules={[
-                        {
-                          required: true,
-                          message: t("general.validation.required"),
-                        },
-                      ]}
-                    >
-                      <Select>
-                        {Object.keys(ConfigFormTypes).map((i, idx) => (
-                          <Select.Option key={i} value={i}>
-                            {i}
-                          </Select.Option>
-                        ))}
-                      </Select>
-                    </Form.Item>
+      <LayoutFormRow header={t("bodyshop.labels.deliverchecklist")}>
+        <Form.List name={["deliverchecklist", "form"]}>
+          {(fields, { add, remove, move }) => {
+            return (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <LayoutFormRow noDivider>
+                      <Form.Item
+                        label={t("jobs.fields.intake.name")}
+                        key={`${index}named`}
+                        name={[field.name, "name"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
 
-                    <Form.Item
-                      className="imex-flex-row__margin"
-                      label={t("jobs.fields.intake.label")}
-                      key={`${index}labeld`}
-                      name={[field.name, "label"]}
-                      rules={[
-                        {
-                          required: true,
-                          message: t("general.validation.required"),
-                        },
-                      ]}
-                    >
-                      <Input />
-                    </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.intake.type")}
+                        key={`${index}typed`}
+                        name={[field.name, "type"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Select>
+                          {Object.keys(ConfigFormTypes).map((i, idx) => (
+                            <Select.Option key={i} value={i}>
+                              {i}
+                            </Select.Option>
+                          ))}
+                        </Select>
+                      </Form.Item>
 
-                    <Form.Item
-                      className="imex-flex-row__margin"
-                      label={t("jobs.fields.intake.required")}
-                      key={`${index}requiredd`}
-                      name={[field.name, "required"]}
-                      valuePropName="checked"
-                    >
-                      <Switch />
-                    </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.intake.label")}
+                        key={`${index}labeld`}
+                        name={[field.name, "label"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
 
-                    <Form.Item shouldUpdate>
-                      {() => {
-                        if (
-                          form.getFieldValue([
-                            "deliverchecklist",
-                            "form",
-                            index,
-                            "type",
-                          ]) !== "slider"
-                        )
-                          return null;
-                        return (
-                          <>
-                            <Form.Item
-                              className="imex-flex-row__margin"
-                              label={t("jobs.fields.intake.min")}
-                              key={`${index}mind`}
-                              name={[field.name, "min"]}
-                              dependencies={[[field.name, "type"]]}
-                              rules={[
-                                {
-                                  required:
-                                    form.getFieldValue([field.name, "type"]) ===
-                                    "slider",
-                                  message: t("general.validation.required"),
-                                },
-                              ]}
-                            >
-                              <InputNumber />
-                            </Form.Item>
-                            <Form.Item
-                              className="imex-flex-row__margin"
-                              label={t("jobs.fields.intake.max")}
-                              key={`${index}maxd`}
-                              name={[field.name, "max"]}
-                              dependencies={[[field.name, "type"]]}
-                              rules={[
-                                {
-                                  required:
-                                    form.getFieldValue([field.name, "type"]) ===
-                                    "slider",
-                                  message: t("general.validation.required"),
-                                },
-                              ]}
-                            >
-                              <InputNumber />
-                            </Form.Item>
-                          </>
-                        );
-                      }}
-                    </Form.Item>
-                    <DeleteFilled
-                      onClick={() => {
-                        remove(field.name);
-                      }}
-                    />
-                    <FormListMoveArrows
-                      move={move}
-                      index={index}
-                      total={fields.length}
-                    />
-                  </LayoutFormRow>
+                      <Form.Item shouldUpdate>
+                        {() => {
+                          if (
+                            form.getFieldValue([
+                              "deliverchecklist",
+                              "form",
+                              index,
+                              "type",
+                            ]) !== "slider"
+                          )
+                            return null;
+                          return (
+                            <>
+                              <Form.Item
+                                label={t("jobs.fields.intake.min")}
+                                key={`${index}mind`}
+                                name={[field.name, "min"]}
+                                dependencies={[[field.name, "type"]]}
+                                rules={[
+                                  {
+                                    required:
+                                      form.getFieldValue([
+                                        field.name,
+                                        "type",
+                                      ]) === "slider",
+                                    message: t("general.validation.required"),
+                                  },
+                                ]}
+                              >
+                                <InputNumber />
+                              </Form.Item>
+                              <Form.Item
+                                label={t("jobs.fields.intake.max")}
+                                key={`${index}maxd`}
+                                name={[field.name, "max"]}
+                                dependencies={[[field.name, "type"]]}
+                                rules={[
+                                  {
+                                    required:
+                                      form.getFieldValue([
+                                        field.name,
+                                        "type",
+                                      ]) === "slider",
+                                    message: t("general.validation.required"),
+                                  },
+                                ]}
+                              >
+                                <InputNumber />
+                              </Form.Item>
+                            </>
+                          );
+                        }}
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.intake.required")}
+                        key={`${index}requiredd`}
+                        name={[field.name, "required"]}
+                        valuePropName="checked"
+                      >
+                        <Switch />
+                      </Form.Item>
+                      <DeleteFilled
+                        onClick={() => {
+                          remove(field.name);
+                        }}
+                      />
+                      <FormListMoveArrows
+                        move={move}
+                        index={index}
+                        total={fields.length}
+                      />
+                    </LayoutFormRow>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <Button
+                    type="dashed"
+                    onClick={() => {
+                      add();
+                    }}
+                    style={{ width: "100%" }}
+                  >
+                    {t("general.actions.add")}
+                  </Button>
                 </Form.Item>
-              ))}
-              <Form.Item>
-                <Button
-                  type="dashed"
-                  onClick={() => {
-                    add();
-                  }}
-                  style={{ width: "100%" }}
-                >
-                  {t("general.actions.add")}
-                </Button>
-              </Form.Item>
-            </div>
-          );
-        }}
-      </Form.List>
-
+              </div>
+            );
+          }}
+        </Form.List>
+      </LayoutFormRow>
       <SelectorDiv>
         <Form.Item
           name={["deliverchecklist", "templates"]}
diff --git a/client/src/components/shop-info/shop-info.orderstatus.component.jsx b/client/src/components/shop-info/shop-info.orderstatus.component.jsx
index 6d9e46b03..dcb521387 100644
--- a/client/src/components/shop-info/shop-info.orderstatus.component.jsx
+++ b/client/src/components/shop-info/shop-info.orderstatus.component.jsx
@@ -6,59 +6,56 @@ export default function ShopInfoOrderStatusComponent({ form }) {
   const { t } = useTranslation();
 
   return (
-    <div>
-      <strong>{t("bodyshop.labels.orderstatuses")}</strong>
-      <LayoutFormRow>
-        <Form.Item
-          label={t("bodyshop.fields.statuses.default_bo")}
-          rules={[
-            {
-              required: true,
-              message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_order_statuses", "default_bo"]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.statuses.default_ordered")}
-          rules={[
-            {
-              required: true,
-              message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_order_statuses", "default_ordered"]}
-        >
-          <Input />
-        </Form.Item>
+    <LayoutFormRow header={t("bodyshop.labels.orderstatuses")}>
+      <Form.Item
+        label={t("bodyshop.fields.statuses.default_bo")}
+        rules={[
+          {
+            required: true,
+            message: t("general.validation.required"),
+          },
+        ]}
+        name={["md_order_statuses", "default_bo"]}
+      >
+        <Input />
+      </Form.Item>
+      <Form.Item
+        label={t("bodyshop.fields.statuses.default_ordered")}
+        rules={[
+          {
+            required: true,
+            message: t("general.validation.required"),
+          },
+        ]}
+        name={["md_order_statuses", "default_ordered"]}
+      >
+        <Input />
+      </Form.Item>
 
-        <Form.Item
-          label={t("bodyshop.fields.statuses.default_received")}
-          rules={[
-            {
-              required: true,
-              message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_order_statuses", "default_received"]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.statuses.default_returned")}
-          rules={[
-            {
-              required: true,
-              message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_order_statuses", "default_returned"]}
-        >
-          <Input />
-        </Form.Item>
-      </LayoutFormRow>
-    </div>
+      <Form.Item
+        label={t("bodyshop.fields.statuses.default_received")}
+        rules={[
+          {
+            required: true,
+            message: t("general.validation.required"),
+          },
+        ]}
+        name={["md_order_statuses", "default_received"]}
+      >
+        <Input />
+      </Form.Item>
+      <Form.Item
+        label={t("bodyshop.fields.statuses.default_returned")}
+        rules={[
+          {
+            required: true,
+            message: t("general.validation.required"),
+          },
+        ]}
+        name={["md_order_statuses", "default_returned"]}
+      >
+        <Input />
+      </Form.Item>
+    </LayoutFormRow>
   );
 }
diff --git a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
index 29affabfc..adf0c5d21 100644
--- a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
+++ b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
@@ -53,19 +53,15 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
 
   return (
     <div>
-      <div>
-        <Typography.Title level={4}>
-          {t("bodyshop.labels.responsibilitycenters.costs")}
-        </Typography.Title>
+      <LayoutFormRow header={t("bodyshop.labels.responsibilitycenters.costs")}>
         <Form.List name={["md_responsibility_centers", "costs"]}>
           {(fields, { add, remove }) => {
             return (
               <div>
                 {fields.map((field, index) => (
-                  <Form.Item key={field.key} style={{ padding: 0, margin: 2 }}>
-                    <LayoutFormRow>
+                  <Form.Item key={field.key}>
+                    <LayoutFormRow noDivider>
                       <Form.Item
-                        style={{ padding: 0, margin: 2 }}
                         label={t("bodyshop.fields.responsibilitycenter")}
                         key={`${index}name`}
                         name={[field.name, "name"]}
@@ -79,7 +75,6 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         <Input onBlur={handleBlur} />
                       </Form.Item>
                       <Form.Item
-                        style={{ padding: 0, margin: 2 }}
                         label={t(
                           "bodyshop.fields.responsibilitycenter_accountname"
                         )}
@@ -95,7 +90,6 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         <Input onBlur={handleBlur} />
                       </Form.Item>
                       <Form.Item
-                        style={{ padding: 0, margin: 2 }}
                         label={t(
                           "bodyshop.fields.responsibilitycenter_accountnumber"
                         )}
@@ -111,7 +105,6 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         <Input onBlur={handleBlur} />
                       </Form.Item>
                       <Form.Item
-                        style={{ padding: 0, margin: 2 }}
                         label={t(
                           "bodyshop.fields.responsibilitycenter_accountdesc"
                         )}
@@ -127,7 +120,6 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         <Input onBlur={handleBlur} />
                       </Form.Item>
                       <Form.Item
-                        style={{ padding: 0, margin: 2 }}
                         label={t(
                           "bodyshop.fields.responsibilitycenter_accountitem"
                         )}
@@ -158,28 +150,26 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                     }}
                     style={{ width: "100%" }}
                   >
-                    {t("bodyshop.actions.newstatus")}
+                    {t("general.actions.add")}
                   </Button>
                 </Form.Item>
               </div>
             );
           }}
         </Form.List>
-      </div>
-      <div>
-        <Typography.Title level={4}>
-          {t("bodyshop.labels.responsibilitycenters.profits")}
-        </Typography.Title>
+      </LayoutFormRow>
 
+      <LayoutFormRow
+        header={t("bodyshop.labels.responsibilitycenters.profits")}
+      >
         <Form.List name={["md_responsibility_centers", "profits"]}>
           {(fields, { add, remove }) => {
             return (
               <div>
                 {fields.map((field, index) => (
-                  <Form.Item key={field.key} style={{ padding: 0, margin: 2 }}>
-                    <LayoutFormRow>
+                  <Form.Item key={field.key}>
+                    <LayoutFormRow noDivider>
                       <Form.Item
-                        style={{ padding: 0, margin: 2 }}
                         label={t("bodyshop.fields.responsibilitycenter")}
                         key={`${index}name`}
                         name={[field.name, "name"]}
@@ -193,7 +183,6 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         <Input onBlur={handleBlur} />
                       </Form.Item>
                       <Form.Item
-                        style={{ padding: 0, margin: 2 }}
                         label={t(
                           "bodyshop.fields.responsibilitycenter_accountname"
                         )}
@@ -209,7 +198,6 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         <Input onBlur={handleBlur} />
                       </Form.Item>
                       <Form.Item
-                        style={{ padding: 0, margin: 2 }}
                         label={t(
                           "bodyshop.fields.responsibilitycenter_accountnumber"
                         )}
@@ -225,7 +213,6 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         <Input onBlur={handleBlur} />
                       </Form.Item>
                       <Form.Item
-                        style={{ padding: 0, margin: 2 }}
                         label={t(
                           "bodyshop.fields.responsibilitycenter_accountdesc"
                         )}
@@ -241,7 +228,6 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         <Input onBlur={handleBlur} />
                       </Form.Item>
                       <Form.Item
-                        style={{ padding: 0, margin: 2 }}
                         label={t(
                           "bodyshop.fields.responsibilitycenter_accountitem"
                         )}
@@ -272,830 +258,815 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                     }}
                     style={{ width: "100%" }}
                   >
-                    {t("bodyshop.actions.newstatus")}
+                    {t("general.actions.add")}
                   </Button>
                 </Form.Item>
               </div>
             );
           }}
         </Form.List>
-      </div>
-      <div>
-        <SelectorDiv>
-          <LayoutFormRow header={t("bodyshop.labels.defaultcostsmapping")}>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.ats")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "ATS"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.lab")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "LAB"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.lad")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "LAD"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.lae")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "LAE"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.laf")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "LAF"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.lag")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "LAG"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.lam")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "LAM"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.lar")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "LAR"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.las")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "LAS"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.lau")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "LAU"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.paa")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "PAA"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.pac")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "PAC"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.pal")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "PAL"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.pam")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "PAM"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.pan")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "PAN"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.pao")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "PAO"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.pap")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "PAP"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.par")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "PAR"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.pas")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "PAS"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.tow")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "TOW"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.mapa")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "MAPA"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.mash")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "costs", "MASH"]}
-            >
-              <Select>
-                {costOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-          </LayoutFormRow>
-        </SelectorDiv>
-      </div>
+      </LayoutFormRow>
+
       <SelectorDiv>
-        <div>
-          <LayoutFormRow header={t("bodyshop.labels.defaultprofitsmapping")}>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.ats")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "ATS"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.lab")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "LAB"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.lad")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "LAD"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.lae")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "LAE"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.laf")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "LAF"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.lag")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "LAG"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.lam")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "LAM"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.lar")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "LAR"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.las")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "LAS"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.lau")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "LAU"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.paa")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "PAA"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.pac")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "PAC"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.pal")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "PAL"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.pam")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "PAM"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.pan")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "PAN"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.pao")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "PAO"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.pap")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "PAP"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.par")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "PAR"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.pas")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "PAS"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.tow")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_responsibility_centers", "defaults", "profits", "TOW"]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.mapa")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={[
-                "md_responsibility_centers",
-                "defaults",
-                "profits",
-                "MAPA",
-              ]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.responsibilitycenters.mash")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={[
-                "md_responsibility_centers",
-                "defaults",
-                "profits",
-                "MASH",
-              ]}
-            >
-              <Select>
-                {profitOptions.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-          </LayoutFormRow>
-        </div>
+        <LayoutFormRow header={t("bodyshop.labels.defaultcostsmapping")}>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.ats")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "ATS"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.lab")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "LAB"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.lad")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "LAD"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.lae")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "LAE"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.laf")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "LAF"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.lag")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "LAG"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.lam")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "LAM"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.lar")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "LAR"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.las")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "LAS"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.lau")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "LAU"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.paa")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "PAA"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pac")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "PAC"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pal")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "PAL"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pam")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "PAM"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pan")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "PAN"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pao")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "PAO"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pap")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "PAP"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.par")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "PAR"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pas")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "PAS"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.tow")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "TOW"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.mapa")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "MAPA"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.mash")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "MASH"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+        </LayoutFormRow>
+
+        <LayoutFormRow header={t("bodyshop.labels.defaultprofitsmapping")}>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.ats")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "ATS"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.lab")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "LAB"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.lad")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "LAD"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.lae")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "LAE"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.laf")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "LAF"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.lag")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "LAG"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.lam")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "LAM"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.lar")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "LAR"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.las")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "LAS"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.lau")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "LAU"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.paa")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "PAA"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pac")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "PAC"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pal")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "PAL"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pam")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "PAM"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pan")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "PAN"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pao")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "PAO"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pap")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "PAP"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.par")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "PAR"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pas")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "PAS"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.tow")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "TOW"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.mapa")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "MAPA"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.mash")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "MASH"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+        </LayoutFormRow>
       </SelectorDiv>
       <LayoutFormRow
-        style={{ marginTop: ".8rem" }}
         header={t("bodyshop.labels.responsibilitycenters.tax_accounts")}
       >
         <Form.Item
diff --git a/client/src/components/shop-info/shop-info.rostatus.component.jsx b/client/src/components/shop-info/shop-info.rostatus.component.jsx
index 35ec3b94a..68b5e5bdf 100644
--- a/client/src/components/shop-info/shop-info.rostatus.component.jsx
+++ b/client/src/components/shop-info/shop-info.rostatus.component.jsx
@@ -1,9 +1,8 @@
-import { DeleteFilled } from "@ant-design/icons";
-import { Button, Col, Form, Input, Row, Select } from "antd";
+import { Form, Select } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
-import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 const SelectorDiv = styled.div`
   .ant-form-item .ant-select {
     width: 200px;
@@ -22,288 +21,242 @@ export default function ShopInfoROStatusComponent({ form }) {
   };
 
   return (
-    <div>
-      <Row>
-        <Col span={8}>
-          {t("bodyshop.labels.alljobstatuses")}
-          <Form.List name={["md_ro_statuses", "statuses"]}>
-            {(fields, { add, remove, move }) => {
-              return (
-                <div>
-                  {fields.map((field, index) => (
-                    <Form.Item
-                      key={field.key}
-                      style={{ padding: 0, margin: 2 }}
-                    >
-                      <div style={{ display: "flex" }}>
-                        <Form.Item
-                          style={{ padding: 0, margin: 2 }}
-                          label={t("bodyshop.fields.status")}
-                          key={`${index}`}
-                          name={[field.name]}
-                          rules={[
-                            {
-                              required: true,
-                              message: t("general.validation.required"),
-                            },
-                          ]}
-                        >
-                          <Input onBlur={handleBlur} />
-                        </Form.Item>
-                        <DeleteFilled
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                        <FormListMoveArrows
-                          move={move}
-                          index={index}
-                          total={fields.length}
-                        />
-                      </div>
-                    </Form.Item>
-                  ))}
-                  <Form.Item>
-                    <Button
-                      type="dashed"
-                      onClick={() => {
-                        add();
-                      }}
-                      style={{ width: "100%" }}
-                    >
-                      {t("bodyshop.actions.newstatus")}
-                    </Button>
-                  </Form.Item>
-                </div>
-              );
-            }}
-          </Form.List>
-        </Col>
-        <Col span={12}>
-          <SelectorDiv>
-            <Form.Item
-              name={["md_ro_statuses", "active_statuses"]}
-              label={t("bodyshop.fields.statuses.active_statuses")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                  type: "array",
-                },
-              ]}
-            >
-              <Select mode="multiple">
-                {options.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              name={["md_ro_statuses", "pre_production_statuses"]}
-              label={t("bodyshop.fields.statuses.pre_production_statuses")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                  type: "array",
-                },
-              ]}
-            >
-              <Select mode="multiple">
-                {options.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              name={["md_ro_statuses", "production_statuses"]}
-              label={t("bodyshop.fields.statuses.production_statuses")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                  type: "array",
-                },
-              ]}
-            >
-              <Select mode="multiple">
-                {options.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              name={["md_ro_statuses", "post_production_statuses"]}
-              label={t("bodyshop.fields.statuses.post_production_statuses")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                  type: "array",
-                },
-              ]}
-            >
-              <Select mode="multiple">
-                {options.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.statuses.default_scheduled")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_ro_statuses", "default_scheduled"]}
-            >
-              <Select>
-                {options.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.statuses.default_arrived")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_ro_statuses", "default_arrived"]}
-            >
-              <Select>
-                {options.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.statuses.default_exported")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_ro_statuses", "default_exported"]}
-            >
-              <Select>
-                {options.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.statuses.default_imported")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_ro_statuses", "default_imported"]}
-            >
-              <Select>
-                {options.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.statuses.default_invoiced")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_ro_statuses", "default_invoiced"]}
-            >
-              <Select>
-                {options.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.statuses.default_completed")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_ro_statuses", "default_completed"]}
-            >
-              <Select>
-                {options.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.statuses.default_delivered")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_ro_statuses", "default_delivered"]}
-            >
-              <Select>
-                {options.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.statuses.default_void")}
-              rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
-              ]}
-              name={["md_ro_statuses", "default_void"]}
-            >
-              <Select>
-                {options.map((item, idx) => (
-                  <Select.Option key={idx} value={item}>
-                    {item}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-          </SelectorDiv>
-        </Col>
-      </Row>
-    </div>
+    <SelectorDiv>
+      <Form.Item
+        name={["md_ro_statuses", "statuses"]}
+        label={t("bodyshop.labels.alljobstatuses")}
+        rules={[
+          {
+            required: true,
+            message: t("general.validation.required"),
+            type: "array",
+          },
+        ]}
+      >
+        <Select mode="tags" onBlur={handleBlur} />
+      </Form.Item>
+      <Form.Item
+        name={["md_ro_statuses", "active_statuses"]}
+        label={t("bodyshop.fields.statuses.active_statuses")}
+        rules={[
+          {
+            required: true,
+            message: t("general.validation.required"),
+            type: "array",
+          },
+        ]}
+      >
+        <Select mode="multiple">
+          {options.map((item, idx) => (
+            <Select.Option key={idx} value={item}>
+              {item}
+            </Select.Option>
+          ))}
+        </Select>
+      </Form.Item>
+      <Form.Item
+        name={["md_ro_statuses", "pre_production_statuses"]}
+        label={t("bodyshop.fields.statuses.pre_production_statuses")}
+        rules={[
+          {
+            required: true,
+            message: t("general.validation.required"),
+            type: "array",
+          },
+        ]}
+      >
+        <Select mode="multiple">
+          {options.map((item, idx) => (
+            <Select.Option key={idx} value={item}>
+              {item}
+            </Select.Option>
+          ))}
+        </Select>
+      </Form.Item>
+      <Form.Item
+        name={["md_ro_statuses", "production_statuses"]}
+        label={t("bodyshop.fields.statuses.production_statuses")}
+        rules={[
+          {
+            required: true,
+            message: t("general.validation.required"),
+            type: "array",
+          },
+        ]}
+      >
+        <Select mode="multiple">
+          {options.map((item, idx) => (
+            <Select.Option key={idx} value={item}>
+              {item}
+            </Select.Option>
+          ))}
+        </Select>
+      </Form.Item>
+      <Form.Item
+        name={["md_ro_statuses", "post_production_statuses"]}
+        label={t("bodyshop.fields.statuses.post_production_statuses")}
+        rules={[
+          {
+            required: true,
+            message: t("general.validation.required"),
+            type: "array",
+          },
+        ]}
+      >
+        <Select mode="multiple">
+          {options.map((item, idx) => (
+            <Select.Option key={idx} value={item}>
+              {item}
+            </Select.Option>
+          ))}
+        </Select>
+      </Form.Item>
+      <LayoutFormRow noDivider>
+        <Form.Item
+          label={t("bodyshop.fields.statuses.default_scheduled")}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_ro_statuses", "default_scheduled"]}
+        >
+          <Select>
+            {options.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.statuses.default_arrived")}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_ro_statuses", "default_arrived"]}
+        >
+          <Select>
+            {options.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.statuses.default_exported")}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_ro_statuses", "default_exported"]}
+        >
+          <Select>
+            {options.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.statuses.default_imported")}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_ro_statuses", "default_imported"]}
+        >
+          <Select>
+            {options.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.statuses.default_invoiced")}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_ro_statuses", "default_invoiced"]}
+        >
+          <Select>
+            {options.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.statuses.default_completed")}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_ro_statuses", "default_completed"]}
+        >
+          <Select>
+            {options.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.statuses.default_delivered")}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_ro_statuses", "default_delivered"]}
+        >
+          <Select>
+            {options.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.statuses.default_void")}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_ro_statuses", "default_void"]}
+        >
+          <Select>
+            {options.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+      </LayoutFormRow>
+    </SelectorDiv>
   );
 }
diff --git a/client/src/components/shop-info/shop-info.scheduling.component.jsx b/client/src/components/shop-info/shop-info.scheduling.component.jsx
index 77647a62e..d9c2b9ba1 100644
--- a/client/src/components/shop-info/shop-info.scheduling.component.jsx
+++ b/client/src/components/shop-info/shop-info.scheduling.component.jsx
@@ -1,12 +1,13 @@
 import { DeleteFilled } from "@ant-design/icons";
 import {
   Button,
-  Col,
+  Divider,
   Form,
   Input,
   InputNumber,
-  Row,
   Select,
+  Space,
+  Switch,
   TimePicker,
 } from "antd";
 import React from "react";
@@ -20,73 +21,144 @@ export default function ShopInfoSchedulingComponent({ form }) {
 
   return (
     <div>
-      <Form.Item
-        label={t("bodyshop.fields.schedule_start_time")}
-        name={"schedule_start_time"}
-        rules={[
-          {
-            required: true,
-            message: t("general.validation.required"),
-          },
-        ]}
-      >
-        <TimePicker showSecond={false} format="hh:mm" />
-      </Form.Item>
-      <Form.Item
-        label={t("bodyshop.fields.schedule_end_time")}
-        name={"schedule_end_time"}
-        rules={[
-          {
-            required: true,
-            message: t("general.validation.required"),
-          },
-        ]}
-      >
-        <TimePicker showSecond={false} format="hh:mm" />
-      </Form.Item>
-      <strong>{t("bodyshop.labels.apptcolors")}</strong>
-      <Row>
-        <Col span={24}>
-          <Form.List name={["appt_colors"]}>
-            {(fields, { add, remove, move }) => {
-              return (
-                <div>
-                  {fields.map((field, index) => (
-                    <Form.Item
-                      key={field.key}
-                      style={{ padding: 0, margin: 2 }}
-                    >
-                      <LayoutFormRow>
-                        <Form.Item
-                          className="imex-flex-row__margin"
-                          label={t("bodyshop.fields.appt_colors.label")}
-                          key={`${index}aptcolorlabel`}
-                          name={[field.name, "label"]}
-                          rules={[
-                            {
-                              required: true,
-                              message: t("general.validation.required"),
-                            },
-                          ]}
-                        >
-                          <Input />
-                        </Form.Item>
-                        <Form.Item
-                          className="imex-flex-row__margin"
-                          label={t("bodyshop.fields.appt_colors.color")}
-                          key={`${index}aptcolorcolor`}
-                          name={[field.name, "color"]}
-                          rules={[
-                            {
-                              required: true,
-                              message: t("general.validation.required"),
-                            },
-                          ]}
-                        >
-                          <ColorpickerFormItemComponent />
-                        </Form.Item>
+      <LayoutFormRow>
+        <Form.Item
+          label={t("bodyshop.fields.appt_length")}
+          name={"appt_length"}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <InputNumber min={15} precision={0} />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.schedule_start_time")}
+          name={"schedule_start_time"}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <TimePicker showSecond={false} format="hh:mm" />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.schedule_end_time")}
+          name={"schedule_end_time"}
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <TimePicker showSecond={false} format="hh:mm" />
+        </Form.Item>
+        <Form.Item
+          name={["appt_alt_transport"]}
+          label={t("bodyshop.fields.appt_alt_transport")}
+          rules={[
+            {
+              message: t("general.validation.required"),
+              type: "array",
+            },
+          ]}
+        >
+          <Select mode="tags" />
+        </Form.Item>
+      </LayoutFormRow>
+      <Divider orientation="left">{t("bodyshop.labels.workingdays")}</Divider>
+      <Space wrap size="large">
+        <Form.Item
+          label={t("general.labels.sunday")}
+          name={["workingdays", "sunday"]}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
+        <Form.Item
+          label={t("general.labels.monday")}
+          name={["workingdays", "monday"]}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
+        <Form.Item
+          label={t("general.labels.tuesday")}
+          name={["workingdays", "tuesday"]}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
+        <Form.Item
+          label={t("general.labels.wednesday")}
+          name={["workingdays", "wednesday"]}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
+        <Form.Item
+          label={t("general.labels.thursday")}
+          name={["workingdays", "thursday"]}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
+        <Form.Item
+          label={t("general.labels.friday")}
+          name={["workingdays", "friday"]}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
+        <Form.Item
+          label={t("general.labels.saturday")}
+          name={["workingdays", "saturday"]}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
+      </Space>
+      <LayoutFormRow header={t("bodyshop.labels.apptcolors")}>
+        <Form.List name={["appt_colors"]}>
+          {(fields, { add, remove, move }) => {
+            return (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <LayoutFormRow noDivider>
+                      <Form.Item
+                        label={t("bodyshop.fields.appt_colors.label")}
+                        key={`${index}aptcolorlabel`}
+                        name={[field.name, "label"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("bodyshop.fields.appt_colors.color")}
+                        key={`${index}aptcolorcolor`}
+                        name={[field.name, "color"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <ColorpickerFormItemComponent />
+                      </Form.Item>
+                      <Space wrap>
                         <DeleteFilled
-                          className="imex-flex-row__margin"
                           onClick={() => {
                             remove(field.name);
                           }}
@@ -96,140 +168,127 @@ export default function ShopInfoSchedulingComponent({ form }) {
                           index={index}
                           total={fields.length}
                         />
-                      </LayoutFormRow>
-                    </Form.Item>
-                  ))}
-                  <Form.Item>
-                    <Button
-                      type="dashed"
-                      onClick={() => {
-                        add();
-                      }}
-                      style={{ width: "100%" }}
-                    >
-                      {t("bodyshop.actions.addapptcolor")}
-                    </Button>
+                      </Space>
+                    </LayoutFormRow>
                   </Form.Item>
-                </div>
-              );
-            }}
-          </Form.List>
-          <Form.Item
-            name={["appt_alt_transport"]}
-            label={t("bodyshop.fields.appt_alt_transport")}
-            rules={[
-              {
-                message: t("general.validation.required"),
-                type: "array",
-              },
-            ]}
-          >
-            <Select mode="tags" />
-          </Form.Item>
-          <Form.List name={["ssbuckets"]}>
-            {(fields, { add, remove, move }) => {
-              return (
-                <div>
-                  {fields.map((field, index) => (
-                    <Form.Item
-                      key={field.key}
-                      style={{ padding: 0, margin: 2 }}
-                    >
-                      <LayoutFormRow>
-                        <Form.Item
-                          label={t("bodyshop.fields.ssbuckets.id")}
-                          key={`${index}id`}
-                          name={[field.name, "id"]}
-                          rules={[
-                            {
-                              required: true,
-                              message: t("general.validation.required"),
-                            },
-                          ]}
-                        >
-                          <Input />
-                        </Form.Item>
-                        <Form.Item
-                          label={t("bodyshop.fields.ssbuckets.label")}
-                          key={`${index}label`}
-                          name={[field.name, "label"]}
-                          rules={[
-                            {
-                              required: true,
-                              message: t("general.validation.required"),
-                            },
-                          ]}
-                        >
-                          <Input />
-                        </Form.Item>
+                ))}
+                <Form.Item>
+                  <Button
+                    type="dashed"
+                    onClick={() => {
+                      add();
+                    }}
+                    style={{ width: "100%" }}
+                  >
+                    {t("bodyshop.actions.addapptcolor")}
+                  </Button>
+                </Form.Item>
+              </div>
+            );
+          }}
+        </Form.List>
+      </LayoutFormRow>
+      <LayoutFormRow header={t("bodyshop.labels.ssbuckets")}>
+        <Form.List name={["ssbuckets"]}>
+          {(fields, { add, remove, move }) => {
+            return (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <LayoutFormRow noDivider>
+                      <Form.Item
+                        label={t("bodyshop.fields.ssbuckets.id")}
+                        key={`${index}id`}
+                        name={[field.name, "id"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("bodyshop.fields.ssbuckets.label")}
+                        key={`${index}label`}
+                        name={[field.name, "label"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
 
-                        <Form.Item
-                          label={t("bodyshop.fields.ssbuckets.gte")}
-                          key={`${index}gte`}
-                          name={[field.name, "gte"]}
-                          rules={[
-                            {
-                              required: true,
-                              message: t("general.validation.required"),
-                            },
-                          ]}
-                        >
-                          <InputNumber />
-                        </Form.Item>
+                      <Form.Item
+                        label={t("bodyshop.fields.ssbuckets.gte")}
+                        key={`${index}gte`}
+                        name={[field.name, "gte"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <InputNumber />
+                      </Form.Item>
 
-                        <Form.Item
-                          label={t("bodyshop.fields.ssbuckets.lt")}
-                          key={`${index}lt`}
-                          name={[field.name, "lt"]}
-                        >
-                          <InputNumber />
-                        </Form.Item>
+                      <Form.Item
+                        label={t("bodyshop.fields.ssbuckets.lt")}
+                        key={`${index}lt`}
+                        name={[field.name, "lt"]}
+                      >
+                        <InputNumber />
+                      </Form.Item>
 
-                        <Form.Item
-                          label={t("bodyshop.fields.ssbuckets.target")}
-                          key={`${index}target`}
-                          name={[field.name, "target"]}
-                          rules={[
-                            {
-                              required: true,
-                              message: t("general.validation.required"),
-                            },
-                          ]}
-                        >
-                          <InputNumber />
-                        </Form.Item>
-                        <div>
-                          <DeleteFilled
-                            onClick={() => {
-                              remove(field.name);
-                            }}
-                          />
-                          <FormListMoveArrows
-                            move={move}
-                            index={index}
-                            total={fields.length}
-                          />
-                        </div>
-                      </LayoutFormRow>
-                    </Form.Item>
-                  ))}
-                  <Form.Item>
-                    <Button
-                      type="dashed"
-                      onClick={() => {
-                        add();
-                      }}
-                      style={{ width: "100%" }}
-                    >
-                      {t("bodyshop.actions.addbucket")}
-                    </Button>
+                      <Form.Item
+                        label={t("bodyshop.fields.ssbuckets.target")}
+                        key={`${index}target`}
+                        name={[field.name, "target"]}
+                        rules={[
+                          {
+                            required: true,
+                            message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <InputNumber />
+                      </Form.Item>
+                      <Space wrap>
+                        <DeleteFilled
+                          onClick={() => {
+                            remove(field.name);
+                          }}
+                        />
+                        <FormListMoveArrows
+                          move={move}
+                          index={index}
+                          total={fields.length}
+                        />
+                      </Space>
+                    </LayoutFormRow>
                   </Form.Item>
-                </div>
-              );
-            }}
-          </Form.List>
-        </Col>
-      </Row>
+                ))}
+                <Form.Item>
+                  <Button
+                    type="dashed"
+                    onClick={() => {
+                      add();
+                    }}
+                    style={{ width: "100%" }}
+                  >
+                    {t("bodyshop.actions.addbucket")}
+                  </Button>
+                </Form.Item>
+              </div>
+            );
+          }}
+        </Form.List>
+      </LayoutFormRow>
     </div>
   );
 }
diff --git a/client/src/components/shop-info/shop-info.speedprint.component.jsx b/client/src/components/shop-info/shop-info.speedprint.component.jsx
index c754f3abe..fd054f762 100644
--- a/client/src/components/shop-info/shop-info.speedprint.component.jsx
+++ b/client/src/components/shop-info/shop-info.speedprint.component.jsx
@@ -1,5 +1,5 @@
 import { DeleteFilled } from "@ant-design/icons";
-import { Button, Form, Input, Select } from "antd";
+import { Button, Form, Input, Select, Space } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { TemplateList } from "../../utils/TemplateConstants";
@@ -9,71 +9,66 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 export default function ShopInfoSpeedPrint({ bodyshop, form }) {
   const { t } = useTranslation();
   const TemplateListGenerated = TemplateList();
-  console.log("TemplateListGenerated", TemplateListGenerated);
   return (
-    <div>
-      <Form.List name={["speedprint"]}>
-        {(fields, { add, remove, move }) => {
-          return (
-            <div>
-              {fields.map((field, index) => (
-                <Form.Item key={field.key} style={{ padding: 0, margin: 2 }}>
-                  <LayoutFormRow grow>
-                    <Form.Item
-                      className="imex-flex-row__margin"
-                      label={t("bodyshop.fields.speedprint.id")}
-                      key={`${index}id`}
-                      name={[field.name, "id"]}
-                      rules={[
-                        {
-                          required: true,
-                          message: t("general.validation.required"),
-                        },
-                      ]}
-                    >
-                      <Input />
-                    </Form.Item>
-                    <Form.Item
-                      className="imex-flex-row__margin"
-                      label={t("bodyshop.fields.speedprint.label")}
-                      key={`${index}label`}
-                      name={[field.name, "label"]}
-                      rules={[
-                        {
-                          required: true,
-                          message: t("general.validation.required"),
-                        },
-                      ]}
-                    >
-                      <Input />
-                    </Form.Item>
+    <Form.List name={["speedprint"]}>
+      {(fields, { add, remove, move }) => {
+        return (
+          <div>
+            {fields.map((field, index) => (
+              <Form.Item key={field.key} style={{ padding: 0, margin: 2 }}>
+                <LayoutFormRow grow>
+                  <Form.Item
+                    label={t("bodyshop.fields.speedprint.id")}
+                    key={`${index}id`}
+                    name={[field.name, "id"]}
+                    rules={[
+                      {
+                        required: true,
+                        message: t("general.validation.required"),
+                      },
+                    ]}
+                  >
+                    <Input />
+                  </Form.Item>
+                  <Form.Item
+                    label={t("bodyshop.fields.speedprint.label")}
+                    key={`${index}label`}
+                    name={[field.name, "label"]}
+                    rules={[
+                      {
+                        required: true,
+                        message: t("general.validation.required"),
+                      },
+                    ]}
+                  >
+                    <Input />
+                  </Form.Item>
 
-                    <Form.Item
-                      className="imex-flex-row__margin"
-                      name={[field.name, "templates"]}
-                      label={t("bodyshop.fields.speedprint.templates")}
-                      rules={[
-                        {
-                          required: true,
-                          message: t("general.validation.required"),
-                          type: "array",
-                        },
-                      ]}
-                    >
-                      <Select mode="multiple">
-                        {Object.keys(TemplateListGenerated).map((key, idx) => (
-                          <Select.Option
-                            key={idx}
-                            value={TemplateListGenerated[key].key}
-                          >
-                            {TemplateListGenerated[key].title}
-                          </Select.Option>
-                        ))}
-                      </Select>
-                    </Form.Item>
+                  <Form.Item
+                    name={[field.name, "templates"]}
+                    label={t("bodyshop.fields.speedprint.templates")}
+                    rules={[
+                      {
+                        required: true,
+                        message: t("general.validation.required"),
+                        type: "array",
+                      },
+                    ]}
+                  >
+                    <Select mode="multiple">
+                      {Object.keys(TemplateListGenerated).map((key, idx) => (
+                        <Select.Option
+                          key={idx}
+                          value={TemplateListGenerated[key].key}
+                        >
+                          {TemplateListGenerated[key].title}
+                        </Select.Option>
+                      ))}
+                    </Select>
+                  </Form.Item>
 
+                  <Space wrap>
                     <DeleteFilled
-                      className="imex-flex-row__margin"
                       onClick={() => {
                         remove(field.name);
                       }}
@@ -83,24 +78,24 @@ export default function ShopInfoSpeedPrint({ bodyshop, form }) {
                       index={index}
                       total={fields.length}
                     />
-                  </LayoutFormRow>
-                </Form.Item>
-              ))}
-              <Form.Item>
-                <Button
-                  type="dashed"
-                  onClick={() => {
-                    add();
-                  }}
-                  style={{ width: "100%" }}
-                >
-                  {t("bodyshop.actions.addspeedprint")}
-                </Button>
+                  </Space>
+                </LayoutFormRow>
               </Form.Item>
-            </div>
-          );
-        }}
-      </Form.List>
-    </div>
+            ))}
+            <Form.Item>
+              <Button
+                type="dashed"
+                onClick={() => {
+                  add();
+                }}
+                style={{ width: "100%" }}
+              >
+                {t("bodyshop.actions.addspeedprint")}
+              </Button>
+            </Form.Item>
+          </div>
+        );
+      }}
+    </Form.List>
   );
 }
diff --git a/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx b/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
index c2e9a4298..f3efcbd20 100644
--- a/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
+++ b/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
@@ -1,6 +1,6 @@
 import { PrinterFilled } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
-import { Button, Divider, Drawer, Grid, PageHeader, Tabs, Tag } from "antd";
+import { Button, Divider, Drawer, Grid, PageHeader, Tabs } from "antd";
 import queryString from "query-string";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -14,8 +14,6 @@ import JobsDetailHeader from "../jobs-detail-header/jobs-detail-header.component
 import JobsDocumentsGalleryContainer from "../jobs-documents-gallery/jobs-documents-gallery.container";
 import JobNotesContainer from "../jobs-notes/jobs-notes.container";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
-import OwnerTagPopoverComponent from "../owner-tag-popover/owner-tag-popover.component";
-import VehicleTagPopoverComponent from "../vehicle-tag-popover/vehicle-tag-popover.component";
 
 const mapDispatchToProps = (dispatch) => ({
   setPrintCenterContext: (context) =>
diff --git a/client/src/components/time-ticket-list/time-ticket-list.component.jsx b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
index 3ec7425cc..1fba7089d 100644
--- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx
+++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
@@ -2,7 +2,6 @@ import { Card, Space, Table } from "antd";
 import moment from "moment";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
 import { onlyUnique } from "../../utils/arrayHelper";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index c0fd2c851..313a8b2d8 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -172,7 +172,7 @@
 		"bodyshop": {
 			"actions": {
 				"addapptcolor": "Add Appointment Color",
-				"addbucket": "Add Bucket",
+				"addbucket": "Add Definition",
 				"addpartslocation": "Add Parts Location",
 				"addspeedprint": "Add Speed Print",
 				"addtemplate": "Add Template",
@@ -412,10 +412,12 @@
 				"2tiername": "Name => RO",
 				"2tiersetup": "2 Tier Setup",
 				"2tiersource": "Source => RO",
+				"accountingsetup": "Accounting Setup",
 				"accountingtiers": "Number of Tiers to Use for Export",
 				"alljobstatuses": "All Job Statuses",
 				"allopenjobstatuses": "All Open Job Statuses",
 				"apptcolors": "Appointment Colors",
+				"businessinformation": "Business Information",
 				"checklists": "Checklists",
 				"csiq": "CSI Questions",
 				"customtemplates": "Custom Templates",
@@ -423,12 +425,16 @@
 				"defaultprofitsmapping": "Default Profits Mapping",
 				"deliverchecklist": "Delivery Checklist",
 				"employees": "Employees",
+				"insurancecos": "Insurance Companies",
 				"intakechecklist": "Intake Checklist",
 				"jobstatuses": "Job Statuses",
 				"laborrates": "Labor Rates",
 				"licensing": "Licensing",
+				"messagingpresets": "Messaging Presets",
 				"notemplatesavailable": "No templates available to add.",
+				"notespresets": "Notes Presets",
 				"orderstatuses": "Order Statuses",
+				"partslocations": "Parts Locations",
 				"rbac": "Role Based Access Control",
 				"responsibilitycenters": {
 					"costs": "Cost Centers",
@@ -438,8 +444,11 @@
 					"title": "Responsibility Centers"
 				},
 				"scheduling": "SMART Scheduling",
+				"scoreboardsetup": "Scoreboard Setup",
 				"shopinfo": "Shop Information",
 				"speedprint": "Speed Print Configuration",
+				"ssbuckets": "Job Size Definitions",
+				"systemsettings": "System Settings",
 				"workingdays": "Working Days"
 			},
 			"successes": {
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index ed64abe6c..34a98831e 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -412,10 +412,12 @@
 				"2tiername": "",
 				"2tiersetup": "",
 				"2tiersource": "",
+				"accountingsetup": "",
 				"accountingtiers": "",
 				"alljobstatuses": "",
 				"allopenjobstatuses": "",
 				"apptcolors": "",
+				"businessinformation": "",
 				"checklists": "",
 				"csiq": "",
 				"customtemplates": "",
@@ -423,12 +425,16 @@
 				"defaultprofitsmapping": "",
 				"deliverchecklist": "",
 				"employees": "",
+				"insurancecos": "",
 				"intakechecklist": "",
 				"jobstatuses": "",
 				"laborrates": "",
 				"licensing": "",
+				"messagingpresets": "",
 				"notemplatesavailable": "",
+				"notespresets": "",
 				"orderstatuses": "",
+				"partslocations": "",
 				"rbac": "",
 				"responsibilitycenters": {
 					"costs": "",
@@ -438,8 +444,11 @@
 					"title": ""
 				},
 				"scheduling": "",
+				"scoreboardsetup": "",
 				"shopinfo": "",
 				"speedprint": "",
+				"ssbuckets": "",
+				"systemsettings": "",
 				"workingdays": ""
 			},
 			"successes": {
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 7c36e2c0a..ffd154cfe 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -412,10 +412,12 @@
 				"2tiername": "",
 				"2tiersetup": "",
 				"2tiersource": "",
+				"accountingsetup": "",
 				"accountingtiers": "",
 				"alljobstatuses": "",
 				"allopenjobstatuses": "",
 				"apptcolors": "",
+				"businessinformation": "",
 				"checklists": "",
 				"csiq": "",
 				"customtemplates": "",
@@ -423,12 +425,16 @@
 				"defaultprofitsmapping": "",
 				"deliverchecklist": "",
 				"employees": "",
+				"insurancecos": "",
 				"intakechecklist": "",
 				"jobstatuses": "",
 				"laborrates": "",
 				"licensing": "",
+				"messagingpresets": "",
 				"notemplatesavailable": "",
+				"notespresets": "",
 				"orderstatuses": "",
+				"partslocations": "",
 				"rbac": "",
 				"responsibilitycenters": {
 					"costs": "",
@@ -438,8 +444,11 @@
 					"title": ""
 				},
 				"scheduling": "",
+				"scoreboardsetup": "",
 				"shopinfo": "",
 				"speedprint": "",
+				"ssbuckets": "",
+				"systemsettings": "",
 				"workingdays": ""
 			},
 			"successes": {