diff --git a/agent/accounts.php b/agent/accounts.php
index b96ffe53..3462b341 100644
--- a/agent/accounts.php
+++ b/agent/accounts.php
@@ -89,7 +89,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 </a>
                             </td>
                             <td><?php echo $account_currency_code; ?></td>
-                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $balance, $account_currency_code); ?></td>
+                            <td class="text-right text-monospace"><?php echo numfmt_format_currency($currency_format, $balance, $account_currency_code); ?></td>
                             <td>
                                 <div class="dropdown dropleft text-center">
                                     <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
diff --git a/agent/asset_details.php b/agent/asset_details.php
index abccd230..e370c195 100644
--- a/agent/asset_details.php
+++ b/agent/asset_details.php
@@ -300,7 +300,7 @@ if (isset($_GET['asset_id'])) {
                             <div class="mt-2"><i class="fab fa-fw fa-windows text-secondary mr-2"></i><?= "$asset_os"; ?></div>
                         <?php }
                         if ($asset_serial) { ?>
-                            <div class="mt-2"><i class="fa fa-fw fa-barcode text-secondary mr-2"></i><?= $asset_serial; ?></div>
+                            <div class="mt-2"><i class="fa fa-fw fa-barcode text-secondary mr-1"></i><span class="badge"><?= $asset_serial; ?></span></div>
                         <?php }
                         if ($asset_purchase_date) { ?>
                             <div class="mt-2"><i class="fa fa-fw fa-shopping-cart text-secondary mr-2"></i><?= date('Y-m-d', strtotime($asset_purchase_date)); ?></div>
@@ -320,13 +320,13 @@ if (isset($_GET['asset_id'])) {
                     </div>
                     <div class="card-body">
                         <?php if ($asset_ip) { ?>
-                            <div><i class="fa fa-fw fa-globe text-secondary mr-2"></i><?= $asset_ip; ?></div>
+                            <div><i class="fa fa-fw fa-globe text-secondary mr-2"></i><span class="text-monospace"><?= $asset_ip; ?></span></div>
                         <?php } ?>
                         <?php if ($asset_nat_ip) { ?>
-                            <div class="mt-2"><i class="fa fa-fw fa-random text-secondary mr-2"></i><?= $asset_nat_ip; ?></div>
+                            <div class="mt-2"><i class="fa fa-fw fa-random text-secondary mr-2"></i><span class="text-monospace"><?= $asset_nat_ip; ?></span></div>
                         <?php }
                         if ($asset_mac) { ?>
-                            <div class="mt-2"><i class="fa fa-fw fa-ethernet text-secondary mr-2"></i><?= $asset_mac; ?></div>
+                            <div class="mt-2"><i class="fa fa-fw fa-ethernet text-secondary mr-2"></i><span class="text-monospace"><?= $asset_mac; ?></span></div>
                         <?php }
                         if ($asset_uri) { ?>
                             <div class="mt-2"><i class="fa fa-fw fa-link text-secondary mr-2"></i><a href="<?= $asset_uri; ?>" target="_blank" title="<?= $asset_uri; ?>"><?= truncate($asset_uri, 40); ?></a></div>
@@ -582,11 +582,11 @@ if (isset($_GET['asset_id'])) {
                                         </td>
                                         <td><?= $interface_type_display; ?></td>
                                         <td><?= $network_name_display; ?></td>
-                                        <td>
+                                        <td class="text-monospace">
                                             <?= $interface_ip_display; ?>
                                             <div><small class="text-secondary"><?= $interface_ipv6 ?></small></div>
                                         </td>
-                                        <td><?= $interface_mac_display; ?></td>
+                                        <td class="text-monospace"><?= $interface_mac_display; ?></td>
                                         <td><?= $connected_to_display; ?></td>
                                         <td>
                                             <div class="dropdown dropleft text-center">
diff --git a/agent/assets.php b/agent/assets.php
index 666bfa98..5c58d105 100644
--- a/agent/assets.php
+++ b/agent/assets.php
@@ -692,12 +692,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <div><small class="text-secondary"><?php echo $asset_serial_display; ?></small></div>
                                 </td>
                             <?php } ?>
-                                <td>
+                                <td class="text-monospace">
                                     <?php echo $asset_ip; ?>
                                     <div class="text-secondary"><small><?php echo $asset_ipv6; ?></small></div>
                                 </td>
                             <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Mac_Address', $_GET['show_column'])) { ?>
-                                <td><?php echo $asset_mac; ?></td>
+                                <td class="text-monospace"><?php echo $asset_mac; ?></td>
                             <?php } ?>
                             <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Purchase_Date', $_GET['show_column'])) { ?>
                                 <td><?php echo $asset_purchase_date_display; ?></td>
diff --git a/agent/clients.php b/agent/clients.php
index e5a0dea3..291dfab7 100644
--- a/agent/clients.php
+++ b/agent/clients.php
@@ -444,7 +444,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         }
 
                         $client_tag_id_array[] = $client_tag_id;
-                        $client_tag_name_display_array[] = "<a href='clients.php?tags[]=$client_tag_id'><span class='mt-1 badge badge-pill text-light p-2 mr-1' style='background-color: $client_tag_color;'><i class='fas fa-$client_tag_icon fa-fw mr-1'></i>$client_tag_name</span></a>";
+                        $client_tag_name_display_array[] = "<a href='clients.php?tags[]=$client_tag_id'><span class='mt-1 badge badge-pill text-light p-1 mr-1' style='background-color: $client_tag_color;'><i class='fas fa-$client_tag_icon fa-fw mr-1'></i>$client_tag_name</span></a>";
                     }
                     $client_tags_display = implode('', $client_tag_name_display_array);
 
