diff --git a/client_invoices.php b/client_invoices.php
index 0ebf2e8f..0fd91ab6 100644
--- a/client_invoices.php
+++ b/client_invoices.php
@@ -21,51 +21,61 @@ $sql = mysqli_query(
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
+$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS num FROM recurring WHERE recurring_archived_at IS NULL AND recurring_client_id = $client_id"));
+$recurring_invoice_count = $row['num'];
+
 ?>
 
-    <div class="card card-dark">
-        <div class="card-header py-2">
-            <h3 class="card-title mt-2"><i class="fa fa-fw fa-file-invoice mr-2"></i>Invoices</h3>
-            <div class="card-tools"> 
-                <div class="btn-group">
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addInvoiceModal"><i class="fas fa-plus mr-2"></i>New Invoice</button>
-                    <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
-                    <div class="dropdown-menu">
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportInvoiceModal">
-                            <i class="fa fa-fw fa-download mr-2"></i>Export
-                        </a>
-                    </div>
+<div class="card card-dark">
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-file-invoice mr-2"></i>Invoices</h3>
+        <div class="card-tools">
+            <div class="btn-group">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addInvoiceModal"><i class="fas fa-plus mr-2"></i>New Invoice</button>
+                <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
+                <div class="dropdown-menu">
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportInvoiceModal">
+                        <i class="fa fa-fw fa-download mr-2"></i>Export
+                    </a>
                 </div>
             </div>
         </div>
-        <div class="card-body">
-            <form autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <div class="row">
+    </div>
+    <div class="card-body">
+        <form autocomplete="off">
+            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+            <div class="row">
 
-                    <div class="col-md-4">
-                        <div class="input-group mb-3 mb-md-0">
-                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Invoices">
-                            <div class="input-group-append">
-                                <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-                            </div>
+                <div class="col-md-4">
+                    <div class="input-group mb-3 mb-md-0">
+                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {
+                                                                                        echo stripslashes(nullable_htmlentities($q));
+                                                                                    } ?>" placeholder="Search Invoices">
+                        <div class="input-group-append">
+                            <button class="btn btn-dark"><i class="fa fa-search"></i></button>
                         </div>
                     </div>
+                </div>
 
-                    <div class="col-md-8">
-                        <div class="float-right">
-                            <?php if($balance > 0) { ?>
-                            <button type="button" class="btn btn-default" data-toggle="modal" data-target="#addBulkPaymentModal"><i class="fa fa-credit-card mr-2"></i>Batch Payment</button>
+                <div class="col-md-8">
+                    <div class="float-right">
+                        <div class="btn-group float-right">
+                            <a href="client_recurring_invoices.php?client_id=<?php echo $client_id; ?>" class="btn btn-outline-primary"><i class="fa fa-fw fa-redo-alt mr-2"></i>Recurring | <b><?php echo $recurring_invoice_count; ?></b></a>
+                            <?php if ($balance > 0) { ?>
+                                <button type="button" class="btn btn-default" data-toggle="modal" data-target="#addBulkPaymentModal"><i class="fa fa-credit-card mr-2"></i>Batch Payment</button>
                             <?php } ?>
                         </div>
                     </div>
-
                 </div>
-            </form>
-            <hr>
-            <div class="table-responsive-sm">
-                <table class="table table-striped table-borderless table-hover">
-                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+
+            </div>
+        </form>
+        <hr>
+        <div class="table-responsive-sm">
+            <table class="table table-striped table-borderless table-hover">
+                <thead class="text-dark <?php if ($num_rows[0] == 0) {
+                                            echo "d-none";
+                                        } ?>">
                     <tr>
                         <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=invoice_number&order=<?php echo $disp; ?>">Number</a></th>
                         <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=invoice_scope&order=<?php echo $disp; ?>">Scope</a></th>
@@ -76,8 +86,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=invoice_status&order=<?php echo $disp; ?>">Status</a></th>
                         <th class="text-center">Action</th>
                     </tr>
-                    </thead>
-                    <tbody>
+                </thead>
+                <tbody>
                     <?php
 
                     while ($row = mysqli_fetch_array($sql)) {
@@ -121,14 +131,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $invoice_badge_color = "secondary";
                         }
 
-                        ?>
+                    ?>
 
                         <tr>
                             <td class="text-bold"><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
                             <td><?php echo $invoice_scope_display; ?></td>
                             <td class="text-bold text-right"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
                             <td><?php echo $invoice_date; ?></td>
-                            <td><div class="<?php echo $overdue_color; ?>"><?php echo $invoice_due; ?></div></td>
+                            <td>
+                                <div class="<?php echo $overdue_color; ?>"><?php echo $invoice_due; ?></div>
+                            </td>
                             <td><?php echo $category_name; ?></td>
                             <td>
                                 <span class="p-2 badge badge-<?php echo $invoice_badge_color; ?>">
@@ -162,23 +174,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             </td>
                         </tr>
 
-                        <?php
+                    <?php
 
                         require "invoice_copy_modal.php";
 
                         require "invoice_edit_modal.php";
-
                     }
 
                     ?>
 
-                    </tbody>
-                </table>
-            </div>
-            <?php require_once "pagination.php";
- ?>
+                </tbody>
+            </table>
         </div>
