diff --git a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
index 682e19f94..b698a179f 100644
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -1,5 +1,5 @@
 import { useApolloClient, useMutation } from "@apollo/client";
-import { Button, Form, Modal, notification } from "antd";
+import { Button, Form, Modal, notification, Space } from "antd";
 import _ from "lodash";
 import React, { useEffect, useState, useMemo } from "react";
 import { useTranslation } from "react-i18next";
@@ -227,7 +227,7 @@ function BillEnterModalContainer({
       onCancel={handleCancel}
       afterClose={() => form.resetFields()}
       footer={
-        <span>
+        <Space>
           <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
           <Button loading={loading} onClick={() => form.submit()}>
             {t("general.actions.save")}
@@ -243,7 +243,7 @@ function BillEnterModalContainer({
               {t("general.actions.saveandnew")}
             </Button>
           )}
-        </span>
+        </Space>
       }
       destroyOnClose
     >
@@ -255,7 +255,6 @@ function BillEnterModalContainer({
         onFinishFailed={() => {
           setEnterAgain(false);
         }}
-        // initialValues={formValues}
       >
         <BillFormContainer
           form={form}
diff --git a/client/src/components/bill-form/bill-form.lines.component.jsx b/client/src/components/bill-form/bill-form.lines.component.jsx
index ffe6a45e5..9c6f7af3f 100644
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -497,6 +497,7 @@ const EditableCell = ({
         <Space size="small">
           <Form.Item
             name={dataIndex}
+            labelCol={{ span: 0 }}
             {...(formItemProps && formItemProps(record))}
           >
             {(formInput && formInput(record, record.key)) || children}
diff --git a/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx b/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx
index 98a6ebf9c..a1fcff8b7 100644
--- a/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx
+++ b/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx
@@ -20,7 +20,7 @@ const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("courtesyCarReturn")),
 });
 
-export function BillEnterModalContainer({
+export function CCReturnModalContainer({
   courtesyCarReturnModal,
   toggleModalVisible,
   bodyshop,
@@ -85,4 +85,4 @@ export function BillEnterModalContainer({
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(BillEnterModalContainer);
+)(CCReturnModalContainer);
diff --git a/client/src/components/job-search-select/job-search-select.component.jsx b/client/src/components/job-search-select/job-search-select.component.jsx
index 36782ded0..c3d297637 100644
--- a/client/src/components/job-search-select/job-search-select.component.jsx
+++ b/client/src/components/job-search-select/job-search-select.component.jsx
@@ -36,10 +36,8 @@ const JobSearchSelect = (
     }
   );
 
-  const [
-    callIdSearch,
-    { loading: idLoading, error: idError, data: idData },
-  ] = useLazyQuery(SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE);
+  const [callIdSearch, { loading: idLoading, error: idError, data: idData }] =
+    useLazyQuery(SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE);
 
   const executeSearch = (v) => {
     callSearch(v);
@@ -63,6 +61,7 @@ const JobSearchSelect = (
     ],
     "id"
   );
+  console.log("restProps", restProps);
 
   return (
     <div>
@@ -81,7 +80,7 @@ const JobSearchSelect = (
       >
         {theOptions
           ? theOptions.map((o) => (
-              <Option key={o.id} value={o.id}>
+              <Option key={o.id} value={o.id} status={o.status}>
                 {`${clm_no ? `${o.clm_no} | ` : ""}${
                   o.ro_number || t("general.labels.na")
                 } | ${o.ownr_ln || ""} ${o.ownr_fn || ""} ${
diff --git a/client/src/components/payment-modal/payment-modal.container.jsx b/client/src/components/payment-modal/payment-modal.container.jsx
index e96dc28cd..e91e16d19 100644
--- a/client/src/components/payment-modal/payment-modal.container.jsx
+++ b/client/src/components/payment-modal/payment-modal.container.jsx
@@ -33,7 +33,7 @@ const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("payment")),
 });
 
-function BillEnterModalContainer({
+function PaymentModalContainer({
   paymentModal,
   toggleModalVisible,
   bodyshop,
@@ -237,7 +237,7 @@ function BillEnterModalContainer({
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(BillEnterModalContainer);
+)(PaymentModalContainer);
 
 // const pr = stripe.paymentRequest({
 //   country: "CA",
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 961b5fe80..0f1d23141 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -1039,6 +1039,7 @@ export const SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE = gql`
       v_make_desc
       v_model_desc
       v_model_yr
+      status
     }
   }
 `;