diff --git a/agent/dashboard.php b/agent/dashboard.php
index 5a6223b4..546164f1 100644
--- a/agent/dashboard.php
+++ b/agent/dashboard.php
@@ -734,8 +734,8 @@ if ($user_config_dashboard_technical_enable == 1) {
                                     $contact_display = empty($contact_name) ? "-" : "<a href='contact_details.php?client_id=$client_id&contact_id=$contact_id'>$contact_name</a>";
                                 ?>
                                     <tr class="<?php echo empty($ticket_updated_at) ? 'text-bold' : ''; ?>">
-                                        <td><a class="text-dark" href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo "$ticket_prefix$ticket_number"; ?></a></td>
-                                        <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
+                                        <td><a class="text-dark" href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?php echo $ticket_id; ?>"><?php echo "$ticket_prefix$ticket_number"; ?></a></td>
+                                        <td><a href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
                                         <td><a href="tickets.php?client_id=<?php echo $client_id; ?>"><strong><?php echo $client_name; ?></strong></a></td>
                                         <td><?php echo $contact_display; ?></td>
                                         <td><span class='p-2 badge badge-pill badge-<?php echo $ticket_priority_color; ?>'><?php echo $ticket_priority; ?></span></td>
diff --git a/agent/invoice.php b/agent/invoice.php
index 15e3d609..039da741 100644
--- a/agent/invoice.php
+++ b/agent/invoice.php
@@ -199,21 +199,12 @@ if (isset($_GET['invoice_id'])) {
     ?>
 
     <ol class="breadcrumb d-print-none">
-        <?php if (isset($_GET['client_id'])) { ?>
         <li class="breadcrumb-item">
-            <a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
+            <a href="invoices.php">All Invoices</a>
         </li>
         <li class="breadcrumb-item">
-            <a href="invoices.php?client_id=<?php echo $client_id; ?>">Invoices</a>
+            <a href="invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?> Invoices</a>
         </li>
-        <?php } else { ?>
-        <li class="breadcrumb-item">
-            <a href="invoices.php">Invoices</a>
-        </li>
-        <li class="breadcrumb-item">
-            <a href="invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
-        </li>
-        <?php } ?>
         <li class="breadcrumb-item active"><?php echo "$invoice_prefix$invoice_number"; ?></li>
         <?php if (isset($invoice_overdue)) { ?>
             <span class="p-2 ml-2 badge badge-danger"><?php echo $invoice_overdue; ?></span>
diff --git a/agent/quote.php b/agent/quote.php
index d78bf6a7..fa1dada8 100644
--- a/agent/quote.php
+++ b/agent/quote.php
@@ -128,21 +128,12 @@ if (isset($_GET['quote_id'])) {
 ?>
 
     <ol class="breadcrumb d-print-none">
-        <?php if (isset($_GET['client_id'])) { ?>
         <li class="breadcrumb-item">
-            <a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
+            <a href="quotes.php">All Quotes</a>
         </li>
         <li class="breadcrumb-item">
-            <a href="quotes.php?client_id=<?php echo $client_id; ?>">Quotes</a>
+            <a href="quotes.php?client_id=<?= $client_id ?>"><?= $client_name ?> Quotes</a>
         </li>
-        <?php } else { ?>
-        <li class="breadcrumb-item">
-            <a href="quotes.php">Global Quotes</a>
-        </li>
-        <li class="breadcrumb-item">
-            <a href="quotes.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?> Quotes</a>
-        </li>
-        <?php } ?>
         <li class="breadcrumb-item active"><?php echo "$quote_prefix$quote_number"; ?></li>
     </ol>
 
diff --git a/agent/ticket.php b/agent/ticket.php
index 162bfe0a..0296e45e 100644
--- a/agent/ticket.php
+++ b/agent/ticket.php
@@ -355,21 +355,12 @@ if (isset($_GET['ticket_id'])) {
 
         <!-- Breadcrumbs-->
         <ol class="breadcrumb d-print-none">
-            <?php if (isset($_GET['client_id'])) { ?>
-                <li class="breadcrumb-item">
-                    <a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
-                </li>
-                <li class="breadcrumb-item">
-                    <a href="tickets.php?client_id=<?php echo $client_id; ?>">Tickets</a>
-                </li>
-            <?php } else { ?>
-                <li class="breadcrumb-item">
-                    <a href="tickets.php">Tickets</a>
-                </li>
-                <li class="breadcrumb-item">
-                    <a href="tickets.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
-                </li>
-            <?php } ?>
+             <li class="breadcrumb-item">
+                <a href="tickets.php">All Tickets</a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="tickets.php?client_id=<?php echo $client_id; ?>"><?= $client_name ?> Tickets</a>
+            </li>
             <li class="breadcrumb-item active"><i class="fas fa-life-ring mr-1"></i><?php echo "$ticket_prefix$ticket_number";?></li>
         </ol>
 
@@ -470,8 +461,7 @@ if (isset($_GET['ticket_id'])) {
         <div class="card-group mb-3">
 
             <div class="card card-body px-3 py-2">
-  
-                <h5><?php echo $client_name; ?></h5>
+                
                 <div title="<?php echo $ticket_updated_at; ?>">
                     <i class="fa fa-fw fa-history text-secondary mr-2"></i>Updated: <strong><?php echo $ticket_updated_at_ago; ?></strong>
                 </div>
diff --git a/agent/ticket_list.php b/agent/ticket_list.php
index 9ac24ea5..079a6bd8 100644
--- a/agent/ticket_list.php
+++ b/agent/ticket_list.php
@@ -197,14 +197,14 @@
                                 
                                 <!-- Ticket Number -->
                                 <td>
-                                    <a href="ticket.php?<?php echo $client_url; ?>ticket_id=<?php echo $ticket_id; ?>">
+                                    <a href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?= $ticket_id ?>">
                                         <span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span>
                                     </a>
                                 </td>
 
                                 <!-- Ticket Subject -->
                                 <td>
-                                    <a href="ticket.php?<?php echo $client_url; ?>ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a>
+                                    <a href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?= $ticket_id ?>"><?= $ticket_subject ?></a>
 
                                     <?php if($task_count && $completed_task_count > 0) { ?>
                                     <div class="progress mt-2" style="height: 20px;">