diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx
index 81273a7e5..e82961cdf 100644
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -18,8 +18,6 @@ import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import { setJoyRideSteps } from "../../redux/application/application.actions";
 import { OwnerNameDisplayFunction } from "./../owner-name-display/owner-name-display.component";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
-
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
diff --git a/client/src/components/shop-info/shop-info.rbac.component.jsx b/client/src/components/shop-info/shop-info.rbac.component.jsx
index 8be57a559..050449097 100644
--- a/client/src/components/shop-info/shop-info.rbac.component.jsx
+++ b/client/src/components/shop-info/shop-info.rbac.component.jsx
@@ -30,227 +30,219 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
   return (
     <RbacWrapper action="shop:rbac">
       <LayoutFormRow>
-        {HasFeatureAccess({ featureName: "export", bodyshop }) && (
-          <>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.accounting.exportlog")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "accounting:exportlog"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.accounting.payables")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "accounting:payables"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.accounting.payments")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "accounting:payments"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.accounting.receivables")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "accounting:receivables"]}
-            >
-              <InputNumber />
-            </Form.Item>
-          </>
-        )}
-        {HasFeatureAccess({ featureName: "bills", bodyshop }) && (
-          <>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.bills.delete")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "bills:delete"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.bills.enter")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "bills:enter"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.bills.list")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "bills:list"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.bills.reexport")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "bills:reexport"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.bills.view")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "bills:view"]}
-            >
-              <InputNumber />
-            </Form.Item>
-          </>
-        )}
+        {...HasFeatureAccess({ featureName: "export", bodyshop }) && [
+          <Form.Item
+            label={t("bodyshop.fields.rbac.accounting.exportlog")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "accounting:exportlog"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.accounting.payables")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "accounting:payables"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.accounting.payments")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "accounting:payments"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.accounting.receivables")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "accounting:receivables"]}
+          >
+            <InputNumber />
+          </Form.Item>
+        ]}
+        {...HasFeatureAccess({ featureName: "bills", bodyshop }) && [
+          <Form.Item
+            label={t("bodyshop.fields.rbac.bills.delete")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "bills:delete"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.bills.enter")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "bills:enter"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.bills.list")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "bills:list"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.bills.reexport")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "bills:reexport"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.bills.view")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "bills:view"]}
+          >
+            <InputNumber />
+          </Form.Item>
+        ]}
 
-        {HasFeatureAccess({ featureName: "courtesycars", bodyshop }) && (
-          <>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.contracts.create")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "contracts:create"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.contracts.detail")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "contracts:detail"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.contracts.list")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "contracts:list"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.courtesycar.create")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "courtesycar:create"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.courtesycar.detail")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "courtesycar:detail"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.courtesycar.list")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "courtesycar:list"]}
-            >
-              <InputNumber />
-            </Form.Item>
-          </>
-        )}
-        {HasFeatureAccess({ featureName: "csi", bodyshop }) && (
-          <>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.csi.export")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "csi:export"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.csi.page")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "csi:page"]}
-            >
-              <InputNumber />
-            </Form.Item>
-          </>
-        )}
+        {...HasFeatureAccess({ featureName: "courtesycars", bodyshop }) && [
+          <Form.Item
+            label={t("bodyshop.fields.rbac.contracts.create")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "contracts:create"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.contracts.detail")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "contracts:detail"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.contracts.list")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "contracts:list"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.courtesycar.create")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "courtesycar:create"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.courtesycar.detail")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "courtesycar:detail"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.courtesycar.list")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "courtesycar:list"]}
+          >
+            <InputNumber />
+          </Form.Item>
+        ]}
+        {...HasFeatureAccess({ featureName: "csi", bodyshop }) && [
+          <Form.Item
+            label={t("bodyshop.fields.rbac.csi.export")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "csi:export"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.csi.page")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "csi:page"]}
+          >
+            <InputNumber />
+          </Form.Item>
+        ]}
         <Form.Item
           label={t("bodyshop.fields.rbac.employees.page")}
           rules={[
@@ -569,130 +561,128 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
             <InputNumber />
           </Form.Item>
         )}
-        {HasFeatureAccess({ featureName: "timetickets", bodyshop }) && (
-          <>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.shiftclock.view")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "shiftclock:view"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.shop.config")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "shop:config"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.timetickets.edit")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "timetickets:edit"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "timetickets:shiftedit"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.timetickets.editcommitted")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "timetickets:editcommitted"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.ttapprovals.view")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "ttapprovals:view"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.ttapprovals.approve")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "ttapprovals:approve"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.timetickets.enter")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "timetickets:enter"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.timetickets.list")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "timetickets:list"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "timetickets:shiftedit"]}
-            >
-              <InputNumber />
-            </Form.Item>
-          </>
-        )}
+        {...HasFeatureAccess({ featureName: "timetickets", bodyshop }) && [
+          <Form.Item
+            label={t("bodyshop.fields.rbac.shiftclock.view")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "shiftclock:view"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.shop.config")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "shop:config"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.timetickets.edit")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "timetickets:edit"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "timetickets:shiftedit"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.timetickets.editcommitted")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "timetickets:editcommitted"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.ttapprovals.view")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "ttapprovals:view"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.ttapprovals.approve")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "ttapprovals:approve"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.timetickets.enter")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "timetickets:enter"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.timetickets.list")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "timetickets:list"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "timetickets:shiftedit"]}
+          >
+            <InputNumber />
+          </Form.Item>
+        ]}
         <Form.Item
           label={t("bodyshop.fields.rbac.shop.vendors")}
           rules={[