@@ -462,7 +462,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     $balance = $invoice_amounts - $amount_paid;
                     //set Text color on balance
                     if ($balance > 0) {
-                        $balance_text_color = "text-danger font-weight-bold";
+                        $balance_text_color = "text-danger";
                     } else {
                         $balance_text_color = "";
                     }
@@ -570,7 +570,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <div><?= $software_count_display ?></div>
                                     <div><?= $ticket_count_display ?></div>
                                 ">
-                                <i class="fas fa-fw fa-2x fa-info-circle"></i>
+                                <span class="badge badge-pill badge-secondary p-2"><i class="fas fa-chart-area"></i><span>
                             </a>
                         </td>
                         <!-- Show Billing if perms & if accounting module is enabled -->
@@ -582,21 +582,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 </div>
                                 <div class="d-flex justify-content-between">
                                     <span class="text-secondary">Paid</span>
-                                    <span><?php echo numfmt_format_currency($currency_format, $amount_paid, $session_company_currency); ?></span>
+                                    <?php echo numfmt_format_currency($currency_format, $amount_paid, $session_company_currency); ?>
                                 </div>
                                 <?php if ($credit_balance > 0) { ?>
                                 <div class="d-flex justify-content-between">
                                     <span class="text-secondary">Credit</span>
-                                    <span class="text-success"><?php echo numfmt_format_currency($currency_format, $credit_balance, $session_company_currency); ?></span>
+                                    <span class="text-success"><?php echo numfmt_format_currency($currency_format, $credit_balance, $session_company_currency); ?>
                                 </div>
                                 <?php } ?>
                                 <div class="d-flex justify-content-between">
                                     <span class="text-secondary">Monthly</span>
-                                    <span><?php echo numfmt_format_currency($currency_format, $recurring_monthly, $session_company_currency); ?></span>
+                                    <?php echo numfmt_format_currency($currency_format, $recurring_monthly, $session_company_currency); ?>
                                 </div>
                                 <div class="d-flex justify-content-between">
                                     <span class="text-secondary">Hourly Rate</span>
-                                    <span><?php echo numfmt_format_currency($currency_format, $client_rate, $session_company_currency); ?></span>
+                                    <?php echo numfmt_format_currency($currency_format, $client_rate, $session_company_currency); ?>
                                 </div>
                             </td>
                         <?php } ?>
