diff --git a/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx b/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
index 06201284b..262d1720c 100644
--- a/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
+++ b/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
@@ -48,7 +48,7 @@ export function DmsCdkVehicles({ bodyshop, form, socket, job }) {
   ];
 
   return (
-    <div>
+    <>
       <Modal
         width={"90%"}
         visible={visible}
@@ -100,6 +100,6 @@ export function DmsCdkVehicles({ bodyshop, form, socket, job }) {
       >
         {t("jobs.actions.dms.findmakemodelcode")}
       </Button>
-    </div>
+    </>
   );
 }
diff --git a/client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx b/client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx
index f24153a4d..f0d9ba970 100644
--- a/client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx
+++ b/client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx
@@ -4,9 +4,12 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
 const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
+  currentUser: selectCurrentUser,
   bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
@@ -14,9 +17,12 @@ const mapDispatchToProps = (dispatch) => ({
 });
 export default connect(mapStateToProps, mapDispatchToProps)(DmsCdkMakesRefetch);
 
-export function DmsCdkMakesRefetch({ bodyshop, form, socket }) {
+export function DmsCdkMakesRefetch({ currentUser, bodyshop, form, socket }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
+
+  if (!currentUser.email.includes("@imex.")) return null;
+
   const handleRefetch = async () => {
     setLoading(true);
     await axios.post("/cdk/getvehicles", {
diff --git a/client/src/components/dms-post-form/dms-post-form.component.jsx b/client/src/components/dms-post-form/dms-post-form.component.jsx
index ff7057606..911040cb2 100644
--- a/client/src/components/dms-post-form/dms-post-form.component.jsx
+++ b/client/src/components/dms-post-form/dms-post-form.component.jsx
@@ -122,33 +122,36 @@ export function DmsPostForm({ bodyshop, socket, job }) {
         </LayoutFormRow>
 
         {bodyshop.cdk_dealerid && (
-          <LayoutFormRow style={{ justifyContent: "center" }} grow>
-            <Form.Item
-              name="dms_make"
-              label={t("jobs.fields.dms.dms_make")}
-              rules={[
-                {
-                  required: true,
-                },
-              ]}
-            >
-              <Input disabled />
-            </Form.Item>
-            <Form.Item
-              name="dms_model"
-              label={t("jobs.fields.dms.dms_model")}
-              rules={[
-                {
-                  required: true,
-                },
-              ]}
-            >
-              <Input disabled />
-            </Form.Item>
-
-            <DmsCdkMakes form={form} socket={socket} job={job} />
-            <DmsCdkMakesRefetch />
-          </LayoutFormRow>
+          <div>
+            <LayoutFormRow style={{ justifyContent: "center" }} grow>
+              <Form.Item
+                name="dms_make"
+                label={t("jobs.fields.dms.dms_make")}
+                rules={[
+                  {
+                    required: true,
+                  },
+                ]}
+              >
+                <Input disabled />
+              </Form.Item>
+              <Form.Item
+                name="dms_model"
+                label={t("jobs.fields.dms.dms_model")}
+                rules={[
+                  {
+                    required: true,
+                  },
+                ]}
+              >
+                <Input disabled />
+              </Form.Item>
+            </LayoutFormRow>
+            <Space>
+              <DmsCdkMakes form={form} socket={socket} job={job} />
+              <DmsCdkMakesRefetch />
+            </Space>
+          </div>
         )}
         <Form.Item
           name="story"
diff --git a/client/src/components/parts-order-modal/parts-order-modal.component.jsx b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
index 86fad8d3b..917b853cd 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
@@ -1,4 +1,5 @@
 import { DeleteFilled, WarningFilled } from "@ant-design/icons";
+import { useTreatments, useClient } from "@splitsoftware/splitio-react";
 import { Divider, Form, Input, InputNumber, Radio, Space, Tag } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -8,7 +9,22 @@ import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.c
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 
-export default function PartsOrderModalComponent({
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(PartsOrderModalComponent);
+
+export function PartsOrderModalComponent({
+  bodyshop,
   vendorList,
   sendTypeState,
   isReturn,
@@ -16,7 +32,11 @@ export default function PartsOrderModalComponent({
   job,
 }) {
   const [sendType, setSendType] = sendTypeState;
-
+  const { OEConnection } = useTreatments(
+    ["OEConnection"],
+    {},
+    bodyshop.imexshopid
+  );
   const { t } = useTranslation();
 
   return (
@@ -164,7 +184,9 @@ export default function PartsOrderModalComponent({
         <Radio value={"none"}>{t("general.labels.none")}</Radio>
         <Radio value={"e"}>{t("parts_orders.labels.email")}</Radio>
         <Radio value={"p"}>{t("parts_orders.labels.print")}</Radio>
-        <Radio value={"oec"}>{t("parts_orders.labels.oec")}</Radio>
+        {OEConnection.treatment === "on" && (
+          <Radio value={"oec"}>{t("parts_orders.labels.oec")}</Radio>
+        )}
       </Radio.Group>
     </div>
   );
diff --git a/client/src/pages/dms/dms.container.jsx b/client/src/pages/dms/dms.container.jsx
index 223c4e231..ac95b4b58 100644
--- a/client/src/pages/dms/dms.container.jsx
+++ b/client/src/pages/dms/dms.container.jsx
@@ -130,7 +130,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
   return (
     <div>
       <Row gutter={[16, 16]}>
-        <Col span={10}>
+        <Col md={24} lg={10}>
           <DmsAllocationsSummary
             title={`${data && data.jobs_by_pk && data.jobs_by_pk.ro_number} | ${
               data.jobs_by_pk.ownr_fn || ""
@@ -143,7 +143,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
             jobId={jobId}
           />
         </Col>
-        <Col span={14}>
+        <Col md={24} lg={14}>
           <DmsPostForm
             socket={socket}
             jobId={jobId}