diff --git a/client/src/components/job-detail-lines/job-lines-expander.component.jsx b/client/src/components/job-detail-lines/job-lines-expander.component.jsx
index f90850222..9551db7a0 100644
--- a/client/src/components/job-detail-lines/job-lines-expander.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines-expander.component.jsx
@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client";
-import { Col, Divider, Row, Skeleton, Space, Timeline, Typography } from "antd";
+import { Col, Row, Skeleton, Timeline, Typography } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
@@ -43,13 +43,25 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
               ? data.parts_order_lines.map((line) => ({
                   key: line.id,
                   children: (
-                    <Space split={<Divider type="vertical" />} wrap>
-                      <Link to={`/manage/jobs/${jobid}?partsorderid=${line.parts_order.id}`}>
-                        {line.parts_order.order_number}
-                      </Link>
-                      <DateFormatter>{line.parts_order.order_date}</DateFormatter>
-                      {line.parts_order.vendor.name}
-                    </Space>
+                    <Row wrap>
+                      <Col span={4}>
+                        <Link to={`/manage/jobs/${jobid}?partsorderid=${line.parts_order.id}`}>
+                          {line.parts_order.order_number}
+                        </Link>
+                      </Col>
+                      <Col span={4}>
+                        <DateFormatter>{line.parts_order.order_date}</DateFormatter>
+                      </Col>
+                      <Col span={4}>{line.parts_order.vendor.name}</Col>
+                      {line.backordered_eta ? (
+                        <Col span={4}>
+                          <span>
+                            {`${t("parts_orders.fields.backordered_eta")}: `}
+                            <DateFormatter>{line.backordered_eta}</DateFormatter>
+                          </span>
+                        </Col>
+                      ) : null}
+                    </Row>
                   )
                 }))
               : [
@@ -61,6 +73,31 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
           }
         />{" "}
       </Col>
+      <Col md={24} lg={8}>
+        <Typography.Title level={4}>{t("parts_dispatch.labels.parts_dispatch")}</Typography.Title>
+        <Timeline
+          items={
+            data.parts_dispatch_lines.length > 0
+              ? data.parts_dispatch_lines.map((line) => ({
+                  key: line.id,
+                  children: (
+                    <Space split={<Divider type="vertical" />} wrap>
+                      <Link to={`/manage/jobs/${jobid}?partsorderid=${line.id}`}>{line.parts_dispatch.number}</Link>
+                      {bodyshop.employees.find((e) => e.id === line.parts_dispatch.employeeid)?.first_name}
+                      <Space>
+                        {t("parts_dispatch_lines.fields.accepted_at")}
+                        <DateFormatter>{line.accepted_at}</DateFormatter>
+                      </Space>
+                    </Space>
+                  )
+                }))
+              : {
+                  key: "dispatch-lines",
+                  children: t("parts_orders.labels.notyetordered")
+                }
+          }
+        />
+      </Col>
       <Col md={24} lg={8}>
         <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
         <Timeline
@@ -103,31 +140,6 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
           }
         />
       </Col>
-      <Col md={24} lg={8}>
-        <Typography.Title level={4}>{t("parts_dispatch.labels.parts_dispatch")}</Typography.Title>
-        <Timeline
-          items={
-            data.parts_dispatch_lines.length > 0
-              ? data.parts_dispatch_lines.map((line) => ({
-                  key: line.id,
-                  children: (
-                    <Space split={<Divider type="vertical" />} wrap>
-                      <Link to={`/manage/jobs/${jobid}?partsorderid=${line.id}`}>{line.parts_dispatch.number}</Link>
-                      {bodyshop.employees.find((e) => e.id === line.parts_dispatch.employeeid)?.first_name}
-                      <Space>
-                        {t("parts_dispatch_lines.fields.accepted_at")}
-                        <DateFormatter>{line.accepted_at}</DateFormatter>
-                      </Space>
-                    </Space>
-                  )
-                }))
-              : {
-                  key: "dispatch-lines",
-                  children: t("parts_orders.labels.notyetordered")
-                }
-          }
-        />
-      </Col>
     </Row>
   );
 }
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 946b29bad..86ab18aac 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
@@ -182,7 +182,7 @@ export function PartsOrderModalComponent({ bodyshop, vendorList, sendTypeState,
                           }
                         ]}
                       >