diff --git a/agent/contact_details.php b/agent/contact_details.php
index 488aacf1..0a0e10e8 100644
--- a/agent/contact_details.php
+++ b/agent/contact_details.php
@@ -458,7 +458,7 @@ if (isset($_GET['contact_id'])) {
                                             <small class="text-muted"><?= $asset_model ?></small>
                                         </div>
                                     </td>
-                                    <td><?= $asset_serial_display ?></td>
+                                    <td class="text-monospace"><?= $asset_serial_display ?></td>
 
                                     <td><?= $asset_install_date_display ?></td>
                                     <td><?= $asset_status ?></td>
@@ -1061,7 +1061,7 @@ if (isset($_GET['contact_id'])) {
                                         <div class="text-secondary"><?php echo $file_description; ?></div>
                                     </td>
                                     <td><?php echo $file_mime_type; ?></td>
-                                    <td><?php echo $file_size_KB; ?> KB</td>
+                                    <td><span class="text-monospace"><?php echo $file_size_KB; ?></span> KB</td>
                                     <td><?php echo $file_created_at; ?></td>
                                     <td class="text-center">
                                         <a href="post.php?unlink_contact_from_file&contact_id=<?php echo $contact_id; ?>&file_id=<?php echo $file_id; ?>&csrf_token=<?= $_SESSION['csrf_token'] ?>" class="btn btn-secondary btn-sm" title="Unlink"><i class="fas fa-fw fa-unlink"></i></a>
diff --git a/agent/dashboard.php b/agent/dashboard.php
index 49f317cd..ee25839c 100644
--- a/agent/dashboard.php
+++ b/agent/dashboard.php
@@ -447,7 +447,7 @@ if ($user_config_dashboard_financial_enable == 1) {
                                         $balance = '0.00';
                                     }
                                     ?>
-                                    <td class="text-right"><?php echo numfmt_format_currency($currency_format, $balance, "$session_company_currency"); ?></td>
+                                    <td class="text-right text-monospace"><?php echo numfmt_format_currency($currency_format, $balance, "$session_company_currency"); ?></td>
                                 </tr>
                             <?php } ?>
                         </tbody>
@@ -488,7 +488,7 @@ if ($user_config_dashboard_financial_enable == 1) {
                                     <td><?php echo $payment_date; ?></td>
                                     <td><?php echo $client_name; ?></td>
                                     <td><?php echo "$invoice_prefix$invoice_number"; ?></td>
-                                    <td class="text-right"><?php echo numfmt_format_currency($currency_format, $payment_amount, "$session_company_currency"); ?></td>
+                                    <td class="text-right text-monospace"><?php echo numfmt_format_currency($currency_format, $payment_amount, "$session_company_currency"); ?></td>
                                 </tr>
                             <?php } ?>
                         </tbody>
@@ -528,7 +528,7 @@ if ($user_config_dashboard_financial_enable == 1) {
                                     <td><?php echo $expense_date; ?></td>
                                     <td><?php echo $vendor_name; ?></td>
                                     <td><?php echo $category_name; ?></td>
-                                    <td class="text-right"><?php echo numfmt_format_currency($currency_format, $expense_amount, "$session_company_currency"); ?></td>
+                                    <td class="text-right text-monospace"><?php echo numfmt_format_currency($currency_format, $expense_amount, "$session_company_currency"); ?></td>
                                 </tr>
                             <?php } ?>
                         </tbody>
diff --git a/agent/expenses.php b/agent/expenses.php
index f0fa8023..a183f7e6 100644
--- a/agent/expenses.php
+++ b/agent/expenses.php
@@ -303,7 +303,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <div class="text-secondary"><small><?php echo truncate($expense_description, 60); ?></small></div>
                             </td>
                             <td><?php echo $vendor_name; ?></td>
-                            <td class="text-bold text-right"><?php echo numfmt_format_currency($currency_format, $expense_amount, $expense_currency_code); ?></td>
+                            <td class="text-right text-monospace"><?php echo numfmt_format_currency($currency_format, $expense_amount, $expense_currency_code); ?></td>
                             <td><?php echo $account_name; ?></td>
                             <td><?php echo $client_name_display; ?></td>
                             <td>
diff --git a/agent/includes/client_side_nav.php b/agent/includes/client_side_nav.php
index 7f563e01..9728733a 100644
--- a/agent/includes/client_side_nav.php
+++ b/agent/includes/client_side_nav.php
@@ -128,7 +128,7 @@
 
                     <?php if (lookupUserPermission("module_support") >= 1) { ?>
                         <li class="nav-item">
-                            <a href="/agent/assets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "assets.php" || basename($_SERVER["PHP_SELF"]) == "client_asset_details.php") { echo "active"; } ?>">
+                            <a href="/agent/assets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "assets.php" || basename($_SERVER["PHP_SELF"]) == "asset_details.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-desktop"></i>
                                 <p>
                                     Assets
@@ -237,7 +237,7 @@
 
                     <!-- Allow files even without module_support for things like contracts, etc. ) -->
                     <li class="nav-item">
-                        <a href="/agent/files.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "files.php") { echo "active"; } ?>">
+                        <a href="/agent/files.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "files.php" || basename($_SERVER["PHP_SELF"]) == "document_details.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-folder"></i>
                             <p>
                                 Files
diff --git a/agent/includes/inc_client_top_head.php b/agent/includes/inc_client_top_head.php
index 6f22d003..53bb0cc5 100644
--- a/agent/includes/inc_client_top_head.php
+++ b/agent/includes/inc_client_top_head.php
@@ -167,7 +167,7 @@
             </div>
             <?php if(!empty($client_tax_id_number)) { ?>
             <div class="ml-1 mt-1 text-secondary">Tax ID
-                <span class="text-dark float-right"><?php echo $client_tax_id_number; ?></span>
+                <span class="text-dark float-right text-monospace"><?php echo $client_tax_id_number; ?></span>
             </div>
             <?php } ?>
         </div>
diff --git a/agent/invoices.php b/agent/invoices.php
index 0e46a58a..7e75cb18 100644
--- a/agent/invoices.php
+++ b/agent/invoices.php
@@ -386,7 +386,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <?php if (!$client_url) { ?>
                             <td class="text-bold"><a href="invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
                             <?php } ?>
-                            <td class="text-bold text-right"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
+                            <td class="text-right text-monospace"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
                             <td><?php echo $invoice_date; ?></td>
                             <td class="<?php echo $overdue_color; ?>"><?php echo $invoice_due; ?></td>
                             <td><?php echo $category_name; ?></td>
diff --git a/agent/modals/asset/asset_add.php b/agent/modals/asset/asset_add.php
index 2bc7bf00..1daf2271 100644
--- a/agent/modals/asset/asset_add.php
+++ b/agent/modals/asset/asset_add.php
@@ -157,7 +157,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
                             </div>
-                            <input type="text" class="form-control" name="serial" placeholder="e.g. ABC1234XYZ" maxlength="200">
+                            <input type="text" class="form-control text-monospace" name="serial" placeholder="e.g. ABC1234XYZ" maxlength="200">
                         </div>
                     </div>
                 <?php } ?>
@@ -308,7 +308,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="ip" placeholder="e.g. 192.168.1.10" data-inputmask="'alias': 'ip'" data-mask>
+                        <input type="text" class="form-control text-monospace" name="ip" placeholder="e.g. 192.168.1.10" data-inputmask="'alias': 'ip'" data-mask>
                         <div class="input-group-append">
                             <div class="input-group-text">
                                 <input type="checkbox" name="dhcp" value="1">
@@ -323,7 +323,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="mac" placeholder="e.g. 00:1A:2B:3C:4D:5E" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
+                        <input type="text" class="form-control text-monospace" name="mac" placeholder="e.g. 00:1A:2B:3C:4D:5E" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
                     </div>
                 </div>
 
@@ -333,7 +333,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="ipv6" placeholder="e.g. 2001:db8::1" maxlength="200">
+                        <input type="text" class="form-control text-monospace" name="ipv6" placeholder="e.g. 2001:db8::1" maxlength="200">
                     </div>
                 </div>
 
@@ -343,7 +343,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="nat_ip" placeholder="e.g. 203.0.113.10 or 10.0.0.5" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
+                        <input type="text" class="form-control text-monospace" name="nat_ip" placeholder="e.g. 203.0.113.10 or 10.0.0.5" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
                     </div>
                 </div>
 
diff --git a/agent/modals/asset/asset_copy.php b/agent/modals/asset/asset_copy.php
index a02653a9..14adcc11 100644
--- a/agent/modals/asset/asset_copy.php
+++ b/agent/modals/asset/asset_copy.php
@@ -136,7 +136,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
                             </div>
-                            <input type="text" class="form-control" name="serial" placeholder="Serial number">
+                            <input type="text" class="form-control text-monospace" name="serial" placeholder="Serial number">
                         </div>
                     </div>
                 <?php } ?>
@@ -281,7 +281,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="ip" placeholder="192.168.10.250" data-inputmask="'alias': 'ip'" data-mask>
+                        <input type="text" class="form-control text-monospace" name="ip" placeholder="192.168.10.250" data-inputmask="'alias': 'ip'" data-mask>
                         <div class="input-group-append">
                             <div class="input-group-text">
                                 <input type="checkbox" name="dhcp" value="1" <?php if($asset_ip == 'DHCP'){ echo "checked"; } ?>>
@@ -296,7 +296,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="mac" placeholder="00:11:22:AA:BB:CC" data-inputmask="'alias': 'mac'" data-mask>
+                        <input type="text" class="form-control text-monospace" name="mac" placeholder="00:11:22:AA:BB:CC" data-inputmask="'alias': 'mac'" data-mask>
                     </div>
                 </div>
 
@@ -306,7 +306,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="ipv6" value="<?php echo $asset_ipv6; ?>" placeholder="2001:0db8:1000::3">
+                        <input type="text" class="form-control text-monospace" name="ipv6" value="<?php echo $asset_ipv6; ?>" placeholder="2001:0db8:1000::3">
                     </div>
                 </div>
 
@@ -316,7 +316,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="nat_ip" placeholder="10.52.4.55" data-inputmask="'alias': 'ip'" data-mask>
+                        <input type="text" class="form-control text-monospace" name="nat_ip" placeholder="10.52.4.55" data-inputmask="'alias': 'ip'" data-mask>
                     </div>
                 </div>
 
diff --git a/agent/modals/asset/asset_details.php b/agent/modals/asset/asset_details.php
index 1e9cbdfa..2b7b2a8c 100644
--- a/agent/modals/asset/asset_details.php
+++ b/agent/modals/asset/asset_details.php
@@ -321,7 +321,7 @@ ob_start();
                         <div class="mt-2"><i class="fab fa-fw fa-windows text-secondary mr-2"></i><?php echo "$asset_os"; ?></div>
                     <?php }
                     if ($asset_serial) { ?>
-                        <div class="mt-2"><i class="fa fa-fw fa-barcode text-secondary mr-2"></i><?php echo $asset_serial; ?></div>
+                        <div class="mt-2"><i class="fa fa-fw fa-barcode text-secondary mr-2"></i><span class="text-monospace"><?php echo $asset_serial; ?></span></div>
                     <?php }
                     if ($asset_purchase_date) { ?>
                         <div class="mt-2"><i class="fa fa-fw fa-shopping-cart text-secondary mr-2"></i><?php echo date('Y-m-d', strtotime($asset_purchase_date)); ?></div>
@@ -341,13 +341,13 @@ ob_start();
                 </div>
                 <div class="card-body">
                     <?php if ($asset_ip) { ?>
-                        <div><i class="fa fa-fw fa-globe text-secondary mr-2"></i><?php echo $asset_ip; ?></div>
+                        <div><i class="fa fa-fw fa-globe text-secondary mr-2"></i><span class="text-monospace"><?php echo $asset_ip; ?></span></div>
                     <?php } ?>
                     <?php if ($asset_nat_ip) { ?>
-                        <div class="mt-2"><i class="fa fa-fw fa-random text-secondary mr-2"></i><?php echo $asset_nat_ip; ?></div>
+                        <div class="mt-2"><i class="fa fa-fw fa-random text-secondary mr-2"></i><span class="text-monospace"><?php echo $asset_nat_ip; ?></span></div>
                     <?php }
                     if ($asset_mac) { ?>
-                        <div class="mt-2"><i class="fa fa-fw fa-ethernet text-secondary mr-2"></i><?php echo $asset_mac; ?></div>
+                        <div class="mt-2"><i class="fa fa-fw fa-ethernet text-secondary mr-2"></i><span class="text-monospace"><?php echo $asset_mac; ?></span></div>
                     <?php }
                     if ($asset_uri) { ?>
                         <div class="mt-2"><i class="fa fa-fw fa-link text-secondary mr-2"></i><a href="<?php echo $asset_uri; ?>" target="_blank" title="<?php echo $asset_uri; ?>"><?php echo truncate($asset_uri, 20); ?></a></div>
@@ -481,11 +481,11 @@ ob_start();
                             </td>
                             <td><?php echo $interface_type_display; ?></td>
                             <td><?php echo $network_name_display; ?></td>
-                            <td>
+                            <td class="text-monospace">
                                 <?php echo $interface_ip_display; ?>
                                 <div><small class="text-secondary"><?= $interface_ipv6 ?></div>
                             </td>
-                            <td><?php echo $interface_mac_display; ?></td>
+                            <td class="text-monospace"><?php echo $interface_mac_display; ?></td>
                             <td><?php echo $connected_to_display; ?></td>
                         </tr>
                     <?php } ?>
@@ -769,8 +769,8 @@ ob_start();
                         <tr>
                             <td><?php echo "$software_name<br><span class='text-secondary'>$software_version</span>"; ?></td>
                             <td><?php echo $software_type; ?></td>
-                            <td><?php echo $software_key; ?></td>
-                            <td><?php echo "$seat_count / $software_seats"; ?></td>
+                            <td class="text-monospace"><?php echo $software_key; ?></td>
+                            <td class="text-monospace"><?php echo "$seat_count / $software_seats"; ?></td>
                         </tr>
 
                         <?php
diff --git a/agent/modals/asset/asset_edit.php b/agent/modals/asset/asset_edit.php
index 78cc4e37..cf8af90c 100644
--- a/agent/modals/asset/asset_edit.php
+++ b/agent/modals/asset/asset_edit.php
@@ -164,7 +164,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
                             </div>
-                            <input type="text" class="form-control" name="serial" placeholder="Serial number" maxlength="200" value="<?= $asset_serial ?>">
+                            <input type="text" class="form-control text-monospace" name="serial" placeholder="Serial number" maxlength="200" value="<?= $asset_serial ?>">
                         </div>
                     </div>
                 <?php } ?>
