diff --git a/user/clients.php b/user/clients.php
index cf7f56d8..47df720f 100644
--- a/user/clients.php
+++ b/user/clients.php
@@ -109,7 +109,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <input type="hidden" name="leads" value="<?php echo $leads_filter; ?>">
             <input type="hidden" name="archived" value="<?php echo $archived; ?>">
             <div class="row">
-                <div class="col-md-4">
+                <div class="col-md-5">
                     <div class="form-group">
                         <div class="input-group">
                             <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search <?php if($leads_filter == 0){ echo "clients"; } else { echo "leads"; } ?>" autofocus>
@@ -120,21 +120,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </div>
                     </div>
                 </div>
-                <div class="col-md-8">
+                <div class="col-md-7">
                     <div class="btn-toolbar form-group float-right">
                         <div class="btn-group mr-2">
-                            <a href="?leads=0" class="btn btn-<?php if ($leads_filter == 0){ echo "primary"; } else { echo "default"; } ?>"><i class="fa fa-fw fa-user-friends mr-2"></i>Clients</a>
-                            <a href="?leads=1" class="btn btn-<?php if ($leads_filter == 1){ echo "primary"; } else { echo "default"; } ?>"><i class="fa fa-fw fa-bullhorn mr-2"></i>Leads</a>
+                            <a href="?leads=0" class="btn btn-<?php if ($leads_filter == 0){ echo "primary"; } else { echo "default"; } ?>" title="Clients"><i class="fa fa-fw fa-user-friends"></i><span class="d-none d-sm-inline ml-2">Clients</span></a>
+                            <a href="?leads=1" class="btn btn-<?php if ($leads_filter == 1){ echo "primary"; } else { echo "default"; } ?>"><i class="fa fa-fw fa-bullhorn"></i><span class="d-none d-sm-inline ml-2">Leads</span></a>
                         </div>
 
                         <div class="btn-group">
                             <a href="?<?php echo $url_query_strings_sort ?>&archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>" 
                                 class="btn btn-<?php if ($archived == 1) { echo "primary"; } else { echo "default"; } ?>">
-                                <i class="fa fa-fw fa-archive mr-2"></i>Archived
+                                <i class="fa fa-fw fa-archive"></i><span class="d-none d-sm-inline ml-2">Archived</span>
                             </a>
                             <div class="dropdown ml-2" id="bulkActionButton" hidden>
                                 <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
-                                    <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
+                                    <i class="fas fa-fw fa-layer-group"></i><span class="d-none d-sm-inline ml-2">Action</span> (<span id="selectedCount">0</span>)
                                 </button>
                                 <div class="dropdown-menu">
                                     <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditHourlyRateModal">
@@ -286,345 +286,345 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         </form>
     </div>
     
-        <form id="bulkActions" action="post.php" method="post" enctype="multipart/form-data">
-            <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-            <div class="table-responsive-sm">
-                <table class="table table-hover mb-0">
-                    <thead class="<?php if ($num_rows[0] == 0) { echo "d-none"; } ?> text-nowrap bg-light">
+    <form id="bulkActions" action="post.php" method="post" enctype="multipart/form-data">
+        <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+        <div class="table-responsive-sm">
+            <table class="table table-hover mb-0">
+                <thead class="<?php if ($num_rows[0] == 0) { echo "d-none"; } ?> text-nowrap bg-light">
+                <tr>
+                    <td class="pr-0">
+                        <div class="form-check">
+                            <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
+                        </div>
+                    </td>
+                    <th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
+                            Client Name <?php if ($sort == 'client_name') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=location_city&order=<?php echo $disp; ?>">
+                            Primary Location <?php if ($sort == 'location_city') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_name&order=<?php echo $disp; ?>">
+                            Primary Contact
+                            <?php if ($sort == 'contact_name') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th></th>
+                    <?php if ((lookupUserPermission("module_financial") >= 1) && $config_module_enable_accounting == 1) { ?> <th class="text-right">Billing</th> <?php } ?>
+                    <?php if (lookupUserPermission("module_client") >= 2) { ?> <th class="text-center">Action</th> <?php } ?>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
+
+                while ($row = mysqli_fetch_array($sql)) {
+                    $client_id = intval($row['client_id']);
+                    $client_name = nullable_htmlentities($row['client_name']);
+                    $client_type = nullable_htmlentities($row['client_type']);
+                    $location_id = intval($row['location_id']);
+                    $location_country = nullable_htmlentities($row['location_country']);
+                    $location_address = nullable_htmlentities($row['location_address']);
+                    $location_city = nullable_htmlentities($row['location_city']);
+                    $location_state = nullable_htmlentities($row['location_state']);
+                    $location_zip = nullable_htmlentities($row['location_zip']);
+                    if (empty($location_address) && empty($location_city) && empty($location_state) && empty($location_zip)) {
+                        $location_address_display = "-";
+                    } else {
+                        $location_address_display = "<div class='media'><i class='fa fa-fw fa-map-marker-alt text-secondary mt-1 mr-2'></i><div class='media-body'>$location_address<div>$location_city $location_state $location_zip</div><div><small>$location_country</small></div></div></div>";
+                    }
+                    $contact_id = intval($row['contact_id']);
+                    $contact_name = nullable_htmlentities($row['contact_name']);
+                    $contact_title = nullable_htmlentities($row['contact_title']);
+                    $contact_phone_country_code = nullable_htmlentities($row['contact_phone_country_code']);
+                    $contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code));
+                    $contact_extension = nullable_htmlentities($row['contact_extension']);
+                    $contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']);
+                    $contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code));
+                    $contact_email = nullable_htmlentities($row['contact_email']);
+                    $client_website = nullable_htmlentities($row['client_website']);
+                    $client_rate = floatval($row['client_rate']);
+                    $client_currency_code = nullable_htmlentities($row['client_currency_code']);
+                    $client_net_terms = intval($row['client_net_terms']);
+                    $client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']);
+                    $client_referral = nullable_htmlentities($row['client_referral']);
+                    $client_abbreviation = nullable_htmlentities($row['client_abbreviation']);
+                    $client_notes = nullable_htmlentities($row['client_notes']);
+                    $client_created_at = date('Y-m-d', strtotime($row['client_created_at']));
+                    $client_updated_at = nullable_htmlentities($row['client_updated_at']);
+                    $client_archived_at = nullable_htmlentities($row['client_archived_at']);
+                    $client_is_lead = intval($row['client_lead']);
+
+                    // Abbreviation
+                    if (empty($client_abbreviation)) {
+                        $client_abbreviation = shortenClient($client_name);
+                    }
+
+                    // Counts
+                    
+                    // Contact Count
+                    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL"));
+                    $contact_count = $row['num'];
+                    if ($contact_count) { 
+                        $contact_count_display = "<a href='contacts.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-dark p-2' title='Contacts ($contact_count)'><i class='fas fa-fw fa-users mr-2'></i>$contact_count</a>";
+                    } else {
+                        $contact_count_display = '';
+                    }
+
+                    // Vendors Count
+                    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_client_id = $client_id AND vendor_archived_at IS NULL"));
+                    $vendor_count = $row['num'];
+                    if ($vendor_count) { 
+                        $vendor_count_display = "<a href='vendors.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-dark p-2' title='Vendors ($vendor_count)'><i class='fas fa-fw fa-building mr-2'></i>$vendor_count</a>";
+                    } else {
+                        $vendor_count_display = '';
+                    }
+                    
+                    // Asset Count
+                    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL"));
+                    $asset_count = $row['num'];
+                    if ($asset_count) { 
+                        $asset_count_display = "<a href='assets.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Assets ($asset_count)'><i class='fas fa-fw fa-desktop mr-2'></i>$asset_count</a>";
+                    } else {
+                        $asset_count_display = '';
+                    }
+                    
+                    // Credential Count
+                    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_client_id = $client_id AND credential_archived_at IS NULL"));
+                    $credential_count = $row['num'];
+                    if ($credential_count) { 
+                        $credential_count_display = "<a href='credentials.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Credentials ($credential_count)'><i class='fas fa-fw fa-key mr-2'></i>$credential_count</a>";
+                    } else {
+                        $credential_count_display = '';
+                    }
+                    
+                    // Software Count
+                    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_client_id = $client_id AND software_archived_at IS NULL"));
+                    $software_count = $row['num'];
+                    if ($software_count) { 
+                        $software_count_display = "<a href='software.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Licenses ($software_count)'><i class='fas fa-fw fa-cube mr-2'></i>$software_count</a>";
+                    } else {
+                        $software_count_display = '';
+                    }
+
+                    // Ticket Count
+                    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_client_id = $client_id AND ticket_archived_at IS NULL"));
+                    $ticket_count = $row['num'];
+                    if ($ticket_count) { 
+                        $ticket_count_display = "<a href='tickets.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Tickets ($ticket_count)'><i class='fas fa-fw fa-life-ring mr-2'></i>$ticket_count</a>";
+                    } else {
+                        $ticket_count_display = '';
+                    }
+
+                    // Client Tags
+
+                    $client_tag_name_display_array = array();
+                    $client_tag_id_array = array();
+                    $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_id = $client_id ORDER BY tag_name ASC");
+                    while ($row = mysqli_fetch_array($sql_client_tags)) {
+
+                        $client_tag_id = intval($row['tag_id']);
+                        $client_tag_name = nullable_htmlentities($row['tag_name']);
+                        $client_tag_color = nullable_htmlentities($row['tag_color']);
+                        if (empty($client_tag_color)) {
+                            $client_tag_color = "dark";
+                        }
+                        $client_tag_icon = nullable_htmlentities($row['tag_icon']);
+                        if (empty($client_tag_icon)) {
+                            $client_tag_icon = "tag";
+                        }
+
+                        $client_tag_id_array[] = $client_tag_id;
+                        $client_tag_name_display_array[] = "<a href='clients.php?tags[]=$client_tag_id'><span class='badge text-light p-1 mr-1' style='background-color: $client_tag_color;'><i class='fa fa-fw fa-$client_tag_icon mr-2'></i>$client_tag_name</span></a>";
+                    }
+                    $client_tags_display = implode('', $client_tag_name_display_array);
+
+                    //Add up all the payments for the invoice and get the total amount paid to the invoice
+                    $sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable' ");
+                    $row = mysqli_fetch_array($sql_invoice_amounts);
+
+                    $invoice_amounts = floatval($row['invoice_amounts']);
+
+                    $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id");
+                    $row = mysqli_fetch_array($sql_amount_paid);
+
+                    $amount_paid = floatval($row['amount_paid']);
+
+                    $balance = $invoice_amounts - $amount_paid;
+                    //set Text color on balance
+                    if ($balance > 0) {
+                        $balance_text_color = "text-danger font-weight-bold";
+                    } else {
+                        $balance_text_color = "";
+                    }
+
+                    // Get Credit Balance
+                    $sql_credit_balance = mysqli_query($mysqli, "SELECT SUM(credit_amount) AS credit_balance FROM credits WHERE credit_client_id = $client_id");
+                    $row = mysqli_fetch_array($sql_credit_balance);
+
+                    $credit_balance = floatval($row['credit_balance']);
+
+                    //Get Monthly Recurring Total
+                    $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND recurring_invoice_client_id = $client_id");
+                    $row = mysqli_fetch_array($sql_recurring_monthly_total);
+
+                    $recurring_monthly_total = floatval($row['recurring_monthly_total']);
+
+                    //Get Yearly Recurring Total
+                    $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND recurring_invoice_client_id = $client_id");
+                    $row = mysqli_fetch_array($sql_recurring_yearly_total);
+
+                    $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12;
+
+                    $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total;
+
+                    ?>
                     <tr>
