diff --git a/client/src/components/form-fields-changed-alert/form-fields-changed-alert.component.jsx b/client/src/components/form-fields-changed-alert/form-fields-changed-alert.component.jsx
index 1d5576720..f4e278315 100644
--- a/client/src/components/form-fields-changed-alert/form-fields-changed-alert.component.jsx
+++ b/client/src/components/form-fields-changed-alert/form-fields-changed-alert.component.jsx
@@ -19,6 +19,7 @@ export default function FormsFieldChanged({form, skipPrompt}) {
             style={{margin: 0, padding: 0, minHeight: "unset"}}
         >
             {() => {
+              console.log("should update",form.isFieldsTouched())
                 const errors = form.getFieldsError().filter((e) => e.errors.length > 0);
                 if (form.isFieldsTouched())
                     return (
diff --git a/client/src/components/report-center-modal/report-center-modal.component.jsx b/client/src/components/report-center-modal/report-center-modal.component.jsx
index 85a2b5438..6130a5e62 100644
--- a/client/src/components/report-center-modal/report-center-modal.component.jsx
+++ b/client/src/components/report-center-modal/report-center-modal.component.jsx
@@ -18,6 +18,7 @@ import EmployeeSearchSelect from "../employee-search-select/employee-search-sele
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import "./report-center-modal.styles.scss";
 import ReportCenterModalFiltersSortersComponent from "./report-center-modal-filters-sorters-component";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
     reportCenterModal: selectReportCenter,
@@ -140,6 +141,10 @@ export function ReportCenterModalComponent({reportCenterModal, bodyshop}) {
 
     const grouped = _.groupBy(FilteredReportsList, "group");
 
+    const groupExcludeKeyFilter = [...!HasFeatureAccess({featureName: 'bills'})? ["purchases"]:[],
+    ...!HasFeatureAccess({featureName: 'timetickets'})? ["payroll"]:[],
+    ]
+
     return (
         <div>
             <Form
@@ -172,7 +177,7 @@ export function ReportCenterModalComponent({reportCenterModal, bodyshop}) {
               ))} */}
 
                         <Row gutter={[16, 16]}>
-                            {Object.keys(grouped).map((key) => (
+                            {Object.keys(grouped).filter(key => !groupExcludeKeyFilter.includes(key)).map((key) => (
                                 <Col md={8} sm={12} key={key}>
                                     <Card.Grid
                                         style={{
diff --git a/client/src/components/shop-info/shop-info.component.jsx b/client/src/components/shop-info/shop-info.component.jsx
index b28741a8f..304ae029e 100644
--- a/client/src/components/shop-info/shop-info.component.jsx
+++ b/client/src/components/shop-info/shop-info.component.jsx
@@ -18,6 +18,8 @@ import ShopInfoSpeedPrint from "./shop-info.speedprint.component";
 import {useLocation, useNavigate} from "react-router-dom";
 import ShopInfoTaskPresets from "./shop-info.task-presets.component";
 import queryString from "query-string";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -76,11 +78,12 @@ export function ShopInfoComponent({bodyshop, form, saveLoading}) {
             label: t("bodyshop.labels.responsibilitycenters.title"),
             children: <ShopInfoResponsibilityCenterComponent form={form}/>,
         },
-        {
-            key: "checklists",
-            label: t("bodyshop.labels.checklists"),
-            children: <ShopInfoIntakeChecklistComponent form={form}/>,
-        },
+        ...InstanceRenderManager({imex: [  {
+          key: "checklists",
+          label: t("bodyshop.labels.checklists"),
+          children: <ShopInfoIntakeChecklistComponent form={form}/>,
+      }], rome: "USE_IMEX", promanager:[]})
+      ,
         {
             key: "laborrates",
             label: t("bodyshop.labels.laborrates"),
diff --git a/client/src/components/shop-info/shop-info.responsibilitycenters.taxes.component.jsx b/client/src/components/shop-info/shop-info.responsibilitycenters.taxes.component.jsx
index 6df72ab0c..c31fa6c02 100644
--- a/client/src/components/shop-info/shop-info.responsibilitycenters.taxes.component.jsx
+++ b/client/src/components/shop-info/shop-info.responsibilitycenters.taxes.component.jsx
@@ -41,7 +41,7 @@ export function ShopInfoResponsibilityCenters({bodyshop, form}) {
                 })
             );
         }
-        formItems.push(Space({children: section, wrap: true}));
+        formItems.push(<Space wrap>{section}</Space> );
         formItems.push(<Divider/>);
     }
     return (
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 04bd5de6d..ac2daca8c 100644
--- a/client/src/components/shop-info/shop-info.scheduling.component.jsx
+++ b/client/src/components/shop-info/shop-info.scheduling.component.jsx
@@ -6,6 +6,7 @@ import ColorpickerFormItemComponent from "../form-items-formatted/colorpicker-fo
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import {ColorPicker} from "./shop-info.rostatus.component";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 export default function ShopInfoSchedulingComponent({form}) {
     const {t} = useTranslation();
@@ -198,140 +199,143 @@ export default function ShopInfoSchedulingComponent({form}) {
                     }}
                 </Form.List>
             </LayoutFormRow>
-            <LayoutFormRow header={t("bodyshop.labels.ssbuckets")} id="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>
+            {
+              InstanceRenderManager({imex: <LayoutFormRow header={t("bodyshop.labels.ssbuckets")} id="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>
+                                          <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 direction="horizontal">
-                                                <Form.Item
-                                                    label={
-                                                        <Space>
-                                                            {t("bodyshop.fields.ssbuckets.color")}
-                                                            <Button
-                                                                size="small"
-                                                                onClick={() => {
-                                                                    form.setFieldValue([
-                                                                        "ssbuckets",
-                                                                        field.name,
-                                                                        "color",
-                                                                    ]);
+                                          <Space direction="horizontal">
+                                              <Form.Item
+                                                  label={
+                                                      <Space>
+                                                          {t("bodyshop.fields.ssbuckets.color")}
+                                                          <Button
+                                                              size="small"
+                                                              onClick={() => {
+                                                                  form.setFieldValue([
+                                                                      "ssbuckets",
+                                                                      field.name,
+                                                                      "color",
+                                                                  ]);
 
-                                                                    form.setFields([
-                                                                        {
-                                                                            name: ["ssbuckets", field.name, "color"],
-                                                                            touched: true,
-                                                                        },
-                                                                    ]);
-                                                                }}
-                                                            >
-                                                                Reset
-                                                            </Button>
-                                                        </Space>
-                                                    }
-                                                    key={`${index}color`}
-                                                    name={[field.name, "color"]}
-                                                >
-                                                    <ColorPicker/>
-                                                </Form.Item>
-                                                <Space wrap>
-                                                    <DeleteFilled
-                                                        onClick={() => {
-                                                            remove(field.name);
-                                                        }}
-                                                    />
-                                                    <FormListMoveArrows
-                                                        move={move}
-                                                        index={index}
-                                                        total={fields.length}
-                                                    />
-                                                </Space>
-                                            </Space>
-                                        </LayoutFormRow>
-                                    </Form.Item>
-                                ))}
-                                <Form.Item>
-                                    <Button
-                                        type="dashed"
-                                        onClick={() => {
-                                            add();
-                                        }}
-                                        style={{width: "100%"}}
-                                    >
-                                        {t("bodyshop.actions.addbucket")}
-                                    </Button>
-                                </Form.Item>
-                            </div>
-                        );
-                    }}
-                </Form.List>
-            </LayoutFormRow>
+                                                                  form.setFields([
+                                                                      {
+                                                                          name: ["ssbuckets", field.name, "color"],
+                                                                          touched: true,
+                                                                      },
+                                                                  ]);
+                                                              }}
+                                                          >
+                                                              Reset
+                                                          </Button>
+                                                      </Space>
+                                                  }
+                                                  key={`${index}color`}
+                                                  name={[field.name, "color"]}
+                                              >
+                                                  <ColorPicker/>
+                                              </Form.Item>
+                                              <Space wrap>
+                                                  <DeleteFilled
+                                                      onClick={() => {
+                                                          remove(field.name);
+                                                      }}
+                                                  />
+                                                  <FormListMoveArrows
+                                                      move={move}
+                                                      index={index}
+                                                      total={fields.length}
+                                                  />
+                                              </Space>
+                                          </Space>
+                                      </LayoutFormRow>
+                                  </Form.Item>
+                              ))}
+                              <Form.Item>
+                                  <Button
+                                      type="dashed"
+                                      onClick={() => {
+                                          add();
+                                      }}
+                                      style={{width: "100%"}}
+                                  >
+                                      {t("bodyshop.actions.addbucket")}
+                                  </Button>
+                              </Form.Item>
+                          </div>
+                      );
+                  }}
+              </Form.List>
+          </LayoutFormRow>, rome: "USE_IMEX", promanager: null})
+            }
+            
         </div>
     );
 }