@@ -329,7 +329,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="ip" value="<?php echo $asset_ip; ?>" placeholder="192.168.10.250" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
+                        <input type="text" class="form-control text-monospace" name="ip" value="<?php echo $asset_ip; ?>" placeholder="192.168.10.250" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
                         <div class="input-group-append">
                             <div class="input-group-text">
                                 <input type="checkbox" name="dhcp" value="1" <?php if($asset_ip == 'DHCP'){ echo "checked"; } ?>>
@@ -344,7 +344,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="mac" value="<?= $asset_mac ?>" placeholder="00:11:22:AA:BB:CC" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
+                        <input type="text" class="form-control text-monospace" name="mac" value="<?= $asset_mac ?>" placeholder="00:11:22:AA:BB:CC" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
                     </div>
                 </div>
 
@@ -354,7 +354,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="ipv6" value="<?= $asset_ipv6 ?>" placeholder="2001:0db8:1000::3" maxlength="200">
+                        <input type="text" class="form-control text-monospace" name="ipv6" value="<?= $asset_ipv6 ?>" placeholder="2001:0db8:1000::3" maxlength="200">
                     </div>
                 </div>
 
@@ -364,7 +364,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="nat_ip" value="<?= $asset_nat_ip ?>" placeholder="10.52.4.55" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
+                        <input type="text" class="form-control text-monospace" name="nat_ip" value="<?= $asset_nat_ip ?>" placeholder="10.52.4.55" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
                     </div>
                 </div>
 
@@ -519,7 +519,7 @@ ob_start();
                     </div>
                 </div>
 
-                <p class="text-muted text-right">Asset ID: <?= $asset_id ?></p>
+                <p class="text-muted text-right">Asset ID: <span class="text-monospace"><?= $asset_id ?></span></p>
 
             </div>
 
@@ -534,7 +534,7 @@ ob_start();
                             $asset_history_status = nullable_htmlentities($row['asset_history_status']);
                             $asset_history_description = nullable_htmlentities($row['asset_history_description']);
                             $asset_history_created_at = nullable_htmlentities($row['asset_history_created_at']);
-                            echo "<li>$asset_history_created_at - $asset_history_status <br/>$asset_history_description</li><br/>";
+                            echo "<li><span class='text-monospace'>$asset_history_created_at</span> <span class='badge badge-pill badge-secondary mt-1'>$asset_history_status</span><br/>$asset_history_description</li><br/>";
                         }
                         ?>
                     </ul>
diff --git a/agent/modals/asset/asset_interface_add.php b/agent/modals/asset/asset_interface_add.php
index 8b939895..4d2aa68b 100644
--- a/agent/modals/asset/asset_interface_add.php
+++ b/agent/modals/asset/asset_interface_add.php
@@ -132,7 +132,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="ip" placeholder="e.g. 192.168.1.10" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
+                        <input type="text" class="form-control text-monospace" name="ip" placeholder="e.g. 192.168.1.10" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
                         <div class="input-group-append">
                             <div class="input-group-text">
                                 <input type="checkbox" name="dhcp" value="1" title="Check to mark address as DHCP controlled">
@@ -148,7 +148,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="mac" placeholder="e.g. 00:1A:2B:3C:4D:5E" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
+                        <input type="text" class="form-control text-monospace" name="mac" placeholder="e.g. 00:1A:2B:3C:4D:5E" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
                     </div>
                 </div>
 