+        <?php require_once "pagination.php";
+        ?>
     </div>
+</div>
 
 <?php
 require_once "invoice_add_modal.php";
@@ -188,4 +199,3 @@ require_once "invoice_payment_add_bulk_modal.php";
 require_once "client_invoice_export_modal.php";
 
 require_once "footer.php";
-
diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php
index 824af5e5..39378f43 100644
--- a/client_recurring_invoices.php
+++ b/client_recurring_invoices.php
@@ -53,6 +53,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                 <div class="col-md-8">
                     <div class="float-right">
+                        <div class="btn-group float-right">
+                            <a href="client_invoices.php?client_id=<?php echo $client_id; ?>" class="btn btn-outline-primary"><i class="fa fa-fw fa-file-invoice mr-2"></i>Back to Invoices</a>
+                        </div>
                     </div>
                 </div>
 
diff --git a/client_side_nav.php b/client_side_nav.php
index 054d8ec3..898465d2 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -51,7 +51,7 @@
                 <li class="nav-header mt-3">SUPPORT</li>
 
                 <li class="nav-item">
-                    <a href="client_tickets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_tickets.php") { echo "active"; } ?>">
+                    <a href="client_tickets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_tickets.php" || basename($_SERVER["PHP_SELF"]) == "client_recurring_tickets.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-life-ring"></i>
                         <p>
                             Tickets
@@ -64,19 +64,6 @@
                     </a>
                 </li>
 
-                <li class="nav-item">
-                    <a href="client_recurring_tickets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_recurring_tickets.php") { echo "active"; } ?>">
-                        <i class="nav-icon fas fa-calendar-check"></i>
-                        <p>
-                            Recurring Tickets
-                            <?php
-                            if ($num_scheduled_tickets > 0) { ?>
-                                <span class="right badge text-light"><?php echo $num_scheduled_tickets; ?></span>
-                            <?php } ?>
-
-                        </p>
-                    </a>
-                </li>
 
                 <?php } ?>
 
@@ -237,7 +224,7 @@
                     <li class="nav-header mt-3">FINANCE</li>
 
                     <li class="nav-item">
-                        <a href="client_invoices.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_invoices.php") { echo "active"; } ?>">
+                        <a href="client_invoices.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_invoices.php" || basename($_SERVER["PHP_SELF"]) == "client_recurring_invoices.php" || basename($_SERVER["PHP_SELF"]) == "client_recurring_invoice.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-file-invoice"></i>
                             <p>
                                 Invoices
@@ -249,18 +236,6 @@
                         </a>
                     </li>
 
-                    <li class="nav-item">
-                        <a href="client_recurring_invoices.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_recurring_invoices.php") { echo "active"; } ?>">
-                            <i class="nav-icon fas fa-redo-alt"></i>
-                            <p>
-                                Recurring Invoices
-                                <?php
-                                if ($num_recurring > 0) { ?>
-                                    <span class="right badge text-light"><?php echo $num_recurring; ?></span>
-                                <?php } ?>
-                            </p>
-                        </a>
-                    </li>
 
                     <li class="nav-item">
                         <a href="client_quotes.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_quotes.php") { echo "active"; } ?>">
diff --git a/client_tickets.php b/client_tickets.php
index 47e9719d..e8643a0c 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -59,6 +59,11 @@ $sql_total_tickets_closed = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS to
 $row = mysqli_fetch_array($sql_total_tickets_closed);
 $total_tickets_closed = intval($row['total_tickets_closed']);
 
+//Get Total Scheduled tickets
+$sql_total_scheduled_tickets = mysqli_query($mysqli, "SELECT COUNT(scheduled_ticket_id) AS total_scheduled_tickets FROM scheduled_tickets WHERE scheduled_ticket_client_id = $client_id");
+$row = mysqli_fetch_array($sql_total_scheduled_tickets);
+$total_scheduled_tickets = intval($row['total_scheduled_tickets']);
+
 ?>
 
 <div class="card card-dark">
@@ -97,8 +102,13 @@ $total_tickets_closed = intval($row['total_tickets_closed']);
                     </div>
                 </div>
 
+
+
                 <div class="col-md-8">
                     <div class="float-right">
+                        <a href="client_recurring_tickets.php?client_id=<?php echo $client_id; ?>" class="btn btn-outline-info">
+                            <i class="fa fa-fw fa-redo-alt mr-2"></i>Recurring Tickets | <strong> <?php echo $total_scheduled_tickets; ?></strong>
+                        </a>
                     </div>
                 </div>
 
diff --git a/tickets.php b/tickets.php
index f3bb48d0..d53667db 100644
--- a/tickets.php
+++ b/tickets.php
@@ -77,7 +77,7 @@ $sql_total_tickets_closed = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS to
 $row = mysqli_fetch_array($sql_total_tickets_closed);
 $total_tickets_closed = intval($row['total_tickets_closed']);
 
-//Get Total Scheduled tickets
+//Get Total Recurring (scheduled) tickets
 $sql_total_scheduled_tickets = mysqli_query($mysqli, "SELECT COUNT(scheduled_ticket_id) AS total_scheduled_tickets FROM scheduled_tickets");
 $row = mysqli_fetch_array($sql_total_scheduled_tickets);
 $total_scheduled_tickets = intval($row['total_scheduled_tickets']);