-                        <InputNumber />
+                        <InputNumber min={1} />
                       </Form.Item>
                       <Form.Item
                         label={t("parts_orders.fields.act_price")}
diff --git a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx
index 7acbd6668..fd0d6cb2f 100644
--- a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx
+++ b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx
@@ -59,25 +59,33 @@ export function ScheduleCalendarHeaderComponent({
           {loadData && loadData.allJobsOut ? (
             loadData.allJobsOut.map((j) => (
               <tr key={j.id}>
-                <td>
-                  <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link>
+                <td style={{ padding: "2.5px" }}>
+                  <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link> (
+                  {j.status})
                 </td>
-                <td>
+                <td style={{ padding: "2.5px" }}>
                   <OwnerNameDisplay ownerObject={j} />
                 </td>
-                <td>
-                  {`(${(j.labhrs.aggregate.sum.mod_lb_hrs + j.larhrs.aggregate.sum.mod_lb_hrs).toFixed(
+                <td style={{ padding: "2.5px" }}>
+                  {`(${j.labhrs.aggregate.sum.mod_lb_hrs.toFixed(
                     1
-                  )} ${t("general.labels.hours")})`}
+                  )}/${j.larhrs.aggregate.sum.mod_lb_hrs.toFixed(1)}/${(
+                    j.labhrs.aggregate.sum.mod_lb_hrs +
+                    j.larhrs.aggregate.sum.mod_lb_hrs
+                  ).toFixed(1)} ${t("general.labels.hours")})`}
                 </td>
-                <td>
-                  <DateTimeFormatter>{j.scheduled_completion}</DateTimeFormatter>
+                <td style={{ padding: "2.5px" }}>
+                  <DateTimeFormatter>
+                    {j.scheduled_completion}
+                  </DateTimeFormatter>
                 </td>
               </tr>
             ))
           ) : (
             <tr>
-              <td>{t("appointments.labels.nocompletingjobs")}</td>
+              <td style={{ padding: "2.5px" }}>
+                {t("appointments.labels.nocompletingjobs")}
+              </td>
             </tr>
           )}
         </tbody>
@@ -92,26 +100,30 @@ export function ScheduleCalendarHeaderComponent({
           {loadData && loadData.allJobsIn ? (
             loadData.allJobsIn.map((j) => (
               <tr key={j.id}>
-                <td>
+                <td style={{ padding: "2.5px" }}>
                   <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link>
-                  {j.status}
                 </td>
-                <td>
+                <td style={{ padding: "2.5px" }}>
                   <OwnerNameDisplay ownerObject={j} />
                 </td>
-                <td>
-                  {`(${(j.labhrs.aggregate.sum.mod_lb_hrs + j.larhrs.aggregate.sum.mod_lb_hrs).toFixed(
+                <td style={{ padding: "2.5px" }}>
+                  {`(${j.labhrs.aggregate.sum.mod_lb_hrs.toFixed(
                     1
-                  )} ${t("general.labels.hours")})`}
+                  )}/${j.larhrs.aggregate.sum.mod_lb_hrs.toFixed(1)}/${(
+                    j.labhrs.aggregate.sum.mod_lb_hrs +
+                    j.larhrs.aggregate.sum.mod_lb_hrs
+                  ).toFixed(1)} ${t("general.labels.hours")})`}
                 </td>
-                <td>
+                <td style={{ padding: "2.5px" }}>
                   <DateTimeFormatter>{j.scheduled_in}</DateTimeFormatter>
                 </td>
               </tr>
             ))
           ) : (
             <tr>
-              <td>{t("appointments.labels.noarrivingjobs")}</td>
+              <td style={{ padding: "2.5px" }}>
+                {t("appointments.labels.noarrivingjobs")}
+              </td>
             </tr>
           )}
         </tbody>
@@ -121,27 +133,33 @@ export function ScheduleCalendarHeaderComponent({
 
   const LoadComponent = loadData ? (
     <div>
-      <Space align="center">
-        <Popover
-          placement={"bottom"}
-          content={jobsInPopup}
-          trigger="hover"
-          title={t("appointments.labels.arrivingjobs")}
-        >
-          <Icon component={MdFileDownload} style={{ color: "green" }} />
-          {(loadData.allHoursIn || 0) && loadData.allHoursIn.toFixed(2)}
-        </Popover>
-        <Popover
-          placement={"bottom"}
-          content={jobsOutPopup}
-          trigger="hover"
-          title={t("appointments.labels.completingjobs")}
-        >
-          <Icon component={MdFileUpload} style={{ color: "red" }} />
-          {(loadData.allHoursOut || 0) && loadData.allHoursOut.toFixed(2)}
-        </Popover>
-        <ScheduleCalendarHeaderGraph loadData={loadData} />
-      </Space>
+        <Space align="center">
+          <Popover
+            placement={"bottom"}
+            content={jobsInPopup}
+            trigger="hover"
+            title={t("appointments.labels.arrivingjobs")}
+          >
+            <Icon component={MdFileDownload} style={{ color: "green" }} />
+            {(loadData.allHoursInBody || 0) &&
+              loadData.allHoursInBody.toFixed(1)}
+            /
+            {(loadData.allHoursInRefinish || 0) &&
+              loadData.allHoursInRefinish.toFixed(1)}
+            /{(loadData.allHoursIn || 0) && loadData.allHoursIn.toFixed(1)}
+          </Popover>
+          <Popover
+            placement={"bottom"}
+            content={jobsOutPopup}
+            trigger="hover"
+            title={t("appointments.labels.completingjobs")}
+          >
+            <Icon component={MdFileUpload} style={{ color: "red" }} />
+            {(loadData.allHoursOut || 0) && loadData.allHoursOut.toFixed(1)}
+          </Popover>
+          <ScheduleCalendarHeaderGraph loadData={loadData} />
+        </Space>
+   
       <div>
         <ul style={{ listStyleType: "none", columns: "2 auto", padding: 0 }}>
           {Object.keys(ATSToday).map((key, idx) => (
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 52a14bb61..ed0415b0a 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -2238,6 +2238,8 @@ export const GET_JOB_LINE_ORDERS = gql`
     parts_order_lines(where: { job_line_id: { _eq: $joblineid } }) {
       id
       act_price
+      backordered_eta
+      backordered_on
       parts_order {
         id
         order_date
diff --git a/client/src/redux/application/application.sagas.js b/client/src/redux/application/application.sagas.js
index 3aca6fa5d..a07c5a244 100644
--- a/client/src/redux/application/application.sagas.js
+++ b/client/src/redux/application/application.sagas.js
@@ -111,7 +111,12 @@ export function* calculateScheduleLoad({ payload: end }) {
           (load[itemDate].allHoursIn || 0) +
           item.labhrs.aggregate.sum.mod_lb_hrs +
           item.larhrs.aggregate.sum.mod_lb_hrs;
-
+        load[itemDate].allHoursInBody =
+          (load[itemDate].allHoursInBody || 0) +
+          item.labhrs.aggregate.sum.mod_lb_hrs;
+        load[itemDate].allHoursInRefinish =
+          (load[itemDate].allHoursInRefinish || 0) +
+          item.larhrs.aggregate.sum.mod_lb_hrs;
         //If the job hasn't already arrived, add it to the jobs in list.
         // Make sure it also hasn't already been completed, or isn't an in and out job.
         //This prevents the duplicate counting.
@@ -119,7 +124,15 @@ export function* calculateScheduleLoad({ payload: end }) {
         if (AddJobForSchedulingCalc) {
           load[itemDate].jobsIn.push(item);
           load[itemDate].hoursIn =
-            (load[itemDate].hoursIn || 0) + item.labhrs.aggregate.sum.mod_lb_hrs + item.larhrs.aggregate.sum.mod_lb_hrs;
+            (load[itemDate].hoursIn || 0) +
+            item.labhrs.aggregate.sum.mod_lb_hrs +
+            item.larhrs.aggregate.sum.mod_lb_hrs;
+          load[itemDate].hoursInBody =
+            (load[itemDate].hoursInBody || 0) +
+            item.labhrs.aggregate.sum.mod_lb_hrs;
+          load[itemDate].hoursInRefinish =
+            (load[itemDate].hoursInRefinish || 0) +
+            item.larhrs.aggregate.sum.mod_lb_hrs;
         }
       } else {
         load[itemDate] = {
@@ -127,10 +140,21 @@ export function* calculateScheduleLoad({ payload: end }) {
           jobsIn: AddJobForSchedulingCalc ? [item] : [], //Same as above, only add it if it isn't already in production.
           jobsOut: [],
           allJobsOut: [],
-          allHoursIn: item.labhrs.aggregate.sum.mod_lb_hrs + item.larhrs.aggregate.sum.mod_lb_hrs,
+          allHoursIn:
+            item.labhrs.aggregate.sum.mod_lb_hrs +
+            item.larhrs.aggregate.sum.mod_lb_hrs,
+          allHoursInBody: item.labhrs.aggregate.sum.mod_lb_hrs,
+          allHoursInRefinish: item.larhrs.aggregate.sum.mod_lb_hrs,
           hoursIn: AddJobForSchedulingCalc
-            ? item.labhrs.aggregate.sum.mod_lb_hrs + item.larhrs.aggregate.sum.mod_lb_hrs
-            : 0
+            ? item.labhrs.aggregate.sum.mod_lb_hrs +
+              item.larhrs.aggregate.sum.mod_lb_hrs
+            : 0,
+          hoursInBody: AddJobForSchedulingCalc
+            ? item.labhrs.aggregate.sum.mod_lb_hrs
+            : 0,
+          hoursInRefinish: AddJobForSchedulingCalc
+            ? item.larhrs.aggregate.sum.mod_lb_hrs
+            : 0,
         };
       }
     });
@@ -151,6 +175,12 @@ export function* calculateScheduleLoad({ payload: end }) {
           (load[itemDate].allHoursOut || 0) +
           item.labhrs.aggregate.sum.mod_lb_hrs +
           item.larhrs.aggregate.sum.mod_lb_hrs;
+        load[itemDate].allHoursOutBody =
+          (load[itemDate].allHoursOutBody || 0) +
+          item.labhrs.aggregate.sum.mod_lb_hrs;
+        load[itemDate].allHoursOutRefinish =
+          (load[itemDate].allHoursOutRefinish || 0) +
+          item.larhrs.aggregate.sum.mod_lb_hrs;
         //Add only the jobs that are still in production to get rid of.
         //If it's not in production, we'd subtract unnecessarily.
         load[itemDate].allJobsOut.push(item);
@@ -161,6 +191,12 @@ export function* calculateScheduleLoad({ payload: end }) {
             (load[itemDate].hoursOut || 0) +
             item.labhrs.aggregate.sum.mod_lb_hrs +
             item.larhrs.aggregate.sum.mod_lb_hrs;
+          load[itemDate].hoursOutBody =
+            (load[itemDate].hoursOutBody || 0) +
+            item.labhrs.aggregate.sum.mod_lb_hrs;
+          load[itemDate].hoursOutRefinish =
+            (load[itemDate].hoursOutRefinish || 0) +
+            item.larhrs.aggregate.sum.mod_lb_hrs;
         }
       } else {
         load[itemDate] = {
@@ -169,7 +205,11 @@ export function* calculateScheduleLoad({ payload: end }) {
           hoursOut: AddJobForSchedulingCalc
             ? item.labhrs.aggregate.sum.mod_lb_hrs + item.larhrs.aggregate.sum.mod_lb_hrs
             : 0,
-          allHoursOut: item.labhrs.aggregate.sum.mod_lb_hrs + item.larhrs.aggregate.sum.mod_lb_hrs
+          allHoursOut:
+            item.labhrs.aggregate.sum.mod_lb_hrs +
+            item.larhrs.aggregate.sum.mod_lb_hrs,
+          allHoursOutBody: item.labhrs.aggregate.sum.mod_lb_hrs,
+          allHoursOutRefinish: item.larhrs.aggregate.sum.mod_lb_hrs,
         };
       }
     });