diff --git a/internal/handler/metrics.go b/internal/handler/metrics.go
index f8c6c53..7157661 100644
--- a/internal/handler/metrics.go
+++ b/internal/handler/metrics.go
@@ -393,22 +393,31 @@ var metricsTemplate = `
 +           align-items: center;
 +           flex-wrap: wrap;
 +           padding: 10px;
++           justify-content: flex-start;
++           background: #f8f9fa;
++           border-radius: 8px;
++           overflow-x: auto;
++           white-space: nowrap;
 +       }
 +       
 +       #statusCodes .metric {
 +           flex: 0 0 auto;
-+           display: flex;
++           display: inline-flex;
 +           align-items: center;
 +           gap: 10px;
-+           padding: 5px 15px;
-+           background: #f8f9fa;
++           padding: 4px 12px;
++           background: white;
 +           border-radius: 20px;
 +           margin: 0;
 +           border: none;
-+           min-width: 100px;
++           min-width: 80px;
 +           justify-content: space-between;
++           margin-right: 10px;
++           display: inline-block;
++       }
++       #statusCodes .metric:last-child {
++           margin-right: 0;
 +       }
-+       
         .status-badge {
             padding: 3px 8px;
             border-radius: 12px;
diff --git a/internal/models/metrics.go b/internal/models/metrics.go
index 750de89..a37be00 100644
--- a/internal/models/metrics.go
+++ b/internal/models/metrics.go
@@ -535,7 +535,7 @@ func (db *MetricsDB) GetRecentMetrics(hours float64) ([]HistoricalMetrics, error
 		LEFT JOIN grouped_metrics m ON strftime(?, ts.time_point, 'localtime') = m.group_time
 		ORDER BY timestamp DESC
 		LIMIT 1000
-	`, endTimeStr, timeStep, startTimeStr, interval, startTimeStr, endTimeStr, interval)
+	`, endTimeStr, timeStep, startTimeStr, interval, startTimeStr, endTimeStr, interval, interval)
 	if err != nil {
 		return nil, err
 	}