diff --git a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
index b1e686e2a..44250cca7 100644
--- a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
+++ b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
@@ -53,42 +53,8 @@ export default function JobLinesUpsertModalComponent({
           >
             <Input />
           </Form.Item>
-          <Form.Item label={t("joblines.fields.oem_partno")} name="oem_partno">
-            <Input />
-          </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow grow>
-          <Form.Item label={t("joblines.fields.part_type")} name="part_type">
-            <Select allowClear>
-              <Select.Option value="PAA">
-                {t("joblines.fields.part_types.PAA")}
-              </Select.Option>
-              <Select.Option value="PAC">
-                {t("joblines.fields.part_types.PAC")}
-              </Select.Option>
-              <Select.Option value="PAE">
-                {t("joblines.fields.part_types.PAE")}
-              </Select.Option>
-              <Select.Option value="PAL">
-                {t("joblines.fields.part_types.PAL")}
-              </Select.Option>
-              <Select.Option value="PAM">
-                {t("joblines.fields.part_types.PAM")}
-              </Select.Option>
-              <Select.Option value="PAN">
-                {t("joblines.fields.part_types.PAN")}
-              </Select.Option>
-              <Select.Option value="PAO">
-                {t("joblines.fields.part_types.PAO")}
-              </Select.Option>
-              <Select.Option value="PAR">
-                {t("joblines.fields.part_types.PAR")}
-              </Select.Option>
-              <Select.Option value="PAS">
-                {t("joblines.fields.part_types.PAS")}
-              </Select.Option>
-            </Select>
-          </Form.Item>
           <Form.Item label={t("joblines.fields.mod_lbr_ty")} name="mod_lbr_ty">
             <Select allowClear>
               <Select.Option value="LAA">
@@ -135,8 +101,6 @@ export default function JobLinesUpsertModalComponent({
               </Select.Option>
             </Select>
           </Form.Item>
-        </LayoutFormRow>
-        <LayoutFormRow grow>
           <Form.Item
             label={t("joblines.fields.op_code_desc")}
             name="op_code_desc"
@@ -162,7 +126,41 @@ export default function JobLinesUpsertModalComponent({
             <InputCurrency />
           </Form.Item>
         </LayoutFormRow>
-        <LayoutFormRow grow>
+        <LayoutFormRow>
+          <Form.Item label={t("joblines.fields.part_type")} name="part_type">
+            <Select allowClear>
+              <Select.Option value="PAA">
+                {t("joblines.fields.part_types.PAA")}
+              </Select.Option>
+              <Select.Option value="PAC">
+                {t("joblines.fields.part_types.PAC")}
+              </Select.Option>
+              <Select.Option value="PAE">
+                {t("joblines.fields.part_types.PAE")}
+              </Select.Option>
+              <Select.Option value="PAL">
+                {t("joblines.fields.part_types.PAL")}
+              </Select.Option>
+              <Select.Option value="PAM">
+                {t("joblines.fields.part_types.PAM")}
+              </Select.Option>
+              <Select.Option value="PAN">
+                {t("joblines.fields.part_types.PAN")}
+              </Select.Option>
+              <Select.Option value="PAO">
+                {t("joblines.fields.part_types.PAO")}
+              </Select.Option>
+              <Select.Option value="PAR">
+                {t("joblines.fields.part_types.PAR")}
+              </Select.Option>
+              <Select.Option value="PAS">
+                {t("joblines.fields.part_types.PAS")}
+              </Select.Option>
+            </Select>
+          </Form.Item>
+          <Form.Item label={t("joblines.fields.oem_partno")} name="oem_partno">
+            <Input />
+          </Form.Item>
           <Form.Item
             label={t("joblines.fields.part_qty")}
             name="part_qty"