diff --git a/admin_software_templates.php b/admin_software_templates.php
index 462751cd..e89421cd 100644
--- a/admin_software_templates.php
+++ b/admin_software_templates.php
@@ -77,11 +77,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <div class="media">
                                     <i class="fa fa-fw fa-2x fa-cube mr-3"></i>
                                     <div class="media-body">
-                                        <p>
-                                            <?php echo "$software_name <span>$software_version</span>"; ?>
-                                            <br>
-                                            <small class="text-secondary"><?php echo $software_description; ?></small>
-                                        </p>
+                                        <div><?php echo "$software_name <span>$software_version</span>"; ?></div>
+                                        <div><small class="text-secondary"><?php echo $software_description; ?></small></div>
                                     </div>
                                 </div>
                             </a>
diff --git a/client_assets.php b/client_assets.php
index 60dde070..bf17b6e2 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -283,15 +283,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     </div>
                                 </td>
                                 <td>
-                                    <a href="client_asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>" class="text-secondary">
+                                    <a href="client_asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>" class="text-dark">
                                         <div class="media">
                                             <i class="fa fa-fw fa-2x fa-<?php echo $device_icon; ?> mr-3 mt-1"></i>
                                             <div class="media-body">
-                                                <p>
-                                                    <strong><?php echo $asset_name; ?></strong>
-                                                    <br>
-                                                    <small><?php echo $asset_description; ?></small>
-                                                </p>
+                                                <div><?php echo $asset_name; ?></div>
+                                                <div><small class="text-secondary"><?php echo $asset_description; ?></small></div>
                                             </div>
                                         </div>
                                     </a>
diff --git a/client_locations.php b/client_locations.php
index 9b6a489a..c92cedf9 100644
--- a/client_locations.php
+++ b/client_locations.php
@@ -113,7 +113,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     $location_contact_id = intval($row['location_contact_id']);
                     $location_primary = intval($row['location_primary']);
                     if ( $location_primary == 1 ) {
-                        $location_primary_display = "<small class='text-success ml-1'><i class='fa fa-fw fa-check'></i> Primary</small>";
+                        $location_primary_display = "<small class='text-success'><i class='fa fa-fw fa-check'></i> Primary</small>";
                     } else {
                         $location_primary_display = "";
                     }
@@ -123,14 +123,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         <td>
                             <a class="text-dark" href="#" data-toggle="modal" data-target="#editLocationModal<?php echo $location_id; ?>">
                                 <div class="media">
-                                    <i class="fa fa-fw fa-2x fa-map-marker-alt text-secondary mr-3 mt-1"></i>
+                                    <i class="fa fa-fw fa-2x fa-map-marker-alt mr-3"></i>
                                     <div class="media-body">
-                                        <p>
-                                            <strong><?php echo $location_name; ?></strong><?php echo $location_primary_display; ?>
-                                            <br>
-                                            <small class="text-secondary"><?php echo $location_description; ?></small>
-                                            
-                                        </p>
+                                        <div <?php if($location_primary) { echo "class='text-bold'"; } ?>><?php echo $location_name; ?></div>
+                                        <div><small class="text-secondary"><?php echo $location_description; ?></small></div>
+                                        <div><?php echo $location_primary_display; ?></div>
                                     </div>
                                 </div>
                             </a>
diff --git a/client_logins.php b/client_logins.php
index e106601d..90392fd2 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -121,11 +121,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <div class="media">
                                         <i class="fa fa-fw fa-2x fa-key mr-3"></i>
                                         <div class="media-body">
-                                            <p>
-                                                <?php echo $login_name; ?>
-                                                <br>
-                                                <small class="text-secondary"><?php echo $login_description; ?></small>
-                                            </p>
+                                            <div><?php echo $login_name; ?></div>
+                                            <div><small class="text-secondary"><?php echo $login_description; ?></small></div>
                                         </div>
                                     </div>
                                 </a>
diff --git a/client_software.php b/client_software.php
index 24e38923..be1f562b 100644
--- a/client_software.php
+++ b/client_software.php
@@ -129,11 +129,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <div class="media">
                                         <i class="fa fa-fw fa-2x fa-cube mr-3"></i>
                                         <div class="media-body">
-                                            <p>
-                                                <?php echo "$software_name <span>$software_version</span>"; ?>
-                                                <br>
-                                                <small class="text-secondary"><?php echo $software_description; ?></small>
-                                            </p>
+                                            <div><?php echo "$software_name <span>$software_version</span>"; ?></div>
+                                            <div><small class="text-secondary"><?php echo $software_description; ?></small></div>
                                         </div>
                                     </div>
                                 </a>