@@ -159,7 +159,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="ipv6" placeholder="e.g. 2001:db8::1" maxlength="200">
+                        <input type="text" class="form-control text-monospace" name="ipv6" placeholder="e.g. 2001:db8::1" maxlength="200">
                     </div>
                 </div>
 
@@ -172,7 +172,7 @@ ob_start();
                         </div>
                         <input
                             type="text"
-                            class="form-control"
+                            class="form-control text-monospace"
                             name="nat_ip"
                             placeholder="e.g. 203.0.113.10 or 10.0.0.5"
                             maxlength="200"
diff --git a/agent/modals/asset/asset_interface_edit.php b/agent/modals/asset/asset_interface_edit.php
index 1ed69f55..fc99b1e8 100644
--- a/agent/modals/asset/asset_interface_edit.php
+++ b/agent/modals/asset/asset_interface_edit.php
@@ -191,7 +191,7 @@ ob_start();
                         </div>
                         <input
                             type="text"
-                            class="form-control"
+                            class="form-control text-monospace"
                             name="ip"
                             placeholder="e.g. 192.168.1.10"
                             maxlength="200"
@@ -222,7 +222,7 @@ ob_start();
                         </div>
                         <input
                             type="text"
-                            class="form-control"
+                            class="form-control text-monospace"
                             name="mac"
                             placeholder="e.g. 00:1A:2B:3C:4D:5E"
                             maxlength="200"
@@ -242,7 +242,7 @@ ob_start();
                         </div>
                         <input
                             type="text"
-                            class="form-control"
+                            class="form-control text-monospace"
                             name="ipv6"
                             placeholder="e.g. 2001:db8::1"
                             maxlength="200"
@@ -260,7 +260,7 @@ ob_start();
                         </div>
                         <input
                             type="text"
-                            class="form-control"
+                            class="form-control text-monospace"
                             name="nat_ip"
                             placeholder="e.g. 203.0.113.10 or 10.0.0.5"
                             maxlength="200"
diff --git a/agent/modals/network/network_add.php b/agent/modals/network/network_add.php
index cea43cd3..664c91b3 100644
--- a/agent/modals/network/network_add.php
+++ b/agent/modals/network/network_add.php
@@ -121,7 +121,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
                         </div>
-                        <input type="text" class="form-control" inputmode="numeric" name="vlan" placeholder="e.g. 20">
+                        <input type="text" class="form-control text-monospace" inputmode="numeric" name="vlan" placeholder="e.g. 20">
                     </div>
                 </div>
 
@@ -131,7 +131,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="network" placeholder="192.168.1.0/24 or 2001:db8::/64" maxlength="200" required>
+                        <input type="text" class="form-control text-monospace" name="network" placeholder="192.168.1.0/24 or 2001:db8::/64" maxlength="200" required>
                     </div>
                 </div>
 
@@ -141,7 +141,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-arrows-alt-h"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="dhcp_range" placeholder="192.168.1.100-192.168.1.200"  maxlength="200">
+                        <input type="text" class="form-control text-monospace" name="dhcp_range" placeholder="192.168.1.100-192.168.1.200"  maxlength="200">
                     </div>
                 </div>
 
@@ -151,7 +151,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-route"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="gateway" placeholder="192.168.1.1 or 2001:db8::1" maxlength="200">
+                        <input type="text" class="form-control text-monospace" name="gateway" placeholder="192.168.1.1 or 2001:db8::1" maxlength="200">
                     </div>
                 </div>
 
@@ -164,7 +164,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="primary_dns" placeholder="9.9.9.9 or 2620:fe::fe"  maxlength="200">
+                        <input type="text" class="form-control text-monospace" name="primary_dns" placeholder="9.9.9.9 or 2620:fe::fe"  maxlength="200">
                     </div>
                 </div>
 
@@ -174,7 +174,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="secondary_dns" placeholder="1.1.1.1 or 2606:4700:4700::1111"  maxlength="200">
+                        <input type="text" class="form-control text-monospace" name="secondary_dns" placeholder="1.1.1.1 or 2606:4700:4700::1111"  maxlength="200">
                     </div>
                 </div>
             </div>
diff --git a/agent/modals/network/network_edit.php b/agent/modals/network/network_edit.php
index 54b861b7..950bcb43 100644
--- a/agent/modals/network/network_edit.php
+++ b/agent/modals/network/network_edit.php
@@ -109,7 +109,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
                         </div>
-                        <input type="text" class="form-control" inputmode="numeric" name="vlan" placeholder="e.g. 20" value="<?= $network_vlan ?>">
+                        <input type="text" class="form-control text-monospace" inputmode="numeric" name="vlan" placeholder="e.g. 20" value="<?= $network_vlan ?>">
                     </div>
                 </div>
 
@@ -119,7 +119,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="network" placeholder="192.168.1.0/24 or 2001:db8::/64" maxlength="200" value="<?= $network ?>" required>
+                        <input type="text" class="form-control text-monospace" name="network" placeholder="192.168.1.0/24 or 2001:db8::/64" maxlength="200" value="<?= $network ?>" required>
                     </div>
                 </div>
 