-                        <td class="pr-0">
+                        <td class="pr-0 bg-light">
                             <div class="form-check">
-                                <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
+                                <input class="form-check-input bulk-select" type="checkbox" name="client_ids[]" value="<?php echo $client_id ?>">
                             </div>
                         </td>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
-                                Client Name <?php if ($sort == 'client_name') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=location_city&order=<?php echo $disp; ?>">
-                                Primary Location <?php if ($sort == 'location_city') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_name&order=<?php echo $disp; ?>">
-                                Primary Contact
-                                <?php if ($sort == 'contact_name') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th></th>
-                        <?php if ((lookupUserPermission("module_financial") >= 1) && $config_module_enable_accounting == 1) { ?> <th class="text-right">Billing</th> <?php } ?>
-                        <?php if (lookupUserPermission("module_client") >= 2) { ?> <th class="text-center">Action</th> <?php } ?>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php
+                        <td>
+                            <a data-toggle="tooltip" data-placement="right" title="Client ID: <?php echo $client_id; ?>" class="font-weight-bold h6" href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
 
-                    while ($row = mysqli_fetch_array($sql)) {
-                        $client_id = intval($row['client_id']);
-                        $client_name = nullable_htmlentities($row['client_name']);
-                        $client_type = nullable_htmlentities($row['client_type']);
-                        $location_id = intval($row['location_id']);
-                        $location_country = nullable_htmlentities($row['location_country']);
-                        $location_address = nullable_htmlentities($row['location_address']);
-                        $location_city = nullable_htmlentities($row['location_city']);
-                        $location_state = nullable_htmlentities($row['location_state']);
-                        $location_zip = nullable_htmlentities($row['location_zip']);
-                        if (empty($location_address) && empty($location_city) && empty($location_state) && empty($location_zip)) {
-                            $location_address_display = "-";
-                        } else {
-                            $location_address_display = "<i class='fa fa-fw fa-map-marker-alt text-secondary mr-2'></i>$location_address<br><i class='fa fa-fw mr-2'></i>$location_city $location_state $location_zip<br><i class='fa fa-fw mr-2'></i><small>$location_country</small>";
-                        }
-                        $contact_id = intval($row['contact_id']);
-                        $contact_name = nullable_htmlentities($row['contact_name']);
-                        $contact_title = nullable_htmlentities($row['contact_title']);
-                        $contact_phone_country_code = nullable_htmlentities($row['contact_phone_country_code']);
-                        $contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code));
-                        $contact_extension = nullable_htmlentities($row['contact_extension']);
-                        $contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']);
-                        $contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code));
-                        $contact_email = nullable_htmlentities($row['contact_email']);
-                        $client_website = nullable_htmlentities($row['client_website']);
-                        $client_rate = floatval($row['client_rate']);
-                        $client_currency_code = nullable_htmlentities($row['client_currency_code']);
-                        $client_net_terms = intval($row['client_net_terms']);
-                        $client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']);
-                        $client_referral = nullable_htmlentities($row['client_referral']);
-                        $client_abbreviation = nullable_htmlentities($row['client_abbreviation']);
-                        $client_notes = nullable_htmlentities($row['client_notes']);
-                        $client_created_at = date('Y-m-d', strtotime($row['client_created_at']));
-                        $client_updated_at = nullable_htmlentities($row['client_updated_at']);
-                        $client_archived_at = nullable_htmlentities($row['client_archived_at']);
-                        $client_is_lead = intval($row['client_lead']);
+                            <?php
+                            if (!empty($client_type)) {
+                            ?>
+                                <div class="text-secondary mt-1">
+                                    <?php echo $client_type; ?>
+                                </div>
+                            <?php } ?>
+                            <?php
+                            if (!empty($client_tags_display)) { ?>
+                                <div class="mt-1">
+                                    <?php echo $client_tags_display; ?>
+                                </div>
+                            <?php } ?>
+                            <div class="mt-1 text-secondary">
+                                <small><strong>Abbreviation: </strong> <?php echo $client_abbreviation; ?></small><br>
+                                <small><strong>Created: </strong> <?php echo $client_created_at; ?></small><br>
+                            </div>
 
