diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx
index 8dfa60132..291c02305 100644
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -431,7 +431,12 @@ export function JobLinesComponent({
                 </Space>
               </Tag>
             )}
-            <JobLineDispatchButton selectedLines={selectedLines} setSelectedLines={setSelectedLines} job={job} />
+            <JobLineDispatchButton
+              selectedLines={selectedLines}
+              setSelectedLines={setSelectedLines}
+              job={job}
+              disabled={technician}
+            />
             {Enhanced_Payroll.treatment === "on" && (
               <JobLineBulkAssignComponent selectedLines={selectedLines} setSelectedLines={setSelectedLines} job={job} />
             )}
diff --git a/client/src/components/job-lifecycle/job-lifecycle.component.jsx b/client/src/components/job-lifecycle/job-lifecycle.component.jsx
index 37eec2572..794524c2a 100644
--- a/client/src/components/job-lifecycle/job-lifecycle.component.jsx
+++ b/client/src/components/job-lifecycle/job-lifecycle.component.jsx
@@ -224,7 +224,7 @@ export function JobLifecycleComponent({ job, statuses, ...rest }) {
                           <span style={{ fontWeight: "bold" }}>
                             {t("job_lifecycle.content.current_status_accumulated_time")} (
                             {lifecycleData.lifecycle[0].value}):
-                          </span>{" "}
+                          </span>
                           {lifecycleData.durations.totalCurrentStatusDuration.humanReadable}
                         </li>
                       )}
@@ -250,6 +250,7 @@ export function JobLifecycleComponent({ job, statuses, ...rest }) {
                 }}
                 columns={columns}
                 dataSource={lifecycleData.lifecycle}
+                rowKey="start"
               />
             </Card>
           </Space>
diff --git a/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx b/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx
index 9331cf4d7..8e570ab2d 100644
--- a/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx
+++ b/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx
@@ -29,7 +29,8 @@ export function JobLineDispatchButton({
   bodyshop,
   jobRO,
   job,
-  currentUser
+  currentUser,
+  disabled
 }) {
   const [visible, setVisible] = useState(false);
   const [loading, setLoading] = useState(false);
@@ -137,7 +138,7 @@ export function JobLineDispatchButton({
 
   return (
     <Popover open={visible} content={popMenu}>
-      <Button disabled={selectedLines.length === 0 || jobRO} loading={loading} onClick={() => setVisible(true)}>
+      <Button disabled={selectedLines.length === 0 || jobRO || disabled} loading={loading} onClick={() => setVisible(true)}>
         {t("joblines.actions.dispatchparts", { count: selectedLines.length })}
       </Button>
     </Popover>
diff --git a/client/src/components/parts-queue-list/parts-queue.list.component.jsx b/client/src/components/parts-queue-list/parts-queue.list.component.jsx
index e3363409a..5b9082500 100644
--- a/client/src/components/parts-queue-list/parts-queue.list.component.jsx
+++ b/client/src/components/parts-queue-list/parts-queue.list.component.jsx
@@ -306,7 +306,7 @@ export function PartsQueueListComponent({ bodyshop }) {
         onRow={(record, rowIndex) => {
           return {
             onClick: (event) => {
-              handleOnRowClick(record);
+           //   handleOnRowClick(record);
             }
           };
         }}