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 7edadec39..22281c9a4 100644
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -42,7 +42,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.fields.jobline"),
         dataIndex: "joblineid",
         editable: true,
-        width: "10%",
+        width: "25%",
         formItemProps: (field) => {
           return {
             key: `${field.index}joblinename`,
@@ -88,6 +88,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.fields.line_desc"),
         dataIndex: "line_desc",
         editable: true,
+        width: "12%",
         formItemProps: (field) => {
           return {
             key: `${field.index}line_desc`,
@@ -239,46 +240,6 @@ export function BillEnterModalLinesComponent({
           </Select>
         ),
       },
-      {
-        title: t("billlines.fields.federal_tax_applicable"),
-        dataIndex: "applicable_taxes.federal",
-        editable: true,
-        formItemProps: (field) => {
-          return {
-            key: `${field.index}fedtax`,
-            valuePropName: "checked",
-            initialValue: true,
-            name: [field.name, "applicable_taxes", "federal"],
-          };
-        },
-        formInput: (record, index) => <Switch disabled={disabled} />,
-      },
-      {
-        title: t("billlines.fields.state_tax_applicable"),
-        dataIndex: "applicable_taxes.state",
-        editable: true,
-        formItemProps: (field) => {
-          return {
-            key: `${field.index}statetax`,
-            valuePropName: "checked",
-            name: [field.name, "applicable_taxes", "state"],
-          };
-        },
-        formInput: (record, index) => <Switch disabled={disabled} />,
-      },
-      {
-        title: t("billlines.fields.local_tax_applicable"),
-        dataIndex: "applicable_taxes.local",
-        editable: true,
-        formItemProps: (field) => {
-          return {
-            key: `${field.index}localtax`,
-            valuePropName: "checked",
-            name: [field.name, "applicable_taxes", "local"],
-          };
-        },
-        formInput: (record, index) => <Switch disabled={disabled} />,
-      },
 
       {
         title: t("billlines.fields.location"),
@@ -389,11 +350,54 @@ export function BillEnterModalLinesComponent({
                     </Form.Item>
                   </div>
                 );
-              return <span />;
+              return <></>;
             }}
           </Form.Item>
         ),
       },
+      {
+        title: t("billlines.fields.federal_tax_applicable"),
+        dataIndex: "applicable_taxes.federal",
+        editable: true,
+        width: "3rem",
+        formItemProps: (field) => {
+          return {
+            key: `${field.index}fedtax`,
+            valuePropName: "checked",
+            initialValue: true,
+            name: [field.name, "applicable_taxes", "federal"],
+          };
+        },
+        formInput: (record, index) => <Switch disabled={disabled} />,
+      },
+      {
+        title: t("billlines.fields.state_tax_applicable"),
+        dataIndex: "applicable_taxes.state",
+        editable: true,
+        width: "3rem",
+        formItemProps: (field) => {
+          return {
+            key: `${field.index}statetax`,
+            valuePropName: "checked",
+            name: [field.name, "applicable_taxes", "state"],
+          };
+        },
+        formInput: (record, index) => <Switch disabled={disabled} />,
+      },
+      {
+        title: t("billlines.fields.local_tax_applicable"),
+        dataIndex: "applicable_taxes.local",
+        editable: true,
+        width: "3rem",
+        formItemProps: (field) => {
+          return {
+            key: `${field.index}localtax`,
+            valuePropName: "checked",
+            name: [field.name, "applicable_taxes", "local"],
+          };
+        },
+        formInput: (record, index) => <Switch disabled={disabled} />,
+      },
       {
         title: t("general.labels.actions"),
 
@@ -479,7 +483,7 @@ const EditableCell = ({
   if (additional)
     return (
       <td {...restProps}>
-        <Space>
+        <Space size="small">
           <Form.Item
             name={dataIndex}
             {...(formItemProps && formItemProps(record))}
diff --git a/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx b/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
index 2b536dc40..698391dd3 100644
--- a/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
+++ b/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
@@ -46,8 +46,20 @@ const BillLineSearchSelect = (
               line_desc={item.line_desc}
               part_qty={item.part_qty}
             >
-              <div className="imex-flex-row">
-                <div style={{ flex: 1 }}>{item.line_desc}</div>
+              <div
+                className="imex-flex-row"
+                style={{ flexWrap: "nowrap", width: "100%" }}
+              >
+                <div
+                  style={{
+                    flex: 1,
+                    whiteSpace: "nowrap",
+                    overflow: "hidden",
+                    textOverflow: "ellipsis",
+                  }}
+                >
+                  {item.line_desc}
+                </div>
                 {item.oem_partno ? (
                   <Tag color="blue">{item.oem_partno}</Tag>
                 ) : null}