-                        // Abbreviation
-                        if (empty($client_abbreviation)) {
-                            $client_abbreviation = shortenClient($client_name);
-                        }
-
-                        // Counts
-                        
-                        // Contact Count
-                        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL"));
-                        $contact_count = $row['num'];
-                        if ($contact_count) { 
-                            $contact_count_display = "<a href='contacts.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-dark p-2' title='Contacts ($contact_count)'><i class='fas fa-fw fa-users mr-2'></i>$contact_count</a>";
-                        } else {
-                            $contact_count_display = '';
-                        }
-
-                        // Vendors Count
-                        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_client_id = $client_id AND vendor_archived_at IS NULL"));
-                        $vendor_count = $row['num'];
-                        if ($vendor_count) { 
-                            $vendor_count_display = "<a href='vendors.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-dark p-2' title='Vendors ($vendor_count)'><i class='fas fa-fw fa-building mr-2'></i>$vendor_count</a>";
-                        } else {
-                            $vendor_count_display = '';
-                        }
-                        
-                        // Asset Count
-                        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL"));
-                        $asset_count = $row['num'];
-                        if ($asset_count) { 
-                            $asset_count_display = "<a href='assets.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Assets ($asset_count)'><i class='fas fa-fw fa-desktop mr-2'></i>$asset_count</a>";
-                        } else {
-                            $asset_count_display = '';
-                        }
-                        
-                        // Credential Count
-                        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_client_id = $client_id AND credential_archived_at IS NULL"));
-                        $credential_count = $row['num'];
-                        if ($credential_count) { 
-                            $credential_count_display = "<a href='credentials.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Credentials ($credential_count)'><i class='fas fa-fw fa-key mr-2'></i>$credential_count</a>";
-                        } else {
-                            $credential_count_display = '';
-                        }
-                        
-                        // Software Count
-                        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_client_id = $client_id AND software_archived_at IS NULL"));
-                        $software_count = $row['num'];
-                        if ($software_count) { 
-                            $software_count_display = "<a href='software.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Licenses ($software_count)'><i class='fas fa-fw fa-cube mr-2'></i>$software_count</a>";
-                        } else {
-                            $software_count_display = '';
-                        }
-
-                        // Ticket Count
-                        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_client_id = $client_id AND ticket_archived_at IS NULL"));
-                        $ticket_count = $row['num'];
-                        if ($ticket_count) { 
-                            $ticket_count_display = "<a href='tickets.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Tickets ($ticket_count)'><i class='fas fa-fw fa-life-ring mr-2'></i>$ticket_count</a>";
-                        } else {
-                            $ticket_count_display = '';
-                        }
-
-                        // Client Tags
-
-                        $client_tag_name_display_array = array();
-                        $client_tag_id_array = array();
-                        $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_id = $client_id ORDER BY tag_name ASC");
-                        while ($row = mysqli_fetch_array($sql_client_tags)) {
-
-                            $client_tag_id = intval($row['tag_id']);
-                            $client_tag_name = nullable_htmlentities($row['tag_name']);
-                            $client_tag_color = nullable_htmlentities($row['tag_color']);
-                            if (empty($client_tag_color)) {
-                                $client_tag_color = "dark";
-                            }
-                            $client_tag_icon = nullable_htmlentities($row['tag_icon']);
-                            if (empty($client_tag_icon)) {
-                                $client_tag_icon = "tag";
+                        </td>
+                        <td class="text-nowrap"><?php echo $location_address_display; ?></td>
+                        <td class="text-nowrap">
+                            <?php
+                            if (empty($contact_name) && empty($contact_phone) && empty($contact_mobile) && empty($client_email)) {
+                                echo "-";
                             }
 
-                            $client_tag_id_array[] = $client_tag_id;
-                            $client_tag_name_display_array[] = "<a href='clients.php?tags[]=$client_tag_id'><span class='badge text-light p-1 mr-1' style='background-color: $client_tag_color;'><i class='fa fa-fw fa-$client_tag_icon mr-2'></i>$client_tag_name</span></a>";
-                        }
-                        $client_tags_display = implode('', $client_tag_name_display_array);
+                            if (!empty($contact_name)) { ?>
+                                <div class="text-bold">   
+                                    <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><a href="#"
+                                        data-toggle="ajax-modal"
+                                        data-modal-size="lg"
+                                        data-ajax-url="ajax/ajax_contact_details.php?client_id=<?php echo $client_id; ?>"
+                                        data-ajax-id="<?php echo $contact_id; ?>"><?php echo $contact_name; ?>
+                                     </a>
+                                </div>
+                            <?php } else {
+                                echo "-";
+                            }
 
-                        //Add up all the payments for the invoice and get the total amount paid to the invoice
-                        $sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable' ");
-                        $row = mysqli_fetch_array($sql_invoice_amounts);
+                            if (!empty($contact_phone)) { ?>
+                                <div class="mt-1">
+                                    <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $contact_phone; ?> <?php if (!empty($contact_extension)) { echo "x$contact_extension"; } ?>
+                                </div>
+                            <?php }
 
-                        $invoice_amounts = floatval($row['invoice_amounts']);
+                            if (!empty($contact_mobile)) { ?>
+                                <div class="mt-1">
+                                    <i class="fa fa-fw fa-mobile-alt text-secondary mr-2"></i><?php echo $contact_mobile; ?>
+                                </div>
+                            <?php }
 
-                        $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id");
-                        $row = mysqli_fetch_array($sql_amount_paid);
+                            if (!empty($contact_email)) { ?>
+                                <div class="mt-1">
+                                    <i class="fa fa-fw fa-envelope text-secondary mr-2"></i><a href="mailto:<?php echo $contact_email; ?>"><?php echo $contact_email; ?></a><button class='btn btn-sm clipboardjs' type="button" data-clipboard-text='<?php echo $contact_email; ?>'><i class='far fa-copy text-secondary'></i></button>
+                                </div>
+                            <?php } ?>
+                        </td>
 
-                        $amount_paid = floatval($row['amount_paid']);
+                        <td>
+                            <?php echo "$contact_count_display$vendor_count_display$asset_count_display$credential_count_display$software_count_display$ticket_count_display"; ?>
+                        </td>
 
-                        $balance = $invoice_amounts - $amount_paid;
-                        //set Text color on balance
-                        if ($balance > 0) {
-                            $balance_text_color = "text-danger font-weight-bold";
-                        } else {
-                            $balance_text_color = "";
-                        }
-
-                        // Get Credit Balance
-                        $sql_credit_balance = mysqli_query($mysqli, "SELECT SUM(credit_amount) AS credit_balance FROM credits WHERE credit_client_id = $client_id");
-                        $row = mysqli_fetch_array($sql_credit_balance);
-
-                        $credit_balance = floatval($row['credit_balance']);
-
-                        //Get Monthly Recurring Total
-                        $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND recurring_invoice_client_id = $client_id");
-                        $row = mysqli_fetch_array($sql_recurring_monthly_total);
-
-                        $recurring_monthly_total = floatval($row['recurring_monthly_total']);
-
-                        //Get Yearly Recurring Total
-                        $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND recurring_invoice_client_id = $client_id");
-                        $row = mysqli_fetch_array($sql_recurring_yearly_total);
-
-                        $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12;
-
-                        $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total;
-
-                        ?>
-                        <tr>
-                            <td class="pr-0 bg-light">
-                                <div class="form-check">
-                                    <input class="form-check-input bulk-select" type="checkbox" name="client_ids[]" value="<?php echo $client_id ?>">
+                        <!-- Show Billing if perms & if accounting module is enabled -->
+                        <?php if ((lookupUserPermission("module_financial") >= 1) && $config_module_enable_accounting == 1) { ?>
+                            <td class="text-right">
+                                <div class="d-flex justify-content-between">
+                                    <span class="text-secondary">Balance</span>
+                                    <span class="<?php echo $balance_text_color; ?>"><?php echo numfmt_format_currency($currency_format, $balance, $session_company_currency); ?></span>
+                                </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>
+                                </div>
+                                <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>
+                                </div>
+                                <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>
+                                </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>
                                 </div>
                             </td>
+                        <?php } ?>
+
+                        <!-- Actions -->
+                        <?php if (lookupUserPermission("module_client") >= 2) { ?>
                             <td>
-                                <a data-toggle="tooltip" data-placement="right" title="Client ID: <?php echo $client_id; ?>" class="font-weight-bold h6" href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
-
-                                <?php
-                                if (!empty($client_type)) {
-                                ?>
-                                    <div class="text-secondary mt-1">
-                                        <?php echo $client_type; ?>
-                                    </div>
-                                <?php } ?>
-                                <?php
-                                if (!empty($client_tags_display)) { ?>
-                                    <div class="mt-1">
-                                        <?php echo $client_tags_display; ?>
-                                    </div>
-                                <?php } ?>
-                                <div class="mt-1 text-secondary">
-                                    <small><strong>Abbreviation: </strong> <?php echo $client_abbreviation; ?></small><br>
-                                    <small><strong>Created: </strong> <?php echo $client_created_at; ?></small><br>
-                                </div>
-
-                            </td>
-                            <td><?php echo $location_address_display; ?></td>
-                            <td>
-                                <?php
-                                if (empty($contact_name) && empty($contact_phone) && empty($contact_mobile) && empty($client_email)) {
-                                    echo "-";
-                                }
-
-                                if (!empty($contact_name)) { ?>
-                                    <div class="text-bold">   
-                                        <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><a href="#"
+                                <div class="dropdown dropleft text-center">
+                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                        <i class="fas fa-ellipsis-h"></i>
+                                    </button>
+                                    <div class="dropdown-menu">
+                                        <a class="dropdown-item" href="#"
                                             data-toggle="ajax-modal"
-                                            data-modal-size="lg"
-                                            data-ajax-url="ajax/ajax_contact_details.php?client_id=<?php echo $client_id; ?>"
-                                            data-ajax-id="<?php echo $contact_id; ?>"><?php echo $contact_name; ?>
-                                         </a>
-                                    </div>
-                                <?php } else {
-                                    echo "-";
-                                }
+                                            data-ajax-url="modals/client_edit.php"
+                                            data-ajax-id="<?php echo $client_id; ?>">
+                                            <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                        </a>
 
-                                if (!empty($contact_phone)) { ?>
-                                    <div class="mt-1">
-                                        <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $contact_phone; ?> <?php if (!empty($contact_extension)) { echo "x$contact_extension"; } ?>
+                                        <?php if ($client_archived_at) { ?>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-info confirm-link" href="post.php?restore_client=<?php echo $client_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                            <i class="fas fa-fw fa-redo mr-2"></i>Restore
+                                        </a>
+                                        <?php } else { ?>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger confirm-link" href="post.php?archive_client=<?php echo $client_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                            <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                                        </a>
+                                        <?php } ?>
                                     </div>
-                                <?php }
-
-                                if (!empty($contact_mobile)) { ?>
-                                    <div class="mt-1">
-                                        <i class="fa fa-fw fa-mobile-alt text-secondary mr-2"></i><?php echo $contact_mobile; ?>
-                                    </div>
-                                <?php }
-
-                                if (!empty($contact_email)) { ?>
-                                    <div class="mt-1">
-                                        <i class="fa fa-fw fa-envelope text-secondary mr-2"></i><a href="mailto:<?php echo $contact_email; ?>"><?php echo $contact_email; ?></a><button class='btn btn-sm clipboardjs' type="button" data-clipboard-text='<?php echo $contact_email; ?>'><i class='far fa-copy text-secondary'></i></button>
-                                    </div>
-                                <?php } ?>
+                                </div>
                             </td>
+                        <?php } ?>
+                    </tr>
 
-                            <td>
-                                <?php echo "$contact_count_display$vendor_count_display$asset_count_display$credential_count_display$software_count_display$ticket_count_display"; ?>
-                            </td>
+                    <?php
+                } ?>
 
