diff --git a/client_contact_details.php b/client_contact_details.php
index 0ff9194c..98eb0449 100644
--- a/client_contact_details.php
+++ b/client_contact_details.php
@@ -4,9 +4,9 @@ if (isset($_GET['contact_id'])) {
     $contact_id = intval($_GET['contact_id']);
 
     $sql = mysqli_query($mysqli,"SELECT * FROM contacts 
-    LEFT JOIN locations ON location_id = contact_location_id
-    WHERE contact_id = $contact_id
-  ");
+        LEFT JOIN locations ON location_id = contact_location_id
+        WHERE contact_id = $contact_id
+    ");
 
     $row = mysqli_fetch_array($sql);
     $contact_id = $row['contact_id'];
@@ -53,7 +53,6 @@ if (isset($_GET['contact_id'])) {
     $sql_related_tickets = mysqli_query($mysqli,"SELECT * FROM tickets WHERE ticket_contact_id = $contact_id AND company_id = $session_company_id ORDER BY ticket_id DESC");
     $ticket_count = mysqli_num_rows($sql_related_tickets);
 
-
     ?>
 
     <div class="row">
@@ -62,7 +61,12 @@ if (isset($_GET['contact_id'])) {
 
             <div class="card card-dark">
                 <div class="card-body">
-                    <div class="text-center">
+                    <h3 class="text-bold"><?php echo $contact_name; ?></h3>
+                    <?php if (!empty($contact_title)) { ?>
+                        <div class="text-secondary"><?php echo $contact_title; ?></div>
+                    <?php } ?>
+
+                    <div class="text-center">     
                         <?php if (!empty($contact_photo)) { ?>
                             <img class="img-fluid img-circle p-3" alt="contact_photo" src="<?php echo "uploads/clients/$session_company_id/$client_id/$contact_photo"; ?>">
                         <?php } else { ?>
@@ -73,11 +77,7 @@ if (isset($_GET['contact_id'])) {
                         <?php } ?>
                     </div>
                     <hr>
-                    <h3><?php echo $contact_name; ?></h3>
-                    <?php if (!empty($contact_title)) { ?>
-                        <div class="mb-3 text-secondary"><?php echo $contact_title; ?></div>
-                    <?php } ?>
-                    <?php if (!empty($contact_title)) { ?>
+                    <?php if (!empty($location_name)) { ?>
                         <div class="mb-1"><i class="fa fa-fw fa-map-marker-alt text-secondary mr-3"></i><?php echo $location_name_display; ?></div>
                     <?php } ?>
                     <?php if (!empty($contact_email)) { ?>
@@ -267,8 +267,6 @@ if (isset($_GET['contact_id'])) {
                 </div>
             </div>
 
-
-
             <div class="card card-dark <?php if ($login_count == 0) { echo "d-none"; } ?>">
                 <div class="card-header">
                     <h3 class="card-title"><i class="fa fa-fw fa-key"></i> Passwords</h3>
@@ -363,7 +361,6 @@ if (isset($_GET['contact_id'])) {
                 </div>
             </div>
 
-
             <div class="card card-dark <?php if ($software_count == 0) { echo "d-none"; } ?>">
                 <div class="card-header">
                     <h3 class="card-title"><i class="fa fa-fw fa-cube"></i> Licenses</h3>
@@ -450,9 +447,6 @@ if (isset($_GET['contact_id'])) {
                 </div>
             </div>
 
-
-
-
             <div class="card card-dark <?php if ($ticket_count == 0) { echo "d-none"; } ?>">
                 <div class="card-header">
                     <h3 class="card-title"><i class="fa fa-fw fa-life-ring"></i> Tickets</h3>
diff --git a/clients.php b/clients.php
index 85679ca3..7278c7eb 100644
--- a/clients.php
+++ b/clients.php
@@ -166,8 +166,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
         <thead class="<?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
           <tr>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sortby; ?>&sortby=client_name&order=<?php echo $order_display; ?>">Name</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sortby; ?>&sortby=location_city&order=<?php echo $order_display; ?>">Address </a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sortby; ?>&sortby=contact_name&order=<?php echo $order_display; ?>">Contact</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sortby; ?>&sortby=location_city&order=<?php echo $order_display; ?>">Primary Address </a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sortby; ?>&sortby=contact_name&order=<?php echo $order_display; ?>">Primary Contact</a></th>
             <?php if ($session_user_role == 3 || $session_user_role == 1 && $config_module_enable_accounting == 1) { ?> <th class="text-right">Billing</th> <?php } ?>
             <?php if ($session_user_role == 3) { ?> <th class="text-center">Action</th> <?php } ?>
           </tr>
diff --git a/inc_alert_feedback.php b/inc_alert_feedback.php
index b3a3d0b0..4b118909 100644
--- a/inc_alert_feedback.php
+++ b/inc_alert_feedback.php
@@ -5,20 +5,42 @@ if (!empty($_SESSION['alert_message'])) {
     if (!isset($_SESSION['alert_type'])) {
         $_SESSION['alert_type'] = "success";
     }
-  ?>
+?>
 
-    <script type="text/javascript">toastr.<?php echo $_SESSION['alert_type']; ?>("<?php echo $_SESSION['alert_message']; ?>")</script>
+<script type="text/javascript">
 
-  <?php
+toastr.options = {
+  "closeButton": false,
+  "debug": false,
+  "newestOnTop": false,
+  "progressBar": false,
+  "positionClass": "toast-top-center",
+  "preventDuplicates": false,
+  "onclick": null,
+  "showDuration": "300",
+  "hideDuration": "1000",
+  "timeOut": "5000",
+  "extendedTimeOut": "1000",
+  "showEasing": "swing",
+  "hideEasing": "linear",
+  "showMethod": "fadeIn",
+  "hideMethod": "fadeOut"
+}    
 
-  unset($_SESSION['alert_type']);
-  unset($_SESSION['alert_message']);
+toastr["<?php echo $_SESSION['alert_type']; ?>"]("<?php echo $_SESSION['alert_message']; ?>")
+
+</script>
+
+<?php
+
+    unset($_SESSION['alert_type']);
+    unset($_SESSION['alert_message']);
 
 }
 
 //Set Records Per Page
 if (empty($_SESSION['records_per_page'])) {
-  $_SESSION['records_per_page'] = 10;
+    $_SESSION['records_per_page'] = 10;
 }
 
 ?>
\ No newline at end of file
diff --git a/inc_client_top_head.php b/inc_client_top_head.php
index 8f2a23bb..3f762280 100644
--- a/inc_client_top_head.php
+++ b/inc_client_top_head.php
@@ -42,7 +42,7 @@ $location_phone = formatPhoneNumber($location_phone);
         ?>
       </div>
       <div class="col-md border-left">
-        <h4 class="text-secondary">Contact</h4>
+        <h4 class="text-secondary">Primary Contact</h4>
         <?php
         if (!empty($contact_name)) {
         ?>