@@ -129,7 +129,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-arrows-alt-h"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="dhcp_range" placeholder="192.168.1.100-192.168.1.200" maxlength="200" value="<?= $network_dhcp_range ?>">
+                        <input type="text" class="form-control text-monospace" name="dhcp_range" placeholder="192.168.1.100-192.168.1.200" maxlength="200" value="<?= $network_dhcp_range ?>">
                     </div>
                 </div>
 
@@ -139,7 +139,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-route"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="gateway" placeholder="192.168.1.1 or 2001:db8::1" maxlength="200" value="<?= $network_gateway ?>">
+                        <input type="text" class="form-control text-monospace" name="gateway" placeholder="192.168.1.1 or 2001:db8::1" maxlength="200" value="<?= $network_gateway ?>">
                     </div>
                 </div>
 
@@ -153,7 +153,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="primary_dns" placeholder="9.9.9.9 or 2620:fe::fe" maxlength="200" value="<?= $network_primary_dns ?>">
+                        <input type="text" class="form-control text-monospace" name="primary_dns" placeholder="9.9.9.9 or 2620:fe::fe" maxlength="200" value="<?= $network_primary_dns ?>">
                     </div>
                 </div>
 
@@ -163,7 +163,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="secondary_dns" placeholder="1.1.1.1 or 2606:4700:4700::1111" maxlength="200" value="<?= $network_secondary_dns ?>">
+                        <input type="text" class="form-control text-monospace" name="secondary_dns" placeholder="1.1.1.1 or 2606:4700:4700::1111" maxlength="200" value="<?= $network_secondary_dns ?>">
                     </div>
                 </div>
 
diff --git a/agent/modals/service/service_details.php b/agent/modals/service/service_details.php
index 0c9b4030..794f2f06 100644
--- a/agent/modals/service/service_details.php
+++ b/agent/modals/service/service_details.php
@@ -144,7 +144,7 @@ ob_start();
                             $network_parts = explode(":", $network);
                             $network_name = $network_parts[0];
                             $network_vlan = $network_parts[1] ?? '';
-                            echo "<li><a href='networks.php?client_id=$client_id&q=$network_name'>$network_name</a> (VLAN $network_vlan)</li>";
+                            echo "<li><a href='networks.php?client_id=$client_id&q=$network_name'>$network_name</a> (VLAN <span class='text-monospace'>$network_vlan</span>)</li>";
                         }
                         echo "</ul>";
                     }
diff --git a/agent/networks.php b/agent/networks.php
index de9605b5..3cf9418d 100644
--- a/agent/networks.php
+++ b/agent/networks.php
@@ -309,11 +309,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 </a>
                             </td>
                             <td><?= $location_name_display ?></td>
-                            <td><?= $network_vlan_display ?></td>
-                            <td><?= $network ?></td>
-                            <td><?= $network_gateway ?></td>
-                            <td><?= $network_dhcp_range_display ?></td>
-                            <td><?= $network_dns_display ?></td>
+                            <td class="text-monospace"><?= $network_vlan_display ?></td>
+                            <td class="text-monospace"><?= $network ?></td>
+                            <td class="text-monospace"><?= $network_gateway ?></td>
+                            <td class="text-monospace"><?= $network_dhcp_range_display ?></td>
+                            <td class="text-monospace"><?= $network_dns_display ?></td>
                             <?php if (!$client_url) { ?>
                             <td><a href="networks.php?client_id=<?= $client_id ?>"><?= $client_name ?></a></td>
                             <?php } ?>
diff --git a/agent/payments.php b/agent/payments.php
index 30f294fd..9733932a 100644
--- a/agent/payments.php
+++ b/agent/payments.php
@@ -237,8 +237,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <?php if (!$client_url) { ?>
                             <td><a href="payments.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
                             <?php } ?>
-                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
-                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $payment_amount, $payment_currency_code); ?></td>
+                            <td class="text-right text-monospace"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
+                            <td class="text-right text-monospace"><?php echo numfmt_format_currency($currency_format, $payment_amount, $payment_currency_code); ?></td>
                             <td><?php echo $payment_method; ?></td>
                             <td><?php echo $payment_reference_display; ?></td>
                             <td><?php echo "$account_archived_display$account_name"; ?></td>
diff --git a/agent/products.php b/agent/products.php
index 2fed030f..89decf8a 100644
--- a/agent/products.php
+++ b/agent/products.php
@@ -271,7 +271,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <?php } ?>
                                 <td><?= $tax_name ?></td>
                                 <td><?= $tax_percent ?>%</td>
-                                <td class="text-right"><?php echo numfmt_format_currency($currency_format, $product_price, $product_currency_code); ?></td>
+                                <td class="text-right text-monospace"><?php echo numfmt_format_currency($currency_format, $product_price, $product_currency_code); ?></td>
 
                                 <td>
                                     <div class="dropdown dropleft text-center">
diff --git a/agent/quotes.php b/agent/quotes.php
index 28270ae3..0035621e 100644
--- a/agent/quotes.php
+++ b/agent/quotes.php
@@ -198,7 +198,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <a href="quotes.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
                         </td>
                         <?php } ?>
-                        <td class="text-right text-bold"><?php echo numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code); ?></td>
+                        <td class="text-right text-monospace"><?php echo numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code); ?></td>
                         <td><?php echo $quote_date; ?></td>
                         <td><?php echo $quote_expire; ?></td>
                         <td><?php echo $category_name; ?></td>
diff --git a/agent/recurring_expenses.php b/agent/recurring_expenses.php
index 54dc20c1..93399fdc 100644
--- a/agent/recurring_expenses.php
+++ b/agent/recurring_expenses.php
@@ -171,7 +171,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <div class="text-secondary"><small><?php echo truncate($recurring_expense_description, 60); ?></small></div>
                             </td>
                             <td><?php echo $vendor_name; ?></td>
-                            <td class="text-bold text-right"><?php echo numfmt_format_currency($currency_format, $recurring_expense_amount, $recurring_expense_currency_code); ?></td>
+                            <td class="text-right text-monospace"><?php echo numfmt_format_currency($currency_format, $recurring_expense_amount, $recurring_expense_currency_code); ?></td>
                             <td><?php echo $recurring_expense_frequency_display; ?></td>
                             <td><?php echo $recurring_expense_last_sent_display; ?></td>
                             <td><?php echo $account_name; ?></td>
diff --git a/agent/recurring_invoices.php b/agent/recurring_invoices.php
index 32932b50..445acd8b 100644
--- a/agent/recurring_invoices.php
+++ b/agent/recurring_invoices.php
@@ -200,7 +200,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         <?php if (!$client_url) { ?>
                         <td class="text-bold"><a href="recurring_invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
                         <?php } ?>
-                        <td class="text-bold text-right"><?php echo numfmt_format_currency($currency_format, $recurring_invoice_amount, $recurring_invoice_currency_code); ?></td>
+                        <td class="text-right text-monospace"><?php echo numfmt_format_currency($currency_format, $recurring_invoice_amount, $recurring_invoice_currency_code); ?></td>
                         <td><?php echo ucwords($recurring_invoice_frequency); ?>ly</td>
                         <td><?php echo $recurring_invoice_last_sent; ?></td>
                         <td><?php echo $category_name; ?></td>
diff --git a/agent/revenues.php b/agent/revenues.php
index 2e429d4d..19ebc3b2 100644
--- a/agent/revenues.php
+++ b/agent/revenues.php
@@ -130,7 +130,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             </a>
                         </td>
                         <td><?php echo $category_name; ?></td>
-                        <td class="text-bold text-right"><?php echo numfmt_format_currency($currency_format, $revenue_amount, $revenue_currency_code); ?></td>
+                        <td class="text-right text-monospace"><?php echo numfmt_format_currency($currency_format, $revenue_amount, $revenue_currency_code); ?></td>
                         <td><?php echo $revenue_payment_method; ?></td>
                         <td><?php echo $revenue_reference_display; ?></td>
                         <td><?php echo $account_name; ?></td>
diff --git a/agent/transfers.php b/agent/transfers.php
index 744b43d6..5a8c7f64 100644
--- a/agent/transfers.php
+++ b/agent/transfers.php
@@ -214,7 +214,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <td><?php echo "$account_to_archived_display$account_name_to"; ?></td>
                             <td><?php echo $transfer_method_display; ?></td>
                             <td><?php echo $transfer_notes_display; ?></td>
-                            <td class="text-bold text-right"><?php echo numfmt_format_currency($currency_format, $transfer_amount, $session_company_currency); ?></td>
+                            <td class="text-right text-monospace"><?php echo numfmt_format_currency($currency_format, $transfer_amount, $session_company_currency); ?></td>
                             <td>
                                 <div class="dropdown dropleft text-center">
                                     <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
diff --git a/agent/trips.php b/agent/trips.php
index bd63a48c..4bef15c1 100644
--- a/agent/trips.php
+++ b/agent/trips.php
@@ -174,7 +174,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <td><?php echo $trip_purpose; ?></td>
                             <td><?php echo $trip_source; ?></td>
                             <td><?php echo $trip_destination; ?></td>
-                            <td><?php echo "$trip_miles $round_trip_display"; ?></td>
+                            <td><?php echo "<span class='text-right text-monospace'>$trip_miles</span> $round_trip_display"; ?></td>
                             <?php if (!$client_url) { ?>
                             <td><?php echo $client_name_display; ?></td>
                             <?php } ?>
diff --git a/agent/vendors.php b/agent/vendors.php
index ce705df0..5cda3702 100644
--- a/agent/vendors.php
+++ b/agent/vendors.php
@@ -160,7 +160,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         }
                         $vendor_account_number = nullable_htmlentities($row['vendor_account_number']);
                         if ($vendor_account_number) {
-                            $vendor_account_number_display = "<div class='text-secondary'>Account #: $vendor_account_number</div>";
+                            $vendor_account_number_display = "<div class='text-secondary'>Account #: <span class='text-monospace'>$vendor_account_number</span></div>";
                         } else {
                             $vendor_account_number_display = '';
                         }
@@ -207,7 +207,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         <i class="fas fa-fw fa-2x fa-building text-dark mr-2"></i>
                                         <div class="media-body">
                                             <div><?php echo $vendor_name; ?></div>
-                                            <div><?php echo $vendor_account_number_display; ?></div>
+                                            <div><small><?php echo $vendor_account_number_display; ?><small></div>
                                         </div>
                                     </div>
                                 </a>