-                            <!-- Show Billing if perms & if accounting module is enabled -->
-                            <?php if ((lookupUserPermission("module_financial") >= 1) && $config_module_enable_accounting == 1) { ?>
-                                <td class="text-right">
-                                    <div class="d-flex justify-content-between">
-                                        <span class="text-secondary">Balance</span>
-                                        <span class="<?php echo $balance_text_color; ?>"><?php echo numfmt_format_currency($currency_format, $balance, $session_company_currency); ?></span>
-                                    </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>
-                                    </div>
-                                    <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>
-                                    </div>
-                                    <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>
-                                    </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>
-                                    </div>
-                                </td>
-                            <?php } ?>
-
-                            <!-- Actions -->
-                            <?php if (lookupUserPermission("module_client") >= 2) { ?>
-                                <td>
-                                    <div class="dropdown dropleft text-center">
-                                        <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                                            <i class="fas fa-ellipsis-h"></i>
-                                        </button>
-                                        <div class="dropdown-menu">
-                                            <a class="dropdown-item" href="#"
-                                                data-toggle="ajax-modal"
-                                                data-ajax-url="modals/client_edit.php"
-                                                data-ajax-id="<?php echo $client_id; ?>">
-                                                <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                            </a>
-
-                                            <?php if ($client_archived_at) { ?>
-                                            <div class="dropdown-divider"></div>
-                                            <a class="dropdown-item text-info confirm-link" href="post.php?restore_client=<?php echo $client_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                                <i class="fas fa-fw fa-redo mr-2"></i>Restore
-                                            </a>
-                                            <?php } else { ?>
-                                            <div class="dropdown-divider"></div>
-                                            <a class="dropdown-item text-danger confirm-link" href="post.php?archive_client=<?php echo $client_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                                <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                            </a>
-                                            <?php } ?>
-                                        </div>
-                                    </div>
-                                </td>
-                            <?php } ?>
-                        </tr>
-
-                        <?php
-                    } ?>
-
-                    </tbody>
-                </table>
-            </div>
-            <?php 
-                require_once "modals/client_bulk_edit_industry.php";
-                require_once "modals/client_bulk_edit_referral.php";
-                require_once "modals/client_bulk_edit_hourly_rate.php";
-                require_once "modals/client_bulk_assign_tags.php"; 
-                require_once "modals/client_bulk_email.php";
-            ?>
-        </form>
+                </tbody>
+            </table>
+        </div>
+        <?php 
+            require_once "modals/client_bulk_edit_industry.php";
+            require_once "modals/client_bulk_edit_referral.php";
+            require_once "modals/client_bulk_edit_hourly_rate.php";
+            require_once "modals/client_bulk_assign_tags.php"; 
+            require_once "modals/client_bulk_email.php";
+        ?>
+    </form>
      <!-- Ends Card Body -->
     <?php require_once "../includes/filter_footer.php"; ?>
     
