diff --git a/selfdrive/ui/layouts/settings/starpilot/driving_model.py b/selfdrive/ui/layouts/settings/starpilot/driving_model.py
index 3ced39068..f929a4f38 100644
--- a/selfdrive/ui/layouts/settings/starpilot/driving_model.py
+++ b/selfdrive/ui/layouts/settings/starpilot/driving_model.py
@@ -285,7 +285,7 @@ class DrivingModelManagerView(AetherInteractiveMixin, Widget):
 
   def _draw_relocated_header(self, x: float, y: float, width: float):
     # Buttons placed horizontally
-    btn_gap = 12.0
+    btn_gap = float(AETHER_LIST_METRICS.header_button_gap)
     btn_w = (width - 16.0 - btn_gap * 2) / 3.0
     
     primary_rect = rl.Rectangle(x + 8, y, btn_w, BUTTON_HEIGHT)
diff --git a/selfdrive/ui/layouts/settings/starpilot/longitudinal.py b/selfdrive/ui/layouts/settings/starpilot/longitudinal.py
index 58886f0f8..7f66fc89b 100644
--- a/selfdrive/ui/layouts/settings/starpilot/longitudinal.py
+++ b/selfdrive/ui/layouts/settings/starpilot/longitudinal.py
@@ -8,7 +8,7 @@ import pyray as rl
 from openpilot.selfdrive.ui.lib.starpilot_state import starpilot_state
 from openpilot.system.ui.lib.application import FontWeight, MouseEvent, MousePos, gui_app
 from openpilot.system.ui.lib.multilang import tr, tr_noop
-from openpilot.system.ui.widgets import DialogResult, Widget
+from openpilot.system.ui.widgets import DialogResult
 from openpilot.system.ui.widgets.confirm_dialog import ConfirmDialog
 from openpilot.system.ui.widgets.keyboard import Keyboard
 from openpilot.system.ui.widgets.option_dialog import MultiOptionDialog
@@ -86,36 +86,26 @@ SLC_OVERRIDE_OPTIONS = [
 # AdaptiveSpeedView — nested panel with two adaptive speed tiles
 # ═══════════════════════════════════════════════════════════════
 
-class AdaptiveSpeedView(Widget):
+class AdaptiveSpeedView(CardHubManagerView):
   def __init__(self, controller):
-    super().__init__()
-    self._header_title = tr_noop("Adaptive Speed Controls")
-    self._controller = controller
-    self._grid = TileGrid(columns=2, padding=SPACING.tile_gap)
-    self._child(self._grid)
+    super().__init__(controller, [], columns=2,
+                     header_title=tr_noop("Adaptive Speed Controls"))
 
-    self._grid.add_tile(HubTile(
-      title=tr("Conditional Drive Mode"),
-      desc=tr("Configure automated switching between Experimental and Chill Modes based on set conditions."),
-      icon_key="steering",
-      on_click=lambda: controller._navigate_to("ce"),
-    ))
-
-    self._grid.add_tile(HubTile(
-      title=tr("Curve Speed Controller"),
-      desc=tr("Configure speed control on curves and reset collected calibration data."),
-      icon_key="navigate",
-      on_click=lambda: controller._navigate_to("csc"),
-    ))
-
-  def _render(self, rect: rl.Rectangle):
-    mx = float(AETHER_LIST_METRICS.outer_margin_x)
-    my = float(AETHER_LIST_METRICS.outer_margin_y)
-    grid_x = rect.x + mx
-    grid_y = rect.y + my
-    grid_w = rect.width - mx * 2
-    grid_h = rect.y + rect.height - grid_y - my
-    self._grid.render(rl.Rectangle(grid_x, grid_y, grid_w, grid_h))
+  def _build_cards(self):
+    return [
+      {
+        "title": tr("Conditional Drive Mode"),
+        "desc": tr("Configure automated switching between Experimental and Chill Modes based on set conditions."),
+        "icon": "steering",
+        "on_click": lambda: self._controller._navigate_to("ce"),
+      },
+      {
+        "title": tr("Curve Speed Controller"),
+        "desc": tr("Configure speed control on curves and reset collected calibration data."),
+        "icon": "navigate",
+        "on_click": lambda: self._controller._navigate_to("csc"),
+      },
+    ]
 
 
 # ═══════════════════════════════════════════════════════════════
@@ -172,10 +162,6 @@ class ConditionalDriveModeView(AdjustorTogglesPanelView):
   TAB_HEIGHT = 98
   TAB_BOTTOM_GAP = 26
 
-  @property
-  def vertical_scrolling_disabled(self) -> bool:
-    return True
-
   def __init__(self, controller: StarPilotLongitudinalLayout):
     super().__init__()
     self._header_title = tr("Conditional Drive Mode")
diff --git a/selfdrive/ui/layouts/settings/starpilot/sounds.py b/selfdrive/ui/layouts/settings/starpilot/sounds.py
index 0c4e4659c..81ba02f27 100644
--- a/selfdrive/ui/layouts/settings/starpilot/sounds.py
+++ b/selfdrive/ui/layouts/settings/starpilot/sounds.py
@@ -48,10 +48,6 @@ SOUNDS_PANEL_METRICS = replace(
 class SoundsManagerView(AdjustorTogglesPanelView):
   METRICS = SOUNDS_PANEL_METRICS
 
-  @property
-  def vertical_scrolling_disabled(self) -> bool:
-    return True
-
   def __init__(self, controller: StarPilotSoundsLayout):
     super().__init__()
     self._controller = controller
diff --git a/selfdrive/ui/layouts/settings/starpilot/system_settings.py b/selfdrive/ui/layouts/settings/starpilot/system_settings.py
index 1fe490897..0b0570277 100644
--- a/selfdrive/ui/layouts/settings/starpilot/system_settings.py
+++ b/selfdrive/ui/layouts/settings/starpilot/system_settings.py
@@ -40,7 +40,6 @@ from openpilot.selfdrive.ui.layouts.settings.starpilot.aethergrid import (
   GROUP_HEADER_LINE_GAP,
   GROUP_HEADER_HEIGHT,
   draw_group_header,
-  draw_tab_bar,
   AetherSliderDialog,
   mix_colors,
   snap_rect,