diff --git a/bambu_run/static/bambu_run/css/dashboard.css b/bambu_run/static/bambu_run/css/dashboard.css
index 1f826e1..42e54e3 100644
--- a/bambu_run/static/bambu_run/css/dashboard.css
+++ b/bambu_run/static/bambu_run/css/dashboard.css
@@ -113,29 +113,14 @@
     border-color: currentColor;
 }
 
-/* Grouped AMS unit panels — wide (multi-slot) units stack one per row,
-   compact (single-slot, e.g. AMS HT) units flow side-by-side and wrap. */
-.ams-groups {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 1rem;
-}
-
+/* Grouped AMS unit panels — Bootstrap row/col handles sizing;
+   multi-slot units (AMS/AMS 2 Pro) are col-12, single-slot (AMS HT) are col-lg-3. */
 .ams-group {
     border-radius: 0.5rem;
     padding: 0.75rem;
     border: 1px solid var(--ams-group-border-color);
 }
 
-.ams-group--wide {
-    flex: 1 1 100%;
-}
-
-.ams-group--compact {
-    flex: 0 1 auto;
-    min-width: 220px;
-}
-
 .ams-badge-bg-ams {
     background-color: color-mix(in srgb, var(--ams-badge-ams) 8%, transparent);
     border-left: 3px solid var(--ams-badge-ams);
diff --git a/bambu_run/templates/bambu_run/printer_dashboard.html b/bambu_run/templates/bambu_run/printer_dashboard.html
index a171f74..8db36d7 100644
--- a/bambu_run/templates/bambu_run/printer_dashboard.html
+++ b/bambu_run/templates/bambu_run/printer_dashboard.html
@@ -164,37 +164,6 @@
     </div>
     {% endif %}
 
-    <!-- AMS Status Section -->
-    <div class="row mb-4">
-        <div class="col-12">
-            <div class="card">
-                <div class="card-header">
-                    <h5>AMS Status</h5>
-                </div>
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-md-4">
-                            <strong>Temperature:</strong>
-                            {% if stats.ams_temp %}
-                                {{ stats.ams_temp|floatformat:1 }}&deg;C
-                            {% else %}
-                                N/A
-                            {% endif %}
-                        </div>
-                        <div class="col-md-4">
-                            <strong>Humidity:</strong>
-                            {% if stats.ams_humidity %}
-                                {{ stats.ams_humidity }}%
-                            {% else %}
-                                N/A
-                            {% endif %}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
     <!-- Filaments Section -->
     <div class="row mb-4">
         <div class="col-12">
@@ -212,9 +181,9 @@
                         {% endfor %}
                     </div>
                     {% endif %}
-                    <div class="ams-groups">
+                    <div class="row g-3 ams-groups">
                         {% for group in stats.ams_groups %}
-                        <div class="ams-group ams-badge-bg-{{ group.ams_type|slugify }} {% if group.filaments|length > 1 %}ams-group--wide{% else %}ams-group--compact{% endif %}" data-ams-unit-id="{{ group.unit_id }}">
+                        <div class="{% if group.filaments|length > 1 %}col-12{% else %}col-12 col-md-6 col-lg-3{% endif %} ams-group ams-badge-bg-{{ group.ams_type|slugify }}" data-ams-unit-id="{{ group.unit_id }}">
                             <div class="ams-group-header d-flex justify-content-between align-items-center mb-2">
                                 <strong class="small">{{ group.label }}</strong>
                                 {% if group.humidity is not None or group.temp is not None %}