diff --git a/app/Http/Controllers/MoonsController.php b/app/Http/Controllers/MoonsController.php
index 158c7dc30..915585f01 100644
--- a/app/Http/Controllers/MoonsController.php
+++ b/app/Http/Controllers/MoonsController.php
@@ -59,9 +59,9 @@ class MoonsController extends Controller
             }
 
             if($today > $rentalTemp) {
-                $color = 'success';
+                $color = 'table-success';
             } else {
-                $color = 'warning';
+                $color = 'table-danger';
             }
             
             //Add the data to the html string to be passed to the view
diff --git a/resources/views/moons/user/moon.blade.php b/resources/views/moons/user/moon.blade.php
index cdb5be293..be9d1ea4b 100644
--- a/resources/views/moons/user/moon.blade.php
+++ b/resources/views/moons/user/moon.blade.php
@@ -19,7 +19,7 @@
             </thead>
             <tbody>
                 @foreach($table as $row)
-                <tr>
+                <tr class="{{ $row['RowColor'] }}">
                     <td>{{ $row['SPM'] }}</td>
                     <td>{{ $row['StructureName'] }}</td>
                     <td>{{ $row['FirstOre'] }}</td>