diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index f79874708..f44c1e97c 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -2720,6 +2720,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>inhousevendorid</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>insurance_vendor_id</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/bill-form/bill-form.component.jsx b/client/src/components/bill-form/bill-form.component.jsx
index 86eae294f..edb7c5ba8 100644
--- a/client/src/components/bill-form/bill-form.component.jsx
+++ b/client/src/components/bill-form/bill-form.component.jsx
@@ -79,7 +79,7 @@ export function BillFormComponent({
           <JobSearchSelect
             disabled={billEdit || disabled}
             convertedOnly
-           // notExported={false}
+            // notExported={false}
             onBlur={() => {
               if (form.getFieldValue("jobid") !== null) {
                 loadLines({ variables: { id: form.getFieldValue("jobid") } });
@@ -120,7 +120,7 @@ export function BillFormComponent({
             ({ getFieldValue }) => ({
               async validator(rule, value) {
                 const vendorid = getFieldValue("vendorid");
-                if (vendorid) {
+                if (vendorid && value) {
                   const response = await client.query({
                     query: CHECK_BILL_INVOICE_NUMBER,
                     variables: {
diff --git a/client/src/components/help-rescue/help-rescue.component.jsx b/client/src/components/help-rescue/help-rescue.component.jsx
index ba89b69df..c2e9ad127 100644
--- a/client/src/components/help-rescue/help-rescue.component.jsx
+++ b/client/src/components/help-rescue/help-rescue.component.jsx
@@ -32,7 +32,7 @@ export default function HelpRescue() {
           >
             <span>
               Enter your six-digit code, then click the Start Download button
-              below{" "}
+              below
             </span>
             <input type="text" name="Code" />
             <br />
diff --git a/client/src/components/jobs-detail-checklists/jobs-detail-checklists.component.jsx b/client/src/components/jobs-detail-checklists/jobs-detail-checklists.component.jsx
index 9147037fb..0cd08467d 100644
--- a/client/src/components/jobs-detail-checklists/jobs-detail-checklists.component.jsx
+++ b/client/src/components/jobs-detail-checklists/jobs-detail-checklists.component.jsx
@@ -11,7 +11,7 @@ export default function JobsDetailChecklists({ job }) {
           <JobChecklistDisplay checklist={job.intakechecklist} />
         </Col>
         <Col {...colSpan}>
-          {" "}
+          
           <JobChecklistDisplay checklist={job.deliverchecklist} />
         </Col>
       </Row>
diff --git a/client/src/components/print-center-jobs/print-center-jobs.component.jsx b/client/src/components/print-center-jobs/print-center-jobs.component.jsx
index 9a94f5492..7fe518540 100644
--- a/client/src/components/print-center-jobs/print-center-jobs.component.jsx
+++ b/client/src/components/print-center-jobs/print-center-jobs.component.jsx
@@ -55,8 +55,8 @@ export function PrintCenterJobsComponent({ bodyshop, printCenterModal }) {
                       disabled={item.disabled}
                     />
                   )
-                )}{" "}
-              </ul>{" "}
+                )}
+              </ul>
             </Collapse.Panel>
           </Collapse>
         </Col>
diff --git a/client/src/components/shop-info/shop-info.component.jsx b/client/src/components/shop-info/shop-info.component.jsx
index d6ab9ae70..111120f4f 100644
--- a/client/src/components/shop-info/shop-info.component.jsx
+++ b/client/src/components/shop-info/shop-info.component.jsx
@@ -205,7 +205,7 @@ export default function ShopInfoComponent({ form, saveLoading }) {
                 },
               ]}
             >
-              <InputNumberCalculator min={0} precision={0} />
+              <InputNumber min={0} precision={0} />
             </Form.Item>
 
             <Form.Item
@@ -218,7 +218,7 @@ export default function ShopInfoComponent({ form, saveLoading }) {
                 },
               ]}
             >
-              <InputNumberCalculator min={0} precision={0} />
+              <InputNumber min={0} precision={0} />
             </Form.Item>
 
             <Form.Item
@@ -243,7 +243,7 @@ export default function ShopInfoComponent({ form, saveLoading }) {
                 },
               ]}
             >
-              <InputNumberCalculator min={1} precision={1} />
+              <InputNumber min={1} precision={1} />
             </Form.Item>
             <Form.Item
               name={["md_referral_sources"]}
@@ -273,6 +273,19 @@ export default function ShopInfoComponent({ form, saveLoading }) {
                 <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 shouldUpdate>
               {() => {
                 return (
@@ -494,65 +507,67 @@ export default function ShopInfoComponent({ form, saveLoading }) {
               );
             }}
           </Form.List>
-
-          <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={["md_ins_cos"]}
-            label={t("bodyshop.fields.md_ins_cos")}
-            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"),
-              },
-            ]}
-          >
-            <InputNumberCalculator min={0.1} precision={1} />
-          </Form.Item>
+          <LayoutFormRow>
+            
+            <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={["md_ins_cos"]}
+              label={t("bodyshop.fields.md_ins_cos")}
+              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>
+          </LayoutFormRow>
         </Collapse.Panel>
         <Collapse.Panel
           key="speedprint"
diff --git a/client/src/components/vendors-form/vendors-form.component.jsx b/client/src/components/vendors-form/vendors-form.component.jsx
index 0f78fdfcb..4640223ce 100644
--- a/client/src/components/vendors-form/vendors-form.component.jsx
+++ b/client/src/components/vendors-form/vendors-form.component.jsx
@@ -23,7 +23,6 @@ export default function VendorsFormComponent({
   handleDelete,
   responsibilityCenters,
 }) {
-  console.log("🚀 ~ file: vendors-form.component.jsx ~ line 26 ~ formLoading", formLoading)
   const { t } = useTranslation();
   const { getFieldValue } = form;
   return (
@@ -113,7 +112,7 @@ export default function VendorsFormComponent({
           label={t("vendors.fields.prompt_discount")}
           name="prompt_discount"
         >
-          <InputNumberCalculator />
+          <InputNumber max={1} precision={2} />
         </Form.Item>
         <Form.Item
           label={t("vendors.fields.cost_center")}
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 2bc83b0fd..c8724c662 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -185,6 +185,7 @@
 				"email": "General Shop Email",
 				"enforce_class": "Enforce Class on Conversion?",
 				"federal_tax_id": "Federal Tax ID (GST/HST)",
+				"inhousevendorid": "In House Vendor ID",
 				"insurance_vendor_id": "Insurance Vendor ID",
 				"lastnumberworkingdays": "Scoreboard - Last Number of Working Days",
 				"logo_img_path": "Shop Logo",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 979b6eab4..a87c58c6e 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -185,6 +185,7 @@
 				"email": "",
 				"enforce_class": "",
 				"federal_tax_id": "",
+				"inhousevendorid": "",
 				"insurance_vendor_id": "",
 				"lastnumberworkingdays": "",
 				"logo_img_path": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index d0dff3078..052e2a45a 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -185,6 +185,7 @@
 				"email": "",
 				"enforce_class": "",
 				"federal_tax_id": "",
+				"inhousevendorid": "",
 				"insurance_vendor_id": "",
 				"lastnumberworkingdays": "",
 				"logo_img_path": "",