diff --git a/user/project_details.php b/user/project_details.php
index 5e13439b..2326d1ea 100644
--- a/user/project_details.php
+++ b/user/project_details.php
@@ -161,403 +161,390 @@ if (isset($_GET['project_id'])) {
 
     ?>
 
-    <!-- Breadcrumbs-->
-    <ol class="breadcrumb d-print-none">
-        <li class="breadcrumb-item">
-            <a href="projects.php">Projects</a>
-        </li>
-        <li class="breadcrumb-item active">Project Details</li>
-    </ol>
+<!-- Breadcrumbs-->
+<ol class="breadcrumb d-print-none">
+    <li class="breadcrumb-item">
+        <a href="projects.php">Projects</a>
+    </li>
+    <li class="breadcrumb-item active">Project Details</li>
+</ol>
 
-    <!-- Project Header -->
-    <div class="card card-body">
-        <div class="row">
-            <div class="col-sm-3">
-                <div class="media">
-                    <i class="fa fa-fw fa-2x fa-project-diagram text-secondary mr-3"></i>
-                    <div class="media-body">
-                        <h3 class="mb-0"><?php echo "$project_prefix$project_number$project_status_display<br><small>$project_name</small>"; ?></h3>
-                        <div><small class="text-secondary"><?php echo $project_description; ?></small></div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div><?php echo $client_name_display; ?></div>
-                <div><?php echo $project_manager_display; ?></div>
-                <div class='text-secondary'><i class='fa fa-fw fa-clock mr-2'></i><?php echo $project_due; ?></div>
-                <div><?php echo $project_completed_date_display; ?></div>
-                <!-- Time tracking -->
-                <?php if ($ticket_total_reply_time) { ?>
-                    <div>
-                        <i class="far fa-fw fa-clock text-secondary mr-2"></i>Total time worked: <?php echo $ticket_total_reply_time; ?>
-                    </div>
-                <?php } ?>
-            </div>
-
-            <div class="col-sm-3">
-                <?php if ($ticket_count) { ?>
-                    <div class="progress" style="height: 20px;">
-                        <i class="fa fas fa-fw fa-life-ring mr-2"></i>
-                        <div class="progress-bar bg-primary" style="width: <?php echo $tickets_closed_percent; ?>%;"><?php echo $closed_ticket_count; ?> / <?php echo $ticket_count; ?></div>
-                    </div>
-                <?php } ?>
-                <?php if ($task_count) { ?>
-                    <div class="progress mt-2" style="height: 20px;">
-                        <i class="fa fas fa-fw fa-tasks mr-2"></i>
-                        <div class="progress-bar bg-secondary" style="width: <?php echo $tasks_completed_percent; ?>%;"><?php echo $completed_task_count; ?> / <?php echo $task_count; ?></div>
-                    </div>
-                <?php } ?>
-                <?php if ($ticket_collaborators) { ?>
-                    <div class=mt-1>
-                        <i class="fas fa-fw fa-users mr-2 text-secondary"></i><?php echo $ticket_collaborators; ?>
-                    </div>
-                <?php } ?>
-            </div>
-
-            <div class="col-sm-3">
-                <div class="btn-group float-right d-print-none">
-                    <?php if (empty($project_completed_at)) { ?>
-                        <div class="dropdown mr-2">
-                            <button class="btn btn-primary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown">
-                                <i class="fas fa-fw fa-plus mr-2"></i>New
-                            </button>
-                            <div class="dropdown-menu">
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addTicketModal">
-                                    <i class="fas fa-fw fa-life-ring mr-2"></i>Ticket
-                                </a>
-                            </div>
-                        </div>
-                        <div class="dropdown">
-                            <button class="btn btn-outline-primary btn-sm mr-3" type="button" id="dropdownMenuButton" data-toggle="dropdown">
-                                <i class="fas fa-fw fa-link mr-2"></i>Link
-                            </button>
-                            <div class="dropdown-menu">
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#linkTicketModal">
-                                    <i class="fas fa-fw fa-life-ring mr-2"></i>Open Ticket
-                                </a>
-                                <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#linkClosedTicketModal">
-                                    <i class="fas fa-fw fa-life-ring mr-2"></i>Closed Ticket
-                                </a>
-                            </div>
-                        </div>
-                    <?php } ?>
-                    <?php if (($tickets_closed_percent == 100 || $tickets_resolved_percent == 100) && empty($project_completed_at)) { ?>
-                        <a class="btn btn-dark btn-sm confirm-link" href="post.php?close_project=<?php echo $project_id; ?>">
-                            <i class="fas fa-fw fa-check mr-2"></i>Close
-                        </a>
-                    <?php } ?>
-                    <div class="dropdown dropleft text-center ml-3">
-                        <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown">
-                            <i class="fas fa-fw fa-ellipsis-v"></i>
+<!-- Project Header -->
+<div class="card">
+    <div class="card-header">
+        <h5 class="card-title">
+            <i class="fas fa-project-diagram text-secondary mr-2"></i>
+            <span class="h4"><?= "$project_prefix$project_number$project_status_display" ?></span>
+        </h5>
+        <div class="card-tools d-print-none">
+            <div class="btn-group">
+                <?php if (empty($project_completed_at)) { ?>
+                    <div class="dropdown mr-2">
+                        <button class="btn btn-primary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown">
+                            <i class="fas fa-fw fa-plus mr-2"></i>New
                         </button>
                         <div class="dropdown-menu">
-                            <?php if (empty($project_completed_at)) { ?>
-                                <a class="dropdown-item" href="#"
-                                    data-toggle = "ajax-modal"
-                                    data-ajax-url = "ajax/ajax_project_edit.php"
-                                    data-ajax-id = "<?php echo $project_id; ?>"
-                                    >
-                                    <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                </a>
-                            <?php } ?>
-                            <?php if (!empty($project_completed_at) && empty($project_archived_at) && lookupUserPermission("module_support" >= 2)) { ?>
-                                <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?archive_project=<?php echo $project_id; ?>">
-                                    <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                </a>
-                            <?php } ?>
-                            <?php if (!empty($project_archived_at) && lookupUserPermission("module_support" >= 3)) { ?>
-                                <div class="dropdown-divider"></div>
-                                <a class="dropdown-item text-danger confirm-link" href="post.php?delete_project=<?php echo $project_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                    <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                </a>
-                            <?php } ?>
+                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addTicketModal">
+                                <i class="fas fa-fw fa-life-ring mr-2"></i>Ticket
+                            </a>
                         </div>
                     </div>
+                    <div class="dropdown">
+                        <button class="btn btn-outline-primary btn-sm mr-3" type="button" id="dropdownMenuButton" data-toggle="dropdown">
+                            <i class="fas fa-fw fa-link mr-2"></i>Link
+                        </button>
+                        <div class="dropdown-menu">
+                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#linkTicketModal">
+                                <i class="fas fa-fw fa-life-ring mr-2"></i>Open Ticket
+                            </a>
+                            <div class="dropdown-divider"></div>
+                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#linkClosedTicketModal">
+                                <i class="fas fa-fw fa-life-ring mr-2"></i>Closed Ticket
+                            </a>
+                        </div>
+                    </div>
+                <?php } ?>
+                <?php if (($tickets_closed_percent == 100 || $tickets_resolved_percent == 100) && empty($project_completed_at)) { ?>
+                    <a class="btn btn-dark btn-sm confirm-link" href="post.php?close_project=<?php echo $project_id; ?>">
+                        <i class="fas fa-fw fa-check mr-2"></i>Close
+                    </a>
+                <?php } ?>
+                <div class="dropdown dropleft text-center ml-3">
+                    <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown">
+                        <i class="fas fa-fw fa-ellipsis-v"></i>
+                    </button>
+                    <div class="dropdown-menu">
+                        <?php if (empty($project_completed_at)) { ?>
+                            <a class="dropdown-item" href="#"
+                                data-toggle = "ajax-modal"
+                                data-ajax-url = "ajax/ajax_project_edit.php"
+                                data-ajax-id = "<?php echo $project_id; ?>"
+                                >
+                                <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                            </a>
+                        <?php } ?>
+                        <?php if (!empty($project_completed_at) && empty($project_archived_at) && lookupUserPermission("module_support" >= 2)) { ?>
+                            <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?archive_project=<?php echo $project_id; ?>">
+                                <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                            </a>
+                        <?php } ?>
+                        <?php if (!empty($project_archived_at) && lookupUserPermission("module_support" >= 3)) { ?>
+                            <div class="dropdown-divider"></div>
+                            <a class="dropdown-item text-danger confirm-link" href="post.php?delete_project=<?php echo $project_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                            </a>
+                        <?php } ?>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
+</div>
 
-    <div class="row">
-        <div class="col-md-9">
+<div class="card-group mb-3">
+    <div class="card card-body">
+        <h5 class="mb-0"><?= $project_name ?></h5>
+        <div><small class="text-secondary"><?php echo $project_description; ?></small></div>
+    </div>
+    <div class="card card-body">
+        <div><?php echo $client_name_display; ?></div>
+        <div><?php echo $project_manager_display; ?></div>
+        <div class='text-secondary'><i class='fa fa-fw fa-clock mr-2'></i><?php echo $project_due; ?></div>
+        <div><?php echo $project_completed_date_display; ?></div>
+        <!-- Time tracking -->
+        <?php if ($ticket_total_reply_time) { ?>
+            <div>
+                <i class="far fa-fw fa-clock text-secondary mr-2"></i>Total time worked: <?php echo $ticket_total_reply_time; ?>
+            </div>
+        <?php } ?>
+    </div>
 
-            <!-- Tickets card -->
-            <?php if (mysqli_num_rows($sql_tickets) > 0) { ?>
-                <div class="card card-outline card-dark mb-3">
-                    <div class="card-header py-2">
+    <div class="card card-body">
+        <?php if ($ticket_count) { ?>
+            <div class="progress" style="height: 20px;">
+                <i class="fa fas fa-fw fa-life-ring mr-2"></i>
+                <div class="progress-bar bg-primary" style="width: <?php echo $tickets_closed_percent; ?>%;"><?php echo $closed_ticket_count; ?> / <?php echo $ticket_count; ?></div>
+            </div>
+        <?php } ?>
+        <?php if ($task_count) { ?>
+            <div class="progress mt-2" style="height: 20px;">
+                <i class="fa fas fa-fw fa-tasks mr-2"></i>
+                <div class="progress-bar bg-secondary" style="width: <?php echo $tasks_completed_percent; ?>%;"><?php echo $completed_task_count; ?> / <?php echo $task_count; ?></div>
+            </div>
+        <?php } ?>
+        <?php if ($ticket_collaborators) { ?>
+            <div class=mt-1>
+                <i class="fas fa-fw fa-users mr-2 text-secondary"></i><?php echo $ticket_collaborators; ?>
+            </div>
+        <?php } ?>
+    </div>
+</div>
 
-                        <h5 class="card-title mt-2 mb-2"><i class="fa fa-fw fa-life-ring mr-2"></i>Project Tickets</h5>
+<div class="row">
+    <div class="col-md-9">
 
-                        <div class="card-tools">
-                            <?php if (lookupUserPermission("module_support") >= 2) { ?>
-                                <div class="dropdown ml-2" id="bulkActionButton" hidden>
-                                    <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
-                                        <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
-                                    </button>
-                                    <div class="dropdown-menu">
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignTicketModal">
-                                            <i class="fas fa-fw fa-user-check mr-2"></i>Assign Tech
-                                        </a>
-                                        <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditCategoryTicketModal">
-                                            <i class="fas fa-fw fa-layer-group mr-2"></i>Set Category
-                                        </a>
-                                        <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditPriorityTicketModal">
-                                            <i class="fas fa-fw fa-thermometer-half mr-2"></i>Update Priority
-                                        </a>
-                                        <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkReplyTicketModal">
-                                            <i class="fas fa-fw fa-paper-plane mr-2"></i>Bulk Update/Reply
-                                        </a>
-                                        <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkMergeTicketModal">
-                                            <i class="fas fa-fw fa-clone mr-2"></i>Merge
-                                        </a>
-                                        <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkCloseTicketsModal">
-                                            <i class="fas fa-fw fa-check mr-2"></i>Resolve
-                                        </a>
-                                    </div>
+        <!-- Tickets card -->
+        <?php if (mysqli_num_rows($sql_tickets) > 0) { ?>
+            <div class="card card-outline card-dark mb-3">
+                <div class="card-header py-2">
+
+                    <h5 class="card-title mt-2 mb-2"><i class="fa fa-fw fa-life-ring mr-2"></i>Project Tickets</h5>
+
+                    <div class="card-tools">
+                        <?php if (lookupUserPermission("module_support") >= 2) { ?>
+                            <div class="dropdown ml-2" id="bulkActionButton" hidden>
+                                <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
+                                    <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
+                                </button>
+                                <div class="dropdown-menu">
+                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignTicketModal">
+                                        <i class="fas fa-fw fa-user-check mr-2"></i>Assign Tech
+                                    </a>
+                                    <div class="dropdown-divider"></div>
+                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditCategoryTicketModal">
+                                        <i class="fas fa-fw fa-layer-group mr-2"></i>Set Category
+                                    </a>
+                                    <div class="dropdown-divider"></div>
+                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditPriorityTicketModal">
+                                        <i class="fas fa-fw fa-thermometer-half mr-2"></i>Update Priority
+                                    </a>
+                                    <div class="dropdown-divider"></div>
+                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkReplyTicketModal">
+                                        <i class="fas fa-fw fa-paper-plane mr-2"></i>Bulk Update/Reply
+                                    </a>
+                                    <div class="dropdown-divider"></div>
+                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkMergeTicketModal">
+                                        <i class="fas fa-fw fa-clone mr-2"></i>Merge
+                                    </a>
+                                    <div class="dropdown-divider"></div>
+                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkCloseTicketsModal">
+                                        <i class="fas fa-fw fa-check mr-2"></i>Resolve
+                                    </a>
                                 </div>
-                            <?php } ?>
-                        </div>
-
-                    </div>
-
-                    <div class="card-body p-0">
-                        <form id="bulkActions" action="post.php" method="post">
-                            <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                            <div class="table-responsive-sm">
-                                <table class="table table-border table-hover">
-                                    <thead class="thead-light">
-                                    <tr>
-                                        <td class="bg-light pr-0">
-                                            <div class="form-check">
-                                                <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)" onkeydown="checkAll(this)">
-                                            </div>
-                                        </td>
-                                        <th>
-                                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_number&order=<?php echo $disp; ?>">
-                                                Ticket <?php if ($sort == 'ticket_number') { echo $order_icon; } ?>
-                                            </a>
-                                        </th>
-                                        <th>
-                                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_priority&order=<?php echo $disp; ?>">
-                                                Priority <?php if ($sort == 'ticket_priority') { echo $order_icon; } ?>
-                                            </a>
-                                        </th>
-                                        <th>
-                                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_status&order=<?php echo $disp; ?>">
-                                                Status <?php if ($sort == 'ticket_status') { echo $order_icon; } ?>
-                                            </a>
-                                        </th>
-                                        <th>
-                                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=user_name&order=<?php echo $disp; ?>">
-                                                Assigned <?php if ($sort == 'user_name') { echo $order_icon; } ?>
-                                            </a>
-                                        </th>
-                                        <th>
-                                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_updated_at&order=<?php echo $disp; ?>">
-                                                Last Response <?php if ($sort == 'ticket_updated_at') { echo $order_icon; } ?>
-                                            </a>
-                                        </th>
-                                        <th>
-                                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
-                                                Client <?php if ($sort == 'client_name') { echo $order_icon; } ?>
-                                            </a>
-                                        </th>
-                                    </tr>
-                                    </thead>
-                                    <tbody>
-                                    <?php
-
-                                    while ($row = mysqli_fetch_array($sql_tickets)) {
-                                        $ticket_id = intval($row['ticket_id']);
-                                        $ticket_prefix = nullable_htmlentities($row['ticket_prefix']);
-                                        $ticket_number = nullable_htmlentities($row['ticket_number']);
-                                        $ticket_subject = nullable_htmlentities($row['ticket_subject']);
-                                        $ticket_priority = nullable_htmlentities($row['ticket_priority']);
-                                        $ticket_status = intval($row['ticket_status']);
-                                        $ticket_status_name = nullable_htmlentities($row['ticket_status_name']);
-                                        $ticket_status_color = nullable_htmlentities($row['ticket_status_color']);
-                                        $ticket_billable = intval($row['ticket_billable']);
-                                        $ticket_created_at = nullable_htmlentities($row['ticket_created_at']);
-                                        $ticket_created_at_time_ago = timeAgo($row['ticket_created_at']);
-                                        $ticket_updated_at = nullable_htmlentities($row['ticket_updated_at']);
-                                        $ticket_updated_at_time_ago = timeAgo($row['ticket_updated_at']);
-                                        if (empty($ticket_updated_at)) {
-                                            if ($ticket_status == 5) {
-                                                $ticket_updated_at_display = "<p>Never</p>";
-                                            } else {
-                                                $ticket_updated_at_display = "<p class='text-danger'>Never</p>";
-                                            }
-                                        } else {
-                                            $ticket_updated_at_display = "$ticket_updated_at_time_ago<br><small class='text-secondary'>$ticket_updated_at</small>";
-                                        }
-                                        $ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']);
-
-                                        if ($ticket_priority == "High") {
-                                            $ticket_priority_display = "<span class='p-2 badge badge-danger'>$ticket_priority</span>";
-                                        } elseif ($ticket_priority == "Medium") {
-                                            $ticket_priority_display = "<span class='p-2 badge badge-warning'>$ticket_priority</span>";
-                                        } elseif ($ticket_priority == "Low") {
-                                            $ticket_priority_display = "<span class='p-2 badge badge-info'>$ticket_priority</span>";
-                                        } else{
-                                            $ticket_priority_display = "-";
-                                        }
-
-                                        $ticket_assigned_to = intval($row['ticket_assigned_to']);
-                                        if (empty($ticket_assigned_to)) {
-                                            if ($ticket_status == 5) {
-                                                $ticket_assigned_to_display = "<p>Not Assigned</p>";
-                                            } else {
-                                                $ticket_assigned_to_display = "<p class='text-danger'>Not Assigned</p>";
-                                            }
-                                        } else {
-                                            $ticket_assigned_to_display = nullable_htmlentities($row['user_name']);
-                                        }
-
-                                        $project_id = intval($row['ticket_project_id']);
-
-                                        $client_id = intval($row['client_id']);
-                                        $client_name = nullable_htmlentities($row['client_name']);
-
-                                        $contact_name = nullable_htmlentities($row['contact_name']);
-                                        $contact_email = nullable_htmlentities($row['contact_email']);
-                                        $contact_archived_at = nullable_htmlentities($row['contact_archived_at']);
-                                        if (empty($contact_archived_at)) {
-                                            $contact_archived_display = "";
-                                        } else {
-                                            $contact_archived_display = "Archived - ";
-                                        }
-                                        if (empty($contact_name)) {
-                                            $contact_display = "-";
-                                        } else {
-                                            $contact_display = "$contact_archived_display$contact_name<br><small class='text-secondary'>$contact_email</small>";
-                                        }
-
-                                        // Get who last updated the ticket - to be shown in the last Response column
-                                        $ticket_reply_type = "Client"; // Default to client for unreplied tickets
-                                        $ticket_reply_by_display = ""; // Default none
-                                        $sql_ticket_reply = mysqli_query($mysqli, "SELECT ticket_reply_type, contact_name, user_name FROM ticket_replies
-                                        LEFT JOIN users ON ticket_reply_by = user_id
-                                        LEFT JOIN contacts ON ticket_reply_by = contact_id
-                                        WHERE ticket_reply_ticket_id = $ticket_id
-                                        AND ticket_reply_archived_at IS NULL
-                                        ORDER BY ticket_reply_id DESC LIMIT 1"
-                                        );
-                                        $row = mysqli_fetch_array($sql_ticket_reply);
-
-                                        if ($row) {
-                                            $ticket_reply_type = nullable_htmlentities($row['ticket_reply_type']);
-                                            if ($ticket_reply_type == "Client") {
-                                                $ticket_reply_by_display = nullable_htmlentities($row['contact_name']);
-                                            } else {
-                                                $ticket_reply_by_display = nullable_htmlentities($row['user_name']);
-                                            }
-                                        }
-
-                                        ?>
-
-                                        <tr>
-                                            <td class="pr-0 bg-light">
-                                                <!-- Ticket Bulk Select (for open tickets) -->
-                                                <?php if (empty($ticket_closed_at)) { ?>
-                                                <div class="form-check">
-                                                    <input class="form-check-input bulk-select" type="checkbox" name="ticket_ids[]" value="<?php echo $ticket_id ?>">
-                                                </div>
-                                                <?php } ?>
-                                            </td>
-                                            <!-- Ticket Number / Subject -->
-                                            <td>
-                                                <a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>">
-                                                    <span class="badge badge-pill badge-secondary p-3 mr-2"><?php echo "$ticket_prefix$ticket_number"; ?></span>
-                                                    <?php echo $ticket_subject; ?>
-                                                </a>
-                                            </td>
-                                            <!-- Ticket Priority -->
-                                            <td><?php echo $ticket_priority_display; ?></a></td>
-
-                                            <!-- Ticket Status -->
-                                            <td>
-                                                <span class='badge badge-pill text-light p-2' style="background-color: <?php echo $ticket_status_color; ?>"><?php echo $ticket_status_name; ?></span>
-                                            </td>
-
-                                            <!-- Ticket Assigned agent -->
-                                            <td><?php echo $ticket_assigned_to_display; ?></td>
-
-                                            <!-- Ticket Last Response -->
-                                            <td>
-                                                <div><?php echo $ticket_updated_at_display; ?></div>
-                                                <div><?php echo $ticket_reply_by_display; ?></div>
-                                            </td>
-                                            <td><?php echo $client_name; ?></td>
-                                        </tr>
-
-
-                                    <?php } ?>
-
-                                    </tbody>
-                                </table>
                             </div>
-                            <?php require_once "modals/ticket_bulk_assign_modal.php"; ?>
-                            <?php require_once "modals/ticket_bulk_edit_category_modal.php"; ?>
-                            <?php require_once "modals/ticket_bulk_edit_priority_modal.php"; ?>
-                            <?php require_once "modals/ticket_bulk_reply_modal.php"; ?>
-                            <?php require_once "modals/ticket_bulk_merge_modal.php"; ?>
-                            <?php require_once "modals/ticket_bulk_resolve_modal.php"; ?>
-                        </form>
+                        <?php } ?>
                     </div>
+
                 </div>
-            <?php } ?>
-        </div>
 
-        <div class="col-md-3">
-
-            <!-- Tasks Card -->
-            <?php if (mysqli_num_rows($sql_tasks) > 0) { ?>
-                <div class="card card-outline card-dark">
-                    <div class="card-header py-3">
-                        <h5 class="card-title"><i class="fas fa-fw fa-tasks mr-2"></i>All Tasks</h5>
-                    </div>
-                    <div class="card-body p-0">
-                        <table class="table table-sm">
-                            <?php
-                            while($row = mysqli_fetch_array($sql_tasks)){
-                                $task_id = intval($row['task_id']);
-                                $task_name = nullable_htmlentities($row['task_name']);
-                                $task_completed_at = nullable_htmlentities($row['task_completed_at']);
-                                ?>
+                <div class="card-body p-0">
+                    <form id="bulkActions" action="post.php" method="post">
+                        <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+                        <div class="table-responsive-sm">
+                            <table class="table table-border table-hover">
+                                <thead class="thead-light">
                                 <tr>
-                                    <td>
-                                        <?php if ($task_completed_at) { ?>
-                                            <i class="far fa-check-square text-success mr-2"></i>
-                                        <?php } else { ?>
-                                            <a href="post.php?complete_task=<?php echo $task_id; ?>">
-                                                <i class="far fa-square text-secondary mr-2"></i>
-                                            </a>
-                                        <?php } ?>
-                                        <?php echo $task_name; ?>
+                                    <td class="bg-light pr-0">
+                                        <div class="form-check">
+                                            <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)" onkeydown="checkAll(this)">
+                                        </div>
                                     </td>
+                                    <th>
+                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_number&order=<?php echo $disp; ?>">
+                                            Ticket <?php if ($sort == 'ticket_number') { echo $order_icon; } ?>
+                                        </a>
+                                    </th>
+                                    <th>
+                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_priority&order=<?php echo $disp; ?>">
+                                            Priority <?php if ($sort == 'ticket_priority') { echo $order_icon; } ?>
+                                        </a>
+                                    </th>
+                                    <th>
+                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_status&order=<?php echo $disp; ?>">
+                                            Status <?php if ($sort == 'ticket_status') { echo $order_icon; } ?>
+                                        </a>
+                                    </th>
+                                    <th>
+                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=user_name&order=<?php echo $disp; ?>">
+                                            Assigned <?php if ($sort == 'user_name') { echo $order_icon; } ?>
+                                        </a>
+                                    </th>
+                                    <th>
+                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_updated_at&order=<?php echo $disp; ?>">
+                                            Last Response <?php if ($sort == 'ticket_updated_at') { echo $order_icon; } ?>
+                                        </a>
+                                    </th>
+                                    <th>
+                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
+                                            Client <?php if ($sort == 'client_name') { echo $order_icon; } ?>
+                                        </a>
+                                    </th>
                                 </tr>
-                            <?php } ?>
-                        </table>
-                    </div>
+                                </thead>
+                                <tbody>
+                                <?php
+
+                                while ($row = mysqli_fetch_array($sql_tickets)) {
+                                    $ticket_id = intval($row['ticket_id']);
+                                    $ticket_prefix = nullable_htmlentities($row['ticket_prefix']);
+                                    $ticket_number = nullable_htmlentities($row['ticket_number']);
+                                    $ticket_subject = nullable_htmlentities($row['ticket_subject']);
+                                    $ticket_priority = nullable_htmlentities($row['ticket_priority']);
+                                    $ticket_status = intval($row['ticket_status']);
+                                    $ticket_status_name = nullable_htmlentities($row['ticket_status_name']);
+                                    $ticket_status_color = nullable_htmlentities($row['ticket_status_color']);
+                                    $ticket_billable = intval($row['ticket_billable']);
+                                    $ticket_created_at = nullable_htmlentities($row['ticket_created_at']);
+                                    $ticket_created_at_time_ago = timeAgo($row['ticket_created_at']);
+                                    $ticket_updated_at = nullable_htmlentities($row['ticket_updated_at']);
+                                    $ticket_updated_at_time_ago = timeAgo($row['ticket_updated_at']);
+                                    if (empty($ticket_updated_at)) {
+                                        if ($ticket_status == 5) {
+                                            $ticket_updated_at_display = "<p>Never</p>";
+                                        } else {
+                                            $ticket_updated_at_display = "<p class='text-danger'>Never</p>";
+                                        }
+                                    } else {
+                                        $ticket_updated_at_display = "$ticket_updated_at_time_ago<br><small class='text-secondary'>$ticket_updated_at</small>";
+                                    }
+                                    $ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']);
+
+                                    if ($ticket_priority == "High") {
+                                        $ticket_priority_display = "<span class='p-2 badge badge-danger'>$ticket_priority</span>";
+                                    } elseif ($ticket_priority == "Medium") {
+                                        $ticket_priority_display = "<span class='p-2 badge badge-warning'>$ticket_priority</span>";
+                                    } elseif ($ticket_priority == "Low") {
+                                        $ticket_priority_display = "<span class='p-2 badge badge-info'>$ticket_priority</span>";
+                                    } else{
+                                        $ticket_priority_display = "-";
+                                    }
+
+                                    $ticket_assigned_to = intval($row['ticket_assigned_to']);
+                                    if (empty($ticket_assigned_to)) {
+                                        if ($ticket_status == 5) {
+                                            $ticket_assigned_to_display = "<p>Not Assigned</p>";
+                                        } else {
+                                            $ticket_assigned_to_display = "<p class='text-danger'>Not Assigned</p>";
+                                        }
+                                    } else {
+                                        $ticket_assigned_to_display = nullable_htmlentities($row['user_name']);
+                                    }
+
+                                    $project_id = intval($row['ticket_project_id']);
+
+                                    $client_id = intval($row['client_id']);
+                                    $client_name = nullable_htmlentities($row['client_name']);
+
+                                    // Get who last updated the ticket - to be shown in the last Response column
+                                    $ticket_reply_type = "Client"; // Default to client for unreplied tickets
+                                    $ticket_reply_by_display = ""; // Default none
+                                    $sql_ticket_reply = mysqli_query($mysqli, "SELECT ticket_reply_type, contact_name, user_name FROM ticket_replies
+                                    LEFT JOIN users ON ticket_reply_by = user_id
+                                    LEFT JOIN contacts ON ticket_reply_by = contact_id
+                                    WHERE ticket_reply_ticket_id = $ticket_id
+                                    AND ticket_reply_archived_at IS NULL
+                                    ORDER BY ticket_reply_id DESC LIMIT 1"
+                                    );
+                                    $row = mysqli_fetch_array($sql_ticket_reply);
+
+                                    if ($row) {
+                                        $ticket_reply_type = nullable_htmlentities($row['ticket_reply_type']);
+                                        if ($ticket_reply_type == "Client") {
+                                            $ticket_reply_by_display = nullable_htmlentities($row['contact_name']);
+                                        } else {
+                                            $ticket_reply_by_display = nullable_htmlentities($row['user_name']);
+                                        }
+                                    }
+
+                                    ?>
+
+                                    <tr>
+                                        <td class="pr-0 bg-light">
+                                            <!-- Ticket Bulk Select (for open tickets) -->
+                                            <?php if (empty($ticket_closed_at)) { ?>
+                                            <div class="form-check">
+                                                <input class="form-check-input bulk-select" type="checkbox" name="ticket_ids[]" value="<?php echo $ticket_id ?>">
+                                            </div>
+                                            <?php } ?>
+                                        </td>
+                                        <!-- Ticket Number / Subject -->
+                                        <td>
+                                            <a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>">
+                                                <span class="badge badge-pill badge-secondary p-3 mr-2"><?php echo "$ticket_prefix$ticket_number"; ?></span>
+                                                <?php echo $ticket_subject; ?>
+                                            </a>
+                                        </td>
+                                        <!-- Ticket Priority -->
+                                        <td><?php echo $ticket_priority_display; ?></a></td>
+
+                                        <!-- Ticket Status -->
+                                        <td>
+                                            <span class='badge badge-pill text-light p-2' style="background-color: <?php echo $ticket_status_color; ?>"><?php echo $ticket_status_name; ?></span>
+                                        </td>
+
+                                        <!-- Ticket Assigned agent -->
+                                        <td><?php echo $ticket_assigned_to_display; ?></td>
+
+                                        <!-- Ticket Last Response -->
+                                        <td>
+                                            <div><?php echo $ticket_updated_at_display; ?></div>
+                                            <div><?php echo $ticket_reply_by_display; ?></div>
+                                        </td>
+                                        <td><?php echo $client_name; ?></td>
+                                    </tr>
+
+
+                                <?php } ?>
+
+                                </tbody>
+                            </table>
+                        </div>
+                        <?php require_once "modals/ticket_bulk_assign_modal.php"; ?>
+                        <?php require_once "modals/ticket_bulk_edit_category_modal.php"; ?>
+                        <?php require_once "modals/ticket_bulk_edit_priority_modal.php"; ?>
+                        <?php require_once "modals/ticket_bulk_reply_modal.php"; ?>
+                        <?php require_once "modals/ticket_bulk_merge_modal.php"; ?>
+                        <?php require_once "modals/ticket_bulk_resolve_modal.php"; ?>
+                    </form>
                 </div>
-            <?php } ?>
-            <!-- End Tasks Card -->
+            </div>
+        <?php } ?>
+    </div>
 
