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 38437a9aa..40c5a229d 100644
--- a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
+++ b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
@@ -70,16 +70,302 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
   return (
     <div>
       <RbacWrapper action="shop:responsibilitycenter">
+        <LayoutFormRow header={t("bodyshop.labels.accountingsetup")} id="accountingsetup">
+          {[
+            ...(HasFeatureAccess({ featureName: "export", bodyshop })
+              ? !bodyshop.cdk_dealerid && !bodyshop.pbs_serialnumber
+                ? [
+                    <Form.Item
+                      key="qbo"
+                      label={t("bodyshop.labels.qbo")}
+                      valuePropName="checked"
+                      name={["accountingconfig", "qbo"]}
+                    >
+                      <Switch />
+                    </Form.Item>,
+                    InstanceRenderManager({
+                      imex: (
+                        <Form.Item key="qbo_usa_wrapper" shouldUpdate noStyle>
+                          {() => (
+                            <Form.Item
+                              label={t("bodyshop.labels.qbo_usa")}
+                              shouldUpdate
+                              valuePropName="checked"
+                              name={["accountingconfig", "qbo_usa"]}
+                            >
+                              <Switch disabled={!form.getFieldValue(["accountingconfig", "qbo"])} />
+                            </Form.Item>
+                          )}
+                        </Form.Item>
+                      )
+                    }),
+                    <Form.Item
+                      key="qbo_departmentid"
+                      label={t("bodyshop.labels.qbo_departmentid")}
+                      name={["accountingconfig", "qbo_departmentid"]}
+                    >
+                      <Input />
+                    </Form.Item>,
+                    <Form.Item
+                      key="accountingtiers"
+                      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 key="twotierpref_wrapper" 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
+                      key="printlater"
+                      label={t("bodyshop.labels.printlater")}
+                      valuePropName="checked"
+                      name={["accountingconfig", "printlater"]}
+                    >
+                      <Switch />
+                    </Form.Item>,
+                    <Form.Item
+                      key="emaillater"
+                      label={t("bodyshop.labels.emaillater")}
+                      valuePropName="checked"
+                      name={["accountingconfig", "emaillater"]}
+                    >
+                      <Switch />
+                    </Form.Item>,
+                    <Form.Item
+                      key="ReceivableCustomField1"
+                      name={["accountingconfig", "ReceivableCustomField1"]}
+                      label={t("bodyshop.fields.ReceivableCustomField", { number: 1 })}
+                    >
+                      {ReceivableCustomFieldSelect}
+                    </Form.Item>,
+                    <Form.Item
+                      key="ReceivableCustomField2"
+                      name={["accountingconfig", "ReceivableCustomField2"]}
+                      label={t("bodyshop.fields.ReceivableCustomField", { number: 2 })}
+                    >
+                      {ReceivableCustomFieldSelect}
+                    </Form.Item>,
+                    <Form.Item
+                      key="ReceivableCustomField3"
+                      name={["accountingconfig", "ReceivableCustomField3"]}
+                      label={t("bodyshop.fields.ReceivableCustomField", { number: 3 })}
+                    >
+                      {ReceivableCustomFieldSelect}
+                    </Form.Item>,
+                    <Form.Item
+                      key="md_classes"
+                      name={["md_classes"]}
+                      label={t("bodyshop.fields.md_classes")}
+                      rules={[
+                        ({ getFieldValue }) => {
+                          return {
+                            required: getFieldValue("enforce_class"),
+                            //message: t("general.validation.required"),
+                            type: "array"
+                          };
+                        }
+                      ]}
+                    >
+                      <Select mode="tags" />
+                    </Form.Item>,
+                    <Form.Item
+                      key="enforce_class"
+                      name={["enforce_class"]}
+                      label={t("bodyshop.fields.enforce_class")}
+                      valuePropName="checked"
+                    >
+                      <Switch />
+                    </Form.Item>,
+                    <Form.Item
+                      key="accumulatePayableLines"
+                      name={["accountingconfig", "accumulatePayableLines"]}
+                      label={t("bodyshop.fields.accumulatePayableLines")}
+                      valuePropName="checked"
+                    >
+                      <Switch />
+                    </Form.Item>
+                  ]
+                : []
+              : []),
+            <Form.Item
+              key="inhousevendorid"
+              label={t("bodyshop.fields.inhousevendorid")}
+              name={"inhousevendorid"}
+              rules={[
+                {
+                  required: true
+                  //message: t("general.validation.required"),
+                }
+              ]}
+            >
+              <Input />
+            </Form.Item>,
+            <Form.Item
+              key="default_adjustment_rate"
+              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>,
+            InstanceRenderManager({
+              imex: (
+                <Form.Item key="federal_tax_id" label={t("bodyshop.fields.federal_tax_id")} name="federal_tax_id">
+                  <Input />
+                </Form.Item>
+              )
+            }),
+            <Form.Item key="state_tax_id" label={t("bodyshop.fields.state_tax_id")} name="state_tax_id">
+              <Input />
+            </Form.Item>,
+            ...(HasFeatureAccess({ featureName: "bills", bodyshop })
+              ? [
+                  InstanceRenderManager({
+                    imex: (
+                      <Form.Item
+                        key="invoice_federal_tax_rate"
+                        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
+                    key="invoice_state_tax_rate"
+                    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
+                    key="invoice_local_tax_rate"
+                    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
+              key="md_payment_types"
+              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>,
+            ...(HasFeatureAccess({ featureName: "export", bodyshop })
+              ? [
+                  ...(ClosingPeriod.treatment === "on"
+                    ? [
+                        <Form.Item
+                          key="ClosingPeriod"
+                          name={["accountingconfig", "ClosingPeriod"]}
+                          label={t("bodyshop.fields.closingperiod")} //{t("reportcenter.labels.dates")}
+                        >
+                          <DatePicker.RangePicker format="MM/DD/YYYY" presets={DatePickerRanges} />
+                        </Form.Item>
+                      ]
+                    : []),
+                  ...(ADPPayroll.treatment === "on"
+                    ? [
+                        <Form.Item
+                          key="companyCode"
+                          name={["accountingconfig", "companyCode"]}
+                          label={t("bodyshop.fields.companycode")}
+                        >
+                          <Input />
+                        </Form.Item>
+                      ]
+                    : []),
+                  ...(ADPPayroll.treatment === "on"
+                    ? [
+                        <Form.Item
+                          key="batchID"
+                          name={["accountingconfig", "batchID"]}
+                          label={t("bodyshop.fields.batchid")}
+                        >
+                          <Input />
+                        </Form.Item>
+                      ]
+                    : [])
+                ]
+              : [])
+          ]}
+        </LayoutFormRow>
         {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
           <>
-            {bodyshop.cdk_dealerid && (
-              <DataLabel label={t("bodyshop.labels.dms.cdk_dealerid")}>{form.getFieldValue("cdk_dealerid")}</DataLabel>
-            )}
-            {bodyshop.pbs_serialnumber && (
-              <DataLabel label={t("bodyshop.labels.dms.pbs_serialnumber")}>
-                {form.getFieldValue("pbs_serialnumber")}
-              </DataLabel>
-            )}
+            <LayoutFormRow id="dmsconfiguration">
+              {bodyshop.cdk_dealerid && (
+                <DataLabel label={t("bodyshop.labels.dms.cdk_dealerid")}>
+                  {form.getFieldValue("cdk_dealerid")}
+                </DataLabel>
+              )}
+              {bodyshop.pbs_serialnumber && (
+                <DataLabel label={t("bodyshop.labels.dms.pbs_serialnumber")}>
+                  {form.getFieldValue("pbs_serialnumber")}
+                </DataLabel>
+              )}
+            </LayoutFormRow>
             <LayoutFormRow>
               <Form.Item
                 label={t("bodyshop.fields.dms.default_journal")}
@@ -316,293 +602,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
             </LayoutFormRow>
           </>
         )}
-        {bodyshop.pbs_serialnumber && (
-          <>
-            <DataLabel label={t("bodyshop.labels.dms.pbs_serialnumber")}>
-              {form.getFieldValue("pbs_serialnumber")}
-            </DataLabel>
-          </>
-        )}
-        <LayoutFormRow header={t("bodyshop.labels.accountingsetup")} id="accountingsetup">
-          {[
-            ...(HasFeatureAccess({ featureName: "export", bodyshop })
-              ? [
-                  <Form.Item
-                    key="qbo"
-                    label={t("bodyshop.labels.qbo")}
-                    valuePropName="checked"
-                    name={["accountingconfig", "qbo"]}
-                  >
-                    <Switch />
-                  </Form.Item>,
-                  InstanceRenderManager({
-                    imex: (
-                      <Form.Item key="qbo_usa_wrapper" shouldUpdate noStyle>
-                        {() => (
-                          <Form.Item
-                            label={t("bodyshop.labels.qbo_usa")}
-                            shouldUpdate
-                            valuePropName="checked"
-                            name={["accountingconfig", "qbo_usa"]}
-                          >
-                            <Switch disabled={!form.getFieldValue(["accountingconfig", "qbo"])} />
-                          </Form.Item>
-                        )}
-                      </Form.Item>
-                    )
-                  }),
-                  <Form.Item
-                    key="qbo_departmentid"
-                    label={t("bodyshop.labels.qbo_departmentid")}
-                    name={["accountingconfig", "qbo_departmentid"]}
-                  >
-                    <Input />
-                  </Form.Item>,
-                  <Form.Item
-                    key="accountingtiers"
-                    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 key="twotierpref_wrapper" 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
-                    key="printlater"
-                    label={t("bodyshop.labels.printlater")}
-                    valuePropName="checked"
-                    name={["accountingconfig", "printlater"]}
-                  >
-                    <Switch />
-                  </Form.Item>,
-                  <Form.Item
-                    key="emaillater"
-                    label={t("bodyshop.labels.emaillater")}
-                    valuePropName="checked"
-                    name={["accountingconfig", "emaillater"]}
-                  >
-                    <Switch />
-                  </Form.Item>
-                ]
-              : []),
-            <Form.Item
-              key="inhousevendorid"
-              label={t("bodyshop.fields.inhousevendorid")}
-              name={"inhousevendorid"}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-            >
-              <Input />
-            </Form.Item>,
-            <Form.Item
-              key="default_adjustment_rate"
-              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>,
-            InstanceRenderManager({
-              imex: (
-                <Form.Item key="federal_tax_id" label={t("bodyshop.fields.federal_tax_id")} name="federal_tax_id">
-                  <Input />
-                </Form.Item>
-              )
-            }),
-            <Form.Item key="state_tax_id" label={t("bodyshop.fields.state_tax_id")} name="state_tax_id">
-              <Input />
-            </Form.Item>,
-            ...(HasFeatureAccess({ featureName: "bills", bodyshop })
-              ? [
-                  InstanceRenderManager({
-                    imex: (
-                      <Form.Item
-                        key="invoice_federal_tax_rate"
-                        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
-                    key="invoice_state_tax_rate"
-                    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
-                    key="invoice_local_tax_rate"
-                    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
-              key="md_payment_types"
-              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>,
-            ...(HasFeatureAccess({ featureName: "export", bodyshop })
-              ? [
-                  <Form.Item
-                    key="ReceivableCustomField1"
-                    name={["accountingconfig", "ReceivableCustomField1"]}
-                    label={t("bodyshop.fields.ReceivableCustomField", { number: 1 })}
-                  >
-                    {ReceivableCustomFieldSelect}
-                  </Form.Item>,
-                  <Form.Item
-                    key="ReceivableCustomField2"
-                    name={["accountingconfig", "ReceivableCustomField2"]}
-                    label={t("bodyshop.fields.ReceivableCustomField", { number: 2 })}
-                  >
-                    {ReceivableCustomFieldSelect}
-                  </Form.Item>,
-                  <Form.Item
-                    key="ReceivableCustomField3"
-                    name={["accountingconfig", "ReceivableCustomField3"]}
-                    label={t("bodyshop.fields.ReceivableCustomField", { number: 3 })}
-                  >
-                    {ReceivableCustomFieldSelect}
-                  </Form.Item>,
-                  <Form.Item
-                    key="md_classes"
-                    name={["md_classes"]}
-                    label={t("bodyshop.fields.md_classes")}
-                    rules={[
-                      ({ getFieldValue }) => {
-                        return {
-                          required: getFieldValue("enforce_class"),
-                          //message: t("general.validation.required"),
-                          type: "array"
-                        };
-                      }
-                    ]}
-                  >
-                    <Select mode="tags" />
-                  </Form.Item>,
-                  <Form.Item
-                    key="enforce_class"
-                    name={["enforce_class"]}
-                    label={t("bodyshop.fields.enforce_class")}
-                    valuePropName="checked"
-                  >
-                    <Switch />
-                  </Form.Item>,
-                  ...(ClosingPeriod.treatment === "on"
-                    ? [
-                        <Form.Item
-                          key="ClosingPeriod"
-                          name={["accountingconfig", "ClosingPeriod"]}
-                          label={t("bodyshop.fields.closingperiod")} //{t("reportcenter.labels.dates")}
-                        >
-                          <DatePicker.RangePicker format="MM/DD/YYYY" presets={DatePickerRanges} />
-                        </Form.Item>
-                      ]
-                    : []),
-                  ...(ADPPayroll.treatment === "on"
-                    ? [
-                        <Form.Item
-                          key="companyCode"
-                          name={["accountingconfig", "companyCode"]}
-                          label={t("bodyshop.fields.companycode")}
-                        >
-                          <Input />
-                        </Form.Item>
-                      ]
-                    : []),
-                  ...(ADPPayroll.treatment === "on"
-                    ? [
-                        <Form.Item
-                          key="batchID"
-                          name={["accountingconfig", "batchID"]}
-                          label={t("bodyshop.fields.batchid")}
-                        >
-                          <Input />
-                        </Form.Item>
-                      ]
-                    : [])
-                ]
-              : []),
-            <Form.Item
-              key="accumulatePayableLines"
-              name={["accountingconfig", "accumulatePayableLines"]}
-              label={t("bodyshop.fields.accumulatePayableLines")}
-              valuePropName="checked"
-            >
-              <Switch />
-            </Form.Item>
-          ]}
-        </LayoutFormRow>
         {HasFeatureAccess({ featureName: "export", bodyshop }) && (
           <>
             <LayoutFormRow header={t("bodyshop.labels.responsibilitycenters.costs")} id="costs">