diff --git a/client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx b/client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx
index 27fd2304b..8fbee411c 100644
--- a/client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx
+++ b/client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx
@@ -10,9 +10,12 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
+
+export const DEFAULT_COL_LAYOUT = { xs: 24, sm: 24, md: 8, lg: 4, xl: 4, xxl: 4 };
+
 export default connect(mapStateToProps, mapDispatchToProps)(JobPartsQueueCount);
 
-export function JobPartsQueueCount({ bodyshop, parts, style }) {
+export function JobPartsQueueCount({ bodyshop, parts, defaultColLayout = DEFAULT_COL_LAYOUT }) {
   const partsStatus = useMemo(() => {
     if (!parts) return null;
     return parts.reduce(
@@ -35,35 +38,34 @@ export function JobPartsQueueCount({ bodyshop, parts, style }) {
   }, [bodyshop, parts]);
 
   if (!parts) return null;
-
   return (
-    <Row style={style}>
-      <Col span={4}>
+    <Row>
+      <Col {...defaultColLayout}>
         <Tooltip title="Total">
           <Tag>{partsStatus.total}</Tag>
         </Tooltip>
       </Col>
-      <Col span={4}>
+      <Col {...defaultColLayout}>
         <Tooltip title="No Status">
           <Tag color="gold">{partsStatus["null"]}</Tag>
         </Tooltip>
       </Col>
-      <Col span={4}>
+      <Col {...defaultColLayout}>
         <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
           <Tag color="blue">{partsStatus[bodyshop.md_order_statuses.default_ordered]}</Tag>
         </Tooltip>
       </Col>
-      <Col span={4}>
+      <Col {...defaultColLayout}>
         <Tooltip title={bodyshop.md_order_statuses.default_received}>
           <Tag color="green">{partsStatus[bodyshop.md_order_statuses.default_received]}</Tag>
         </Tooltip>
       </Col>
-      <Col span={4}>
+      <Col {...defaultColLayout}>
         <Tooltip title={bodyshop.md_order_statuses.default_returned}>
           <Tag color="orange">{partsStatus[bodyshop.md_order_statuses.default_returned]}</Tag>
         </Tooltip>
       </Col>
-      <Col span={4}>
+      <Col {...defaultColLayout}>
         <Tooltip title={bodyshop.md_order_statuses.default_bo}>
           <Tag color="red">{partsStatus[bodyshop.md_order_statuses.default_bo]}</Tag>
         </Tooltip>
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 2d404be5e..e325fe88a 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
@@ -233,7 +233,7 @@ export function PartsQueueListComponent({ bodyshop }) {
       title: t("jobs.fields.partsstatus"),
       dataIndex: "partsstatus",
       key: "partsstatus",
-      render: (text, record) => <JobPartsQueueCount style={{ minWidth: "10rem" }} parts={record.joblines_status} />
+      render: (text, record) => <JobPartsQueueCount parts={record.joblines_status} />
     },
     {
       title: t("jobs.fields.comment"),
diff --git a/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx b/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
index fe4a69c09..cfa2d2bfc 100644
--- a/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
+++ b/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
@@ -147,7 +147,7 @@ export function SimplifiedPartsJobsListComponent({
       title: t("jobs.fields.partsstatus"),
       dataIndex: "partsstatus",
       key: "partsstatus",
-      render: (text, record) => <JobPartsQueueCount style={{ minWidth: "10rem" }} parts={record.joblines_status} />
+      render: (text, record) => <JobPartsQueueCount parts={record.joblines_status} />
     },
     {
       title: t("jobs.fields.comment"),