diff --git a/client/src/components/breadcrumbs/breadcrumbs.component.jsx b/client/src/components/breadcrumbs/breadcrumbs.component.jsx
index ee0d51bf6..899478183 100644
--- a/client/src/components/breadcrumbs/breadcrumbs.component.jsx
+++ b/client/src/components/breadcrumbs/breadcrumbs.component.jsx
@@ -18,24 +18,39 @@ export function BreadCrumbs({ breadcrumbs, bodyshop }) {
   return (
     <Row className="breadcrumb-container">
       <Col xs={24} sm={24} md={16}>
-        <Breadcrumb separator=">">
-          <Breadcrumb.Item>
-            <Link to={`/manage`}>
-              <HomeFilled />{" "}
-              {(bodyshop && bodyshop.shopname && `(${bodyshop.shopname})`) ||
-                ""}
-            </Link>
-          </Breadcrumb.Item>
-          {breadcrumbs.map((item) =>
-            item.link ? (
-              <Breadcrumb.Item key={item.label}>
-                <Link to={item.link}>{item.label} </Link>
-              </Breadcrumb.Item>
-            ) : (
-              <Breadcrumb.Item key={item.label}>{item.label}</Breadcrumb.Item>
-            )
-          )}
-        </Breadcrumb>
+        <Breadcrumb
+          separator=">"
+          items={[
+            {
+              title: (
+                <Link to={`/manage`}>
+                  <HomeFilled />{" "}
+                  {(bodyshop &&
+                    bodyshop.shopname &&
+                    `(${bodyshop.shopname})`) ||
+                    ""}
+                </Link>
+              ),
+            },
+            ...breadcrumbs.map((item) =>
+              item.link
+                ? {
+                    title: (
+                      <Link key={item.label} to={item.link}>
+                        {item.label}{" "}
+                      </Link>
+                    ),
+                  }
+                : {
+                    title: (
+                      <React.Fragment key={item.label}>
+                        {item.label}
+                      </React.Fragment>
+                    ),
+                  }
+            ),
+          ]}
+        ></Breadcrumb>
       </Col>
       <Col xs={24} sm={24} md={8}>
         <GlobalSearch />
diff --git a/client/src/components/dashboard-grid/dashboard-grid.component.jsx b/client/src/components/dashboard-grid/dashboard-grid.component.jsx
index d7b661d54..a24bfd314 100644
--- a/client/src/components/dashboard-grid/dashboard-grid.component.jsx
+++ b/client/src/components/dashboard-grid/dashboard-grid.component.jsx
@@ -1,6 +1,6 @@
 import Icon, { SyncOutlined } from "@ant-design/icons";
 import { gql, useMutation, useQuery } from "@apollo/client";
-import { PageHeader } from '@ant-design/pro-layout';
+import { PageHeader } from "@ant-design/pro-layout";
 import { Button, Dropdown, Menu, notification, Space } from "antd";
 import i18next from "i18next";
 import _ from "lodash";
@@ -139,7 +139,7 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
             <Button onClick={() => refetch()}>
               <SyncOutlined />
             </Button>
-            <Dropdown overlay={addComponentOverlay} trigger={["click"]}>
+            <Dropdown menu={addComponentOverlay} trigger={["click"]}>
               <Button>{t("dashboard.actions.addcomponent")}</Button>
             </Dropdown>
           </Space>
diff --git a/client/src/components/email-overlay/email-overlay.component.jsx b/client/src/components/email-overlay/email-overlay.component.jsx
index a302f5bb4..45249f2d1 100644
--- a/client/src/components/email-overlay/email-overlay.component.jsx
+++ b/client/src/components/email-overlay/email-overlay.component.jsx
@@ -104,7 +104,7 @@ export function EmailOverlayComponent({
         label={
           <Space>
             {t("emails.fields.to")}
-            <Dropdown overlay={menu}>
+            <Dropdown menu={menu}>
               <a
                 className="ant-dropdown-link"
                 href=" #"
diff --git a/client/src/components/jobs-available-table/jobs-available-table.container.jsx b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
index d632324b5..e4ea8d249 100644
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -3,7 +3,7 @@ import {
   useApolloClient,
   useLazyQuery,
   useMutation,
-  useQuery
+  useQuery,
 } from "@apollo/client";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import { Col, notification, Row } from "antd";
@@ -20,7 +20,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
   DELETE_AVAILABLE_JOB,
   QUERY_AVAILABLE_JOBS,
-  QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK
+  QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK,
 } from "../../graphql/available-jobs.queries";
 import { INSERT_NEW_JOB, UPDATE_JOB } from "../../graphql/jobs.queries";
 import { INSERT_NEW_NOTE } from "../../graphql/notes.queries";
@@ -28,7 +28,7 @@ import { SEARCH_VEHICLE_BY_VIN } from "../../graphql/vehicles.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
   selectBodyshop,
-  selectCurrentUser
+  selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import confirmDialog from "../../utils/asyncConfirm";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
@@ -363,7 +363,7 @@ export function JobsAvailableContainer({
         owner={owner}
         selectedOwner={selectedOwner}
         setSelectedOwner={setSelectedOwner}
-        visible={ownerModalVisible}
+        open={ownerModalVisible}
         onOk={onOwnerFindModalOk}
         onCancel={onOwnerModalCancel}
       />
@@ -373,7 +373,7 @@ export function JobsAvailableContainer({
         selectedJob={selectedJob}
         setSelectedJob={setSelectedJob}
         importOptionsState={importOptionsState}
-        visible={jobModalVisible}
+        open={jobModalVisible}
         onOk={onJobFindModalOk}
         onCancel={onJobModalCancel}
         modalSearchState={modalSearchState}
diff --git a/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx b/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx
index 7bb3591cb..2698efdeb 100644
--- a/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx
+++ b/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx
@@ -32,7 +32,7 @@ export default connect(
     variables: {
       statuses: bodyshop.md_ro_statuses.active_statuses || ["Open"],
     },
-    skip: !modalProps.visible,
+    skip: !modalProps.open,
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
   });
diff --git a/client/src/components/owner-find-modal/owner-find-modal.container.jsx b/client/src/components/owner-find-modal/owner-find-modal.container.jsx
index 9f1397ba1..04e4f3bf2 100644
--- a/client/src/components/owner-find-modal/owner-find-modal.container.jsx
+++ b/client/src/components/owner-find-modal/owner-find-modal.container.jsx
@@ -30,13 +30,13 @@ export default function OwnerFindModalContainer({
   );
 
   useEffect(() => {
-    if (modalProps.visible && owner) {
+    if (modalProps.open && owner) {
       const s = OwnerNameDisplayFunction(owner, true);
 
       setSearchText(s.trim());
       callSearchowners({ variables: { search: s.trim() } });
     }
-  }, [callSearchowners, modalProps.visible, owner]);
+  }, [callSearchowners, modalProps.open, owner]);
 
   return (
     <Modal
diff --git a/client/src/components/parts-order-modal/parts-order-modal-price-change.component.jsx b/client/src/components/parts-order-modal/parts-order-modal-price-change.component.jsx
index d38240155..d500fc859 100644
--- a/client/src/components/parts-order-modal/parts-order-modal-price-change.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal-price-change.component.jsx
@@ -87,7 +87,7 @@ export default function PartsOrderModalPriceChange({ form, field }) {
     />
   );
   return (
-    <Dropdown overlay={menu} trigger="click">
+    <Dropdown menu={menu} trigger="click">
       <Space>
         %
         <DownOutlined />
diff --git a/client/src/components/production-list-columns/production-list-columns.date.component.jsx b/client/src/components/production-list-columns/production-list-columns.date.component.jsx
index 5e2ed948d..a734484d6 100644
--- a/client/src/components/production-list-columns/production-list-columns.date.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.date.component.jsx
@@ -56,7 +56,7 @@ export default function ProductionListDate({
       style={{
         height: "19px",
       }}
-      overlay={
+      menu={
         <Card style={{ padding: "1rem" }} onClick={(e) => e.stopPropagation()}>
           <FormDatePicker
             onClick={(e) => e.stopPropagation()}
diff --git a/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx b/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx
index 6f4bd5668..416b62550 100644
--- a/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx
@@ -97,7 +97,7 @@ export function ProductionLastContacted({ currentUser, record }) {
         style={{
           height: "19px",
         }}
-        overlay={
+        menu={
           <Card
             style={{ padding: "1rem" }}
             onClick={(e) => e.stopPropagation()}
diff --git a/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx b/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
index abc6e4a7c..2480251ae 100644
--- a/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
+++ b/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
@@ -90,7 +90,7 @@ export default function ScoreboardEntryEdit({ entry }) {
 
   return (
     <div>
-      <Dropdown open={visible} overlay={popContent}>
+      <Dropdown open={visible} menu={popContent}>
         <Button
           onClick={(e) => {
             e.stopPropagation();
diff --git a/client/src/components/shop-template-add/shop-template-add.component.jsx b/client/src/components/shop-template-add/shop-template-add.component.jsx
index 5fb45635a..e983a32f8 100644
--- a/client/src/components/shop-template-add/shop-template-add.component.jsx
+++ b/client/src/components/shop-template-add/shop-template-add.component.jsx
@@ -81,7 +81,7 @@ export function ShopTemplateAddComponent({
   );
 
   return (
-    <Dropdown overlay={menu}>
+    <Dropdown menu={menu}>
       <span>
         {t("bodyshop.actions.addtemplate")} <DownOutlined />
       </span>
diff --git a/client/src/components/ticket-tickets-dates-selector/time-tickets-dates-selector.component.jsx b/client/src/components/ticket-tickets-dates-selector/time-tickets-dates-selector.component.jsx
index a827e3fd7..d30779b27 100644
--- a/client/src/components/ticket-tickets-dates-selector/time-tickets-dates-selector.component.jsx
+++ b/client/src/components/ticket-tickets-dates-selector/time-tickets-dates-selector.component.jsx
@@ -41,7 +41,7 @@ export default function TimeTicketsDatesSelector() {
         end ? moment(end) : moment().endOf("week"),
       ]}
       format="MM/DD/YYYY"
-      ranges={DatePickerRanges}
+      presets={DatePickerRanges}
       onCalendarChange={handleChange}
     />
   );
diff --git a/client/src/pages/jobs-create/jobs-create.component.jsx b/client/src/pages/jobs-create/jobs-create.component.jsx
index d40ce89ef..e1ab48a74 100644
--- a/client/src/pages/jobs-create/jobs-create.component.jsx
+++ b/client/src/pages/jobs-create/jobs-create.component.jsx
@@ -1,4 +1,4 @@
-import { PageHeader } from '@ant-design/pro-layout';
+import { PageHeader } from "@ant-design/pro-layout";
 import { Button, Result, Space, Steps } from "antd";
 import React, { useContext, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -19,16 +19,11 @@ export default function JobsCreateComponent({ form }) {
     {
       title: t("jobs.labels.create.vehicleinfo"),
       content: <JobsCreateVehicleInfoContainer form={form} />,
-      validation:
-        !!state.vehicle.new ||
-        !!state.vehicle.selectedid ||
-        !!state.vehicle.none,
       error: t("vehicles.errors.selectexistingornew"),
     },
     {
       title: t("jobs.labels.create.ownerinfo"),
       content: <JobsCreateOwnerInfoContainer />,
-      validation: !!state.owner.new || !!state.owner.selectedid,
       error: t("owners.errors.selectexistingornew"),
     },
     {
@@ -43,7 +38,6 @@ export default function JobsCreateComponent({ form }) {
   const prev = () => {
     setPageIndex(pageIndex - 1);
   };
-  const { Step } = Steps;
 
   const ProgressButtons = ({ top }) => {
     return (
@@ -80,31 +74,23 @@ export default function JobsCreateComponent({ form }) {
         }
       >
         {top && (
-          <Steps current={pageIndex}>
-            {steps.map((item, idx) => (
-              <Step
-                key={item.title}
-                title={item.title}
-                style={{
-                  cursor: "pointer",
-                  fontWeight: idx === pageIndex && "bolder",
-                }}
-                onClick={() => {
-                  form
-                    .validateFields()
-                    .then((r) => {
-                      if (steps[pageIndex].validation) {
-                        setErrorMessage(null);
-                        setPageIndex(idx);
-                      } else {
-                        setErrorMessage(steps[pageIndex].error);
-                      }
-                    })
-                    .catch((error) => console.log("error", error));
-                }}
-              />
-            ))}
-          </Steps>
+          <Steps
+            current={pageIndex}
+            onChange={(idx) => {
+              form
+                .validateFields()
+                .then((r) => {
+                  if (steps[pageIndex].validation) {
+                    setErrorMessage(null);
+                    setPageIndex(idx);
+                  } else {
+                    setErrorMessage(steps[pageIndex].error);
+                  }
+                })
+                .catch((error) => console.log("error", error));
+            }}
+            items={steps}
+          />
         )}
       </PageHeader>
     );
diff --git a/client/src/pages/scoreboard/scoreboard.page.container.jsx b/client/src/pages/scoreboard/scoreboard.page.container.jsx
index ac35b6885..e19538534 100644
--- a/client/src/pages/scoreboard/scoreboard.page.container.jsx
+++ b/client/src/pages/scoreboard/scoreboard.page.container.jsx
@@ -54,32 +54,29 @@ export function ScoreboardContainer({ setBreadcrumbs, setSelectedHeader }) {
               search: queryString.stringify(searchParams),
             });
           }}
-        >
-          <Tabs.TabPane
-            tab={
-              <span>
-                <Icon component={FaShieldAlt} />
-                {t("scoreboard.labels.jobs")}
-              </span>
-            }
-            destroyInactiveTabPane
-            key="sb"
-          >
-            <ScoreboardDisplay />
-          </Tabs.TabPane>
-          <Tabs.TabPane
-            tab={
-              <span>
-                <FieldTimeOutlined />
-                {t("scoreboard.labels.timetickets")}
-              </span>
-            }
-            destroyInactiveTabPane
-            key="tickets"
-          >
-            <ScoreboardTimeTickets />
-          </Tabs.TabPane>
-        </Tabs>
+          items={[
+            {
+              key: "sb",
+              label: (
+                <span>
+                  <Icon component={FaShieldAlt} />
+                  {t("scoreboard.labels.jobs")}
+                </span>
+              ),
+              children: <ScoreboardDisplay />,
+            },
+            {
+              key: "tickets",
+              label: (
+                <span>
+                  <FieldTimeOutlined />
+                  {t("scoreboard.labels.timetickets")}
+                </span>
+              ),
+              children: <ScoreboardTimeTickets />,
+            },
+          ]}
+        ></Tabs>
       </RbacWrapper>
     </FeatureWrapper>
   );