diff --git a/client/src/pages/jobs-create/jobs-create.component.jsx b/client/src/pages/jobs-create/jobs-create.component.jsx
index ffb329cc7..9f827ddc8 100644
--- a/client/src/pages/jobs-create/jobs-create.component.jsx
+++ b/client/src/pages/jobs-create/jobs-create.component.jsx
@@ -10,6 +10,7 @@ import JobsCreateOwnerInfoContainer from "../../components/jobs-create-owner-inf
 import JobsCreateVehicleInfoContainer
     from "../../components/jobs-create-vehicle-info/jobs-create-vehicle-info.container";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
+import FormsFieldChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
 
 export default function JobsCreateComponent({form}) {
     const [pageIndex, setPageIndex] = useState(0);
@@ -41,6 +42,7 @@ export default function JobsCreateComponent({form}) {
 
     const next = () => {
         setPageIndex(pageIndex + 1);
+        console.log("NExt")
     };
     const prev = () => {
         setPageIndex(pageIndex - 1);
@@ -57,24 +59,32 @@ export default function JobsCreateComponent({form}) {
                             <Button
                                 type="primary"
                                 onClick={() => {
-                                    form
-                                        .validateFields()
-                                        .then((r) => {
-                                            if (steps[pageIndex].validation) {
-                                                setErrorMessage(null);
-                                                next();
-                                            } else {
-                                                setErrorMessage(steps[pageIndex].error);
-                                            }
-                                        })
-                                        .catch((error) => console.log("error", error));
+                                  next();
+                                    // form
+                                    //     .validateFields()
+                                    //     .then((r) => {
+                                    //         if (steps[pageIndex].validation) {
+                                    //             setErrorMessage(null);
+                                    //             next();
+                                    //         } else {
+                                    //             setErrorMessage(steps[pageIndex].error);
+                                    //         }
+                                    //     })
+                                    //     .catch((error) => console.log("error", error));
                                 }}
                             >
                                 Next
                             </Button>
                         )}
                         {pageIndex === steps.length - 1 && (
-                            <Button type="primary" htmlType="submit">
+                            <Button type="primary" onClick={() => {
+                                 form
+                                        .validateFields()
+                                        .then((r) => {
+                                  
+                                        })
+                                        .catch((error) => console.log("error", error));
+                              form.submit()}}>
                                 Done
                             </Button>
                         )}
@@ -91,18 +101,18 @@ export default function JobsCreateComponent({form}) {
                                     cursor: "pointer",
                                     fontWeight: idx === pageIndex && "bolder",
                                 }}
-                                onClick={() => {
-                                    form
-                                        .validateFields()
-                                        .then((r) => {
-                                            if (steps[pageIndex].validation) {
-                                                setErrorMessage(null);
-                                                setPageIndex(idx);
-                                            } else {
-                                                setErrorMessage(steps[pageIndex].error);
-                                            }
-                                        })
-                                        .catch((error) => console.log("error", error));
+                                onClick={() => {   setPageIndex(idx);
+                                    // form
+                                    //     .validateFields()
+                                    //     .then((r) => {
+                                    //         if (steps[pageIndex].validation) {
+                                    //             setErrorMessage(null);
+                                    //             setPageIndex(idx);
+                                    //         } else {
+                                    //             setErrorMessage(steps[pageIndex].error);
+                                    //         }
+                                    //     })
+                                    //     .catch((error) => console.log("error", error));
                                 }}
                             />
                         ))}
