diff --git a/client_add_modal.php b/client_add_modal.php
index 324d8f7a..c54c3cab 100644
--- a/client_add_modal.php
+++ b/client_add_modal.php
@@ -90,6 +90,15 @@
                                 </div>
                             </div>
 
+                            <div class="form-group">
+                                <label><i class="fas fa-fw fa-bullhorn mr-2"></i>Is Lead</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <input type="checkbox" name="lead" value="1">
+                                    </div>
+                                </div>
+                            </div>
+
 
                         </div>
 
diff --git a/client_leads.php b/client_leads.php
deleted file mode 100644
index f6dc3d88..00000000
--- a/client_leads.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-
-// Default Column Sortby/Order Filter
-$sort = "client_accessed_at";
-$order = "DESC";
-
-global $lead;
-$lead = 1;
-
-require_once "inc_all.php";
-
-
-//Rebuild URL
-$url_query_strings_sort = http_build_query($get_copy);
-
-$sql = mysqli_query(
-    $mysqli,
-    "
-    SELECT SQL_CALC_FOUND_ROWS clients.*, contacts.*, locations.*, GROUP_CONCAT(tags.tag_name) AS tag_names
-    FROM clients
-    LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1
-    LEFT JOIN locations ON clients.client_id = locations.location_client_id AND location_primary = 1
-    LEFT JOIN client_tags ON client_tags.client_tag_client_id = clients.client_id
-    LEFT JOIN tags ON tags.tag_id = client_tags.client_tag_tag_id
-    WHERE (clients.client_name LIKE '%$q%' OR clients.client_type LIKE '%$q%' OR clients.client_referral LIKE '%$q%'
-           OR contacts.contact_email LIKE '%$q%' OR contacts.contact_name LIKE '%$q%' OR contacts.contact_phone LIKE '%$phone_query%'
-           OR contacts.contact_mobile LIKE '%$phone_query%' OR locations.location_address LIKE '%$q%'
-           OR locations.location_city LIKE '%$q%' OR locations.location_state LIKE '%$q%' OR locations.location_zip LIKE '%$q%'
-           OR tags.tag_name LIKE '%$q%' OR clients.client_tax_id_number LIKE '%$q%')
-      AND clients.client_archived_at IS NULL
-      AND clients.client_lead = 1
-      AND DATE(clients.client_created_at) BETWEEN '$dtf' AND '$dtt'
-    GROUP BY clients.client_id
-    ORDER BY $sort $order
-    LIMIT $record_from, $record_to
-");
-
-$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-user-friends mr-2"></i>Lead Management</h3>
-            <div class="card-tools">
-                <?php if ($session_user_role == 3) { ?>
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addClientModal"><i class="fas fa-plus mr-2"></i>New Lead</button>
-                <?php } ?>
-            </div>
-        </div>
-
-        <div class="card-body p-2 p-md-3">
-            <form class="mb-4" autocomplete="off">
-                <div class="row">
-                    <div class="col-md-4">
-                        <div class="input-group">
-                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search leads" autofocus>
-                            <div class="input-group-append">
-                                <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
-                                <button class="btn btn-primary"><i class="fa fa-search"></i></button>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-8">
-                        <div class="float-right">
-                            <button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#exportClientModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
-                        </div>
-                    </div>
-                </div>
-                <div class="collapse mt-3 <?php if (!empty($_GET['dtf']) || $_GET['canned_date'] !== "custom" ) { echo "show"; } ?>" id="advancedFilter">
-                    <div class="row">
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Canned date</label>
-                                <select class="form-control select2" name="canned_date">
-                                    <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
-                                    <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                                    <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                                    <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                                    <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                                    <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date from</label>
-                                <input type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="form-group">
-                                <label>Date to</label>
-                                <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </form>
-            <hr>
-            <div class="table-responsive-sm">
-                <table class="table table-striped table-hover table-borderless">
-                    <thead class="<?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-                    <tr>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">Name</a></th>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=location_city&order=<?php echo $disp; ?>">Primary address </a></th>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_name&order=<?php echo $disp; ?>">Primary contact</a></th>
-                        <?php if ($session_user_role == 3) { ?> <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 = "$location_address<br>$location_city $location_state $location_zip";
-                        }
-                        $contact_id = intval($row['contact_id']);
-                        $contact_name = nullable_htmlentities($row['contact_name']);
-                        $contact_title = nullable_htmlentities($row['contact_title']);
-                        $contact_phone = formatPhoneNumber($row['contact_phone']);
-                        $contact_extension = nullable_htmlentities($row['contact_extension']);
-                        $contact_mobile = formatPhoneNumber($row['contact_mobile']);
-                        $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_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_archive_at = nullable_htmlentities($row['client_archived_at']);
-                        $client_is_lead = intval($row['client_lead']);
-
-                        // 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.client_tag_tag_id = tags.tag_id WHERE client_tags.client_tag_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='client_leads.php?q=$client_tag_name'><span class='badge bg-$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 NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled' ");
-                        $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 Monthly Recurring Total
-                        $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_monthly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'month' AND recurring_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_amount) AS recurring_yearly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'year' AND recurring_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>
-                                <a class="font-weight-bold" href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?> <i class="fas fa-fw fa-arrow-circle-right"></i></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>Created:</strong> <?php echo $client_created_at; ?></small>
-                                </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>
-                                        <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><?php echo $contact_name; ?>
-                                    </div>
-                                <?php } else {
-                                    echo "-";
-                                }
-
-                                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 }
-
-                                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' data-clipboard-text='<?php echo $contact_email; ?>'><i class='far fa-copy text-secondary'></i></button>
-                                    </div>
-                                <?php } ?>
-                            </td>
-
-                            <!-- Show actions for Admin role only -->
-                            <?php if ($session_user_role == 3) { ?>
-                                <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="modal" data-target="#editClientModal<?php echo $client_id; ?>">
-                                                <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                            </a>
-                                            <div class="dropdown-divider"></div>
-                                            <a class="dropdown-item text-danger confirm-link" href="post.php?archive_client=<?php echo $client_id; ?>">
-                                                <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                            </a>
-                                        </div>
-                                    </div>
-                                </td>
-                            <?php } ?>
-                        </tr>
-
-                        <?php
-
-                        require "client_edit_modal.php";
-
-
-                    } ?>
-
-                    </tbody>
-                </table>
-            </div>
-            <?php require_once "pagination.php";
- ?>
-        </div>
-    </div>
-
-<?php
-require_once "client_add_modal.php";
-
-require_once "client_export_modal.php";
-
-require_once "category_quick_add_modal.php";
-
-require_once "footer.php";
-
diff --git a/clients.php b/clients.php
index 061eb0f0..98f43033 100644
--- a/clients.php
+++ b/clients.php
@@ -6,6 +6,19 @@ $order = "DESC";
 
 require_once "inc_all.php";
 
