diff --git a/src/statd/python/cli_pretty/cli_pretty.py b/src/statd/python/cli_pretty/cli_pretty.py
index fcefc01c..834cade5 100755
--- a/src/statd/python/cli_pretty/cli_pretty.py
+++ b/src/statd/python/cli_pretty/cli_pretty.py
@@ -161,7 +161,7 @@ class PadDhcpServer:
 
 class PadSensor:
     name = 30
-    value = 20
+    value = 22
     status = 10
 
     @classmethod
@@ -2121,7 +2121,7 @@ def show_hardware(json):
     sensors = [c for c in components if c.get("class") == "iana-hardware:sensor"]
     wifi_radios = [c for c in components if c.get("class") == "infix-hardware:wifi"]
 
-    width = max(PadSensor.table_width(), 100)
+    width = max(PadSensor.table_width(), 62)
 
     # Display full-width inverted heading
     print(Decore.invert(f"{'HARDWARE COMPONENTS':<{width}}"))
@@ -2145,12 +2145,12 @@ def show_hardware(json):
         Decore.title("WiFi radios", width)
 
         radios_table = SimpleTable([
-            Column('NAME'),
-            Column('MANUFACTURER'),
+            Column('NAME', flexible=True),
+            Column('MANUFACTURER', flexible=True),
             Column('BANDS', 'right'),
             Column('STANDARDS', 'right'),
             Column('MAX AP', 'right')
-        ])
+        ], min_width=width)
 
         for component in wifi_radios:
             phy = component.get("name", "")
@@ -2195,10 +2195,10 @@ def show_hardware(json):
         Decore.title("USB Ports", width)
 
         usb_table = SimpleTable([
-            Column('NAME'),
+            Column('NAME', flexible=True),
             Column('STATE'),
             Column('OPER')
-        ])
+        ], min_width=width)
 
         for component in usb_ports:
             port = USBport(component)
diff --git a/test/case/statd/system/cli/show-hardware b/test/case/statd/system/cli/show-hardware
index 6d1312e8..cfe9da1e 100644
--- a/test/case/statd/system/cli/show-hardware
+++ b/test/case/statd/system/cli/show-hardware
@@ -1,11 +1,11 @@
-HARDWARE COMPONENTS                                                                                 
-────────────────────────────────────────────────────────────────────────────────────────────────────
+HARDWARE COMPONENTS                                           
+──────────────────────────────────────────────────────────────
 Board Information
 Model               : Standard PC (i440FX + PIIX, 1996)
 Manufacturer        : QEMU
 Base MAC Address    : 00:a0:85:00:03:00
-────────────────────────────────────────────────────────────────────────────────────────────────────
+──────────────────────────────────────────────────────────────
 USB Ports
-NAME  STATE   OPER   
-USB1  locked  enabled
-USB2  locked  enabled
+NAME                                           STATE   OPER   
+USB1                                           locked  enabled
+USB2                                           locked  enabled