@@ -132,7 +142,7 @@ export default function JobsCreateComponent({form}) {
             ) : (
                 <div>
                     <ProgressButtons top/>
-
+<FormsFieldChanged form={form} />
                     {errorMessage ? (
                         <div>
                             <AlertComponent message={errorMessage} type="error"/>
diff --git a/client/src/pages/jobs-create/jobs-create.container.jsx b/client/src/pages/jobs-create/jobs-create.container.jsx
index 32af454be..1b1af899e 100644
--- a/client/src/pages/jobs-create/jobs-create.container.jsx
+++ b/client/src/pages/jobs-create/jobs-create.container.jsx
@@ -153,7 +153,7 @@ function JobsCreateContainer({bodyshop, setBreadcrumbs, setSelectedHeader}) {
         <JobCreateContext.Provider value={contextState}>
             <RbacWrapper action="jobs:create">
                 <Form
-                    scrollToFirstError
+                   
                     form={form}
                     onFinish={handleFinish}
                     layout="vertical"
diff --git a/client/src/pages/shop/shop.page.component.jsx b/client/src/pages/shop/shop.page.component.jsx
index 5165d1232..a4b0a7503 100644
--- a/client/src/pages/shop/shop.page.component.jsx
+++ b/client/src/pages/shop/shop.page.component.jsx
@@ -15,6 +15,7 @@ import {selectBodyshop} from "../../redux/user/user.selectors";
 import ShopInfoUsersComponent from "../../components/shop-users/shop-users.component";
 
 import ShopTeamsContainer from "../../components/shop-teams/shop-teams.container";
+import { HasFeatureAccess } from "../../components/feature-wrapper/feature-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -69,12 +70,15 @@ export function ShopPage({bodyshop, setSelectedHeader, setBreadcrumbs}) {
             label: t("bodyshop.labels.licensing"),
             children: <ShopInfoUsersComponent/>,
         },
-        {
-            key: "csiq",
-            label: t("bodyshop.labels.csiq"),
-            children: <ShopCsiConfig/>,
-        });
+       );
 
+       if(HasFeatureAccess("csi")){
+        items.push({
+          key: "csiq",
+          label: t("bodyshop.labels.csiq"),
+          children: <ShopCsiConfig/>,
+      })
+       }
     return (
         <RbacWrapper action="shop:config">
             <Tabs
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index 651174faa..f08f0e437 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -5,9 +5,10 @@ import InstanceRenderManager from './instanceRenderMgr'
 export const EmailSettings = {
     fromNameDefault: InstanceRenderManager({
         imex: "ImEX Online",
-        rome:"Rome Online"
+        rome:"Rome Online",
+        promanager: "ProManager"
     }) ,
-    fromAddress: InstanceRenderManager({imex: "noreply@imex.online" ,rome:"noreply@romeonline.io"}) ,
+    fromAddress: InstanceRenderManager({imex: "noreply@imex.online" ,rome:"noreply@romeonline.io", promanager: "noreply@promanager.web-est.com"}) ,
 };
 
 export const TemplateList = (type, context) => {