+// Leads Query
+
+$leads = 0;
+
+if (isset($_GET['leads'])) {
+    $leads = intval($_GET['leads']);
+}
+
+if($leads == 1){
+    $leads_query = 1;
+} else {
+    $leads_query = 0;
+}
 
 //Rebuild URL
 $url_query_strings_sort = http_build_query($get_copy);
@@ -26,7 +39,7 @@ $sql = mysqli_query(
            OR tags.tag_name LIKE '%$q%' OR clients.client_tax_id_number LIKE '%$q%')
       AND clients.client_archived_at IS NULL
       AND DATE(clients.client_created_at) BETWEEN '$dtf' AND '$dtt'
-      AND clients.client_lead = 0
+      AND clients.client_lead = $leads
     GROUP BY clients.client_id
     ORDER BY $sort $order
     LIMIT $record_from, $record_to
@@ -41,13 +54,24 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <h3 class="card-title mt-2"><i class="fa fa-fw fa-user-friends mr-2"></i>Client Management</h3>
             <div class="card-tools">
                 <?php if ($session_user_role == 3) { ?>
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addClientModal"><i class="fas fa-plus mr-2"></i>New Client</button>
+                    <div class="btn-group">
+                        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addClientModal">
+                            <i class="fas fa-plus mr-2"></i>New Client
+                        </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="#exportClientModal">
+                                <i class="fa fa-fw fa-download mr-2"></i>Export
+                            </a>
+                        </div>
+                    </div>
                 <?php } ?>
             </div>
         </div>
 
         <div class="card-body p-2 p-md-3">
             <form class="mb-4" autocomplete="off">
+                <input type="hidden" name="leads" value="<?php echo $leads; ?>">
                 <div class="row">
                     <div class="col-md-4">
                         <div class="input-group">
@@ -60,7 +84,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </div>
                     <div class="col-md-8">
                         <div class="float-right">
-                            <button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#exportClientModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
+                            <?php if($leads == 1){ ?>
+                            <a href="?leads=0" class="btn btn-primary"><i class="fa fa-fw fa-bullhorn mr-2"></i>Leads</a>
+                            <?php } else { ?>
+                            <a href="?leads=1" class="btn btn-default"><i class="fa fa-fw fa-bullhorn mr-2"></i>Leads</a>
+                            <?php } ?>
                         </div>
                     </div>
                 </div>
diff --git a/side_nav.php b/side_nav.php
index eb45d634..6bf3d75b 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -68,12 +68,6 @@
                 if ($config_module_enable_accounting == 1) { ?>
 
                     <li class="nav-header mt-3">SALES</li>
-                    <li class="nav-item">
-                        <a href="client_leads.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_leads.php") { echo "active"; } ?>">
-                            <i class="nav-icon fas fa-bullhorn"></i>
-                            <p>Leads</p>
-                        </a>
-                    </li>
                     <li class="nav-item">
                         <a href="quotes.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "quotes.php" || basename($_SERVER["PHP_SELF"]) == "quote.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-comment-dollar"></i>