-        </div> <!-- End col-3 -->
+    <div class="col-md-3">
 
-    </div> <!-- End row -->
+        <!-- Tasks Card -->
+        <?php if (mysqli_num_rows($sql_tasks) > 0) { ?>
+            <div class="card card-outline card-dark">
+                <div class="card-header py-3">
+                    <h5 class="card-title"><i class="fas fa-fw fa-tasks mr-2"></i>All Tasks</h5>
+                </div>
+                <div class="card-body p-0">
+                    <table class="table table-sm">
+                        <?php
+                        while($row = mysqli_fetch_array($sql_tasks)){
+                            $task_id = intval($row['task_id']);
+                            $task_name = nullable_htmlentities($row['task_name']);
+                            $task_completed_at = nullable_htmlentities($row['task_completed_at']);
+                            ?>
+                            <tr>
+                                <td>
+                                    <?php if ($task_completed_at) { ?>
+                                        <i class="far fa-check-square text-success mr-2"></i>
+                                    <?php } else { ?>
+                                        <a href="post.php?complete_task=<?php echo $task_id; ?>">
+                                            <i class="far fa-square text-secondary mr-2"></i>
+                                        </a>
+                                    <?php } ?>
+                                    <?php echo $task_name; ?>
+                                </td>
+                            </tr>
+                        <?php } ?>
+                    </table>
+                </div>
+            </div>
+        <?php } ?>
+        <!-- End Tasks Card -->
 
-    <?php
+    </div> <!-- End col-3 -->
 
-    require_once "modals/project_link_ticket_modal.php";
-    require_once "modals/project_link_closed_ticket_modal.php";
-    require_once "modals/ticket_add_modal.php";
+</div> <!-- End row -->
+
+<?php
+
+require_once "modals/project_link_ticket_modal.php";
+require_once "modals/project_link_closed_ticket_modal.php";
+require_once "modals/ticket_add_modal.php";
 
 }
 
@@ -566,5 +553,4 @@ require_once "../includes/footer.php";
 ?>
 
 <script src="../js/bulk_actions.js"></script>
-
 <script src="../js/pretty_content.js"></script>
diff --git a/user/tickets_list.php b/user/tickets_list.php
index 0e275329..f8582d2e 100644
--- a/user/tickets_list.php
+++ b/user/tickets_list.php
@@ -4,7 +4,7 @@
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
                 <div class="table-responsive-sm">
-                    <table class="table table-striped table-borderless table-hover table-sm">
+                    <table class="table table-striped table-borderless table-hover">
                         <thead class="text-dark <?php if (!$num_rows[0]) { echo "d-none"; } ?> text-nowrap">
                         <tr>