diff --git a/client_invoices.php b/client_invoices.php
index 0fd91ab6..d5e78706 100644
--- a/client_invoices.php
+++ b/client_invoices.php
@@ -21,9 +21,6 @@ $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">
@@ -60,7 +57,6 @@ $recurring_invoice_count = $row['num'];
                 <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 } ?>
diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php
index 39378f43..3bcc9aec 100644
--- a/client_recurring_invoices.php
+++ b/client_recurring_invoices.php
@@ -54,7 +54,6 @@ $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_recurring_tickets.php b/client_recurring_tickets.php
index 3fe0275c..c80b814b 100644
--- a/client_recurring_tickets.php
+++ b/client_recurring_tickets.php
@@ -26,7 +26,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <div class="card card-dark">
     <div class="card-header py-2">
-        <h3 class="card-title mt-2"><i class="fa fa-fw fa-calendar-check mr-2"></i>Recurring Tickets</h3>
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-redo-alt mr-2"></i>Recurring Tickets</h3>
         <div class='card-tools'>
             <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRecurringTicketModal">
                 <i class="fas fa-plus mr-2"></i>New Recurring Ticket
diff --git a/client_side_nav.php b/client_side_nav.php
index 8c911e84..515734be 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" || basename($_SERVER["PHP_SELF"]) == "client_recurring_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") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-life-ring"></i>
                         <p>
                             Tickets
@@ -64,6 +64,19 @@
                     </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-redo-alt ml-1"></i>
+                        <p>
+                            Recurring
+                            <?php
+                            if ($num_scheduled_tickets) { ?>
+                                <span class="right badge"><?php echo $num_scheduled_tickets; ?></span>
+                            <?php } ?>
+
+                        </p>
+                    </a>
+                </li>
 
                 <?php } ?>
 
@@ -224,7 +237,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" || basename($_SERVER["PHP_SELF"]) == "client_recurring_invoices.php" || basename($_SERVER["PHP_SELF"]) == "client_recurring_invoice.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") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-file-invoice"></i>
                             <p>
                                 Invoices
@@ -236,6 +249,19 @@
                         </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" || basename($_SERVER["PHP_SELF"]) == "client_recurring_invoice.php") { echo "active"; } ?>">
+                            <i class="nav-icon fas fa-redo-alt ml-1"></i>
+                            <p>
+                                Recurring
+                                <?php
+                                if ($num_recurring_invoices > 0) { ?>
+                                    <span class="right badge"><?php echo $num_recurring_invoices; ?></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"; } ?>">
@@ -287,7 +313,7 @@
 
                 <?php } ?>
 
-                <li class="nav-header mt-3">MORE</li>
+                <li class="nav-header mt-3">MISC</li>
 
                 <li class="nav-item">
                     <a href="client_bulk_mail.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_bulk_mail.php") { echo "active"; } ?>">
diff --git a/client_tickets.php b/client_tickets.php
index 31c3a114..7ecd0957 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -58,11 +58,6 @@ $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">
@@ -105,14 +100,7 @@ $total_scheduled_tickets = intval($row['total_scheduled_tickets']);
                     </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>
 
             </div>
diff --git a/inc_all_client.php b/inc_all_client.php
index 4cedc40e..ca04b154 100644
--- a/inc_all_client.php
+++ b/inc_all_client.php
@@ -114,7 +114,7 @@ if (isset($_GET['client_id'])) {
 
         $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total;
 
-        //Badge Counts
+        // Badge Counts
 
         $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id"));
         $num_contacts = $row['num'];
diff --git a/recurring_tickets.php b/recurring_tickets.php
index f0204ad4..657014c8 100644
--- a/recurring_tickets.php
+++ b/recurring_tickets.php
@@ -25,7 +25,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <div class="card card-dark">
     <div class="card-header py-2">
-        <h3 class="card-title mt-2"><i class="fas fa-fw fa-calendar-check mr-2"></i>Recurring Tickets</h3>
+        <h3 class="card-title mt-2"><i class="fas fa-fw fa-redo-alt mr-2"></i>Recurring Tickets</h3>
         <div class='card-tools'>
             <div class="float-left">
                 <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRecurringTicketModal">