diff --git a/views/index.php b/views/index.php
index c9b96de..c6fa35f 100644
--- a/views/index.php
+++ b/views/index.php
@@ -106,7 +106,7 @@
                                 <th class="px-6 py-3 text-left text-xs font-medium theme-text-muted uppercase tracking-wider">Last Service</th>
                             </tr>
                         </thead>
-                        <tbody class="divide-y theme-border">
+                        <tbody class="theme-border [&>tr]:border-b [&>tr]:theme-border [&>tr:last-child]:border-b-0">
                             <?php foreach ($vehicles as $vehicle): ?>
                                 <tr class="theme-surface-alt hover:opacity-95 cursor-pointer" onclick="window.location='<?php echo url('/vehicles/' . $vehicle['id']); ?>'">
                                     <td class="px-6 py-4 whitespace-nowrap">
diff --git a/views/partials/theme.php b/views/partials/theme.php
index 36cfada..ed7ad9d 100644
--- a/views/partials/theme.php
+++ b/views/partials/theme.php
@@ -100,11 +100,17 @@ if ($themeSection === 'head'):
 
     #themeToggle {
         position: fixed;
-        top: 1rem;
+        top: calc(1rem + env(safe-area-inset-top));
         right: 1rem;
         z-index: 50;
     }
 
+    @media (max-width: 640px) {
+        #themeToggle {
+            top: calc(4.75rem + env(safe-area-inset-top));
+        }
+    }
+
     #themeToggle:focus-visible {
         outline: 3px solid #2563eb;
         outline-offset: 2px;
diff --git a/views/vehicle.php b/views/vehicle.php
index d57aa5e..82422fa 100644
--- a/views/vehicle.php
+++ b/views/vehicle.php
@@ -28,13 +28,13 @@
         </div>
         
         <?php if (isset($_SESSION['error'])): ?>
-            <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded mb-4">
+            <div class="border px-4 py-3 rounded mb-4" style="background-color: color-mix(in srgb, #ef4444 14%, var(--theme-surface)); border-color: color-mix(in srgb, #ef4444 40%, var(--theme-border)); color: var(--theme-text);">
                 <?php echo htmlspecialchars($_SESSION['error']); unset($_SESSION['error']); ?>
             </div>
         <?php endif; ?>
-        
+
         <?php if (isset($_SESSION['success'])): ?>
-            <div class="bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded mb-4">
+            <div class="border px-4 py-3 rounded mb-4" style="background-color: color-mix(in srgb, #22c55e 14%, var(--theme-surface)); border-color: color-mix(in srgb, #22c55e 40%, var(--theme-border)); color: var(--theme-text);">
                 <?php echo htmlspecialchars($_SESSION['success']); unset($_SESSION['success']); ?>
             </div>
         <?php endif; ?>