diff --git a/src/pages/Devices.tsx b/src/pages/Devices.tsx
index bc43773..334115d 100644
--- a/src/pages/Devices.tsx
+++ b/src/pages/Devices.tsx
@@ -59,14 +59,14 @@ const useStyles = makeStyles((theme: Theme) => {
       margin: theme.spacing(1),
       marginLeft: theme.spacing(2),
       display: "flex",
-      width: theme.spacing(32)
+      // width: theme.spacing(26)
       // justifyContent: "center",
     },
     tagsCellContainer: {
       margin: theme.spacing(1),
       marginLeft: theme.spacing(2),
       display: "flex",
-      width: theme.spacing(24)
+      width: theme.spacing(18)
       // justifyContent: "center",
     },
     green: {
@@ -382,12 +382,13 @@ export default function Devices() {
         title: "Description",
         render: (device: Device) => {
           const description = device.settings?.description ?? ""
+          let size = (hasCo2 && !groupGas) ? 26 : 36
           return (
-            <Box className={classes.descriptionCellContainer}>
-              <Tooltip title={device.settings?.description}>
+            <Box className={classes.descriptionCellContainer} width={size*6}>
+              <Tooltip title={description}>
                 <span>
-                  {description.length > 36
-                    ? description.substring(0, 36) + "..."
+                  {description.length > size
+                    ? description.substring(0, size) + "..."
                     : description}
                 </span>
               </Tooltip>