diff --git a/ajax/ajax_document_edit.php b/ajax/ajax_document_edit.php
new file mode 100644
index 00000000..53469776
--- /dev/null
+++ b/ajax/ajax_document_edit.php
@@ -0,0 +1,80 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$document_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_id = $document_id");
+                     
+$row = mysqli_fetch_array($sql);
+$document_name = nullable_htmlentities($row['document_name']);
+$document_description = nullable_htmlentities($row['document_description']);
+$document_content = nullable_htmlentities($row['document_content']);
+$document_created_by_id = intval($row['document_created_by']);
+$document_created_at = nullable_htmlentities($row['document_created_at']);
+$document_updated_at = nullable_htmlentities($row['document_updated_at']);
+$document_archived_at = nullable_htmlentities($row['document_archived_at']);
+$document_folder_id = intval($row['document_folder_id']);
+$document_parent = intval($row['document_parent']);
+$document_client_visible = intval($row['document_client_visible']);
+$client_id = intval($row['document_client_id']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>Editing document: <strong><?php echo $document_name; ?></strong></h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="document_id" value="<?php if($document_parent == 0){ echo $document_id; } else { echo $document_parent; } ?>">
+    <input type="hidden" name="document_parent" value="<?php echo $document_parent; ?>">
+    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+    <input type="hidden" name="created_by" value="<?php echo $document_created_by_id; ?>">
+    <div class="modal-body bg-white">
+
+        <div class="form-group">
+            <input type="text" class="form-control" name="name" maxlength="200" value="<?php echo $document_name; ?>" placeholder="Name" required>
+        </div>
+
+        <div class="form-group">
+            <textarea class="form-control tinymce<?php if($config_ai_enable) { echo "AI"; } ?>" id="textInput" name="content"><?php echo $document_content; ?></textarea>
+        </div>
+
+        <div class="form-group">
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
+                </div>
+                <select class="form-control select2" name="folder">
+                    <option value="0">/</option>
+                    <?php
+                    $sql_folders_select = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = 0 AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                    while ($row = mysqli_fetch_array($sql_folders_select)) {
+                        $folder_id_select = intval($row['folder_id']);
+                        $folder_name_select = nullable_htmlentities($row['folder_name']);
+                        ?>
+                        <option <?php if ($folder_id_select == $document_folder_id) echo "selected"; ?> value="<?php echo $folder_id_select ?>"><?php echo $folder_name_select; ?></option>
+                        <?php
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <input type="text" class="form-control" name="description" value="<?php echo $document_description; ?>" placeholder="Short summary of changes">
+        </div>
+
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once "../includes/ajax_footer.php";
diff --git a/client_document_details.php b/client_document_details.php
index 28f88bd1..256e138d 100644
--- a/client_document_details.php
+++ b/client_document_details.php
@@ -165,7 +165,12 @@ $page_title = $row['document_name'];
     <div class="col-md-3 d-print-none">
         <div class="row">
             <div class="col-12 mb-3">
-                <button type="button" class="btn btn-primary mr-2" data-toggle="modal" data-target="#editDocumentModal<?php echo $document_id; ?>">
+                <button type="button" class="btn btn-primary mr-2"
+                    data-toggle="ajax-modal"
+                    data-modal-size="lg"
+                    data-ajax-url="ajax/ajax_document_edit.php"
+                    data-ajax-id="<?php echo $document_id; ?>"
+                    >
                     <i class="fas fa-fw fa-edit mr-2"></i>Edit
                 </button>
                 <button type="button" class="btn btn-secondary mr-2" data-toggle="modal" data-target="#shareModal"
@@ -394,7 +399,6 @@ $page_title = $row['document_name'];
 
 <?php
 
-require_once "modals/client_document_edit_modal.php";
 require_once "modals/client_document_link_file_modal.php";
 require_once "modals/client_document_link_contact_modal.php";
 require_once "modals/client_document_link_asset_modal.php";
@@ -403,5 +407,3 @@ require_once "modals/client_document_link_vendor_modal.php";
 require_once "modals/document_edit_visibility_modal.php";
 require_once "modals/share_modal.php";
 require_once "includes/footer.php";
-
-?>
diff --git a/client_documents.php b/client_documents.php
index 6a680067..c9220134 100644
--- a/client_documents.php
+++ b/client_documents.php
@@ -425,6 +425,15 @@ while ($folder_id > 0) {
                                                     <i class="fas fa-fw fa-eye mr-2"></i>Quick View
                                                 </a>
                                                 <div class="dropdown-divider"></div>
+                                                <a class="dropdown-item" href="#"
+                                                    data-toggle="ajax-modal"
+                                                    data-modal-size="lg"
+                                                    data-ajax-url="ajax/ajax_document_edit.php"
+                                                    data-ajax-id="<?php echo $document_id; ?>"
+                                                    >
+                                                    <i class="fas fa-fw fa-pencil-alt mr-2"></i>Edit
+                                                </a>
+                                                <div class="dropdown-divider"></div>
                                                 <a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'Document', $document_id"; ?>)">
                                                     <i class="fas fa-fw fa-share mr-2"></i>Share
                                                 </a>
diff --git a/client_quotes.php b/client_quotes.php
deleted file mode 100644
index da757342..00000000
--- a/client_quotes.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-
-// Default Column Sortby Filter
-$sort = "quote_number";
-$order = "DESC";
-
-require_once "includes/inc_all_client.php";
-
-// Perms
-enforceUserPermission('module_sales');
-
-//Rebuild URL
-$url_query_strings_sort = http_build_query($get_copy);
-
-$sql = mysqli_query(
-    $mysqli,
-    "SELECT SQL_CALC_FOUND_ROWS * FROM quotes
-    LEFT JOIN categories ON category_id = quote_category_id
-    WHERE quote_client_id = $client_id
-    AND (CONCAT(quote_prefix,quote_number) LIKE '%$q%' OR quote_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR quote_status LIKE '%$q%')
-    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-comment-dollar mr-2"></i>Quotes</h3>
-            <div class="card-tools">
-                <div class="btn-group">
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addQuoteModal"><i class="fas fa-plus mr-2"></i>New Quote</button>
-                    <?php if ($num_rows[0] > 0) { ?>
-                        <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="#exportQuoteModal">
-                                <i class="fa fa-fw fa-download mr-2"></i>Export
-                            </a>
-                        </div>
-                    <?php } ?>
-                </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 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 Quotes">
-                            <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">
-                        </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"; } ?>">
-                    <tr>
-                        <th>
-                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_number&order=<?php echo $disp; ?>">
-                                Number <?php if ($sort == 'quote_number') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_scope&order=<?php echo $disp; ?>">
-                                Scope <?php if ($sort == 'quote_scope') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th class="text-right">
-                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_amount&order=<?php echo $disp; ?>">
-                                Amount <?php if ($sort == 'quote_amount') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_date&order=<?php echo $disp; ?>">
-                                Date <?php if ($sort == 'quote_date') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_expire&order=<?php echo $disp; ?>">
-                                Expire <?php if ($sort == 'quote_expire') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=category_name&order=<?php echo $disp; ?>">
-                                Category <?php if ($sort == 'category_name') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_status&order=<?php echo $disp; ?>">
-                                Status <?php if ($sort == 'quote_status') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th class="text-center">Action</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php
-
-                    while ($row = mysqli_fetch_array($sql)) {
-                        $quote_id = intval($row['quote_id']);
-                        $quote_prefix = nullable_htmlentities($row['quote_prefix']);
-                        $quote_number = nullable_htmlentities($row['quote_number']);
-                        $quote_scope = nullable_htmlentities($row['quote_scope']);
-                        if (empty($quote_scope)) {
-                            $quote_scope_display = "-";
-                        } else {
-                            $quote_scope_display = $quote_scope;
-                        }
-                        $quote_status = nullable_htmlentities($row['quote_status']);
-                        $quote_date = nullable_htmlentities($row['quote_date']);
-                        $quote_expire = nullable_htmlentities($row['quote_expire']);
-                        $quote_discount = floatval($row['quote_discount_amount']);
-                        $quote_amount = floatval($row['quote_amount']);
-                        $quote_currency_code = nullable_htmlentities($row['quote_currency_code']);
-                        $quote_created_at = nullable_htmlentities($row['quote_created_at']);
-                        $category_id = intval($row['category_id']);
-                        $category_name = nullable_htmlentities($row['category_name']);
-
-                        //Set Badge color based off of quote status
-                        if ($quote_status == "Sent") {
-                            $quote_badge_color = "warning text-white";
-                        } elseif ($quote_status == "Viewed") {
-                            $quote_badge_color = "primary";
-                        } elseif ($quote_status == "Accepted") {
-                            $quote_badge_color = "success";
-                        } elseif ($quote_status == "Declined") {
-                            $quote_badge_color = "danger";
-                        } elseif ($quote_status == "Invoiced") {
-                            $quote_badge_color = "info";
-                        } else {
-                            $quote_badge_color = "secondary";
-                        }
-
-                        ?>
-
-                        <tr>
-                            <td class="text-bold"><a href="quote.php?client_id=<?php echo $client_id; ?>&quote_id=<?php echo $quote_id; ?>"><?php echo "$quote_prefix$quote_number"; ?></a></td>
-                            <td><?php echo $quote_scope_display; ?></td>
-                            <td class="text-right text-bold"><?php echo numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code); ?></td>
-                            <td><?php echo $quote_date; ?></td>
-                            <td><?php echo $quote_expire; ?></td>
-                            <td><?php echo $category_name; ?></td>
-                            <td>
-                                <span class="p-2 badge badge-<?php echo $quote_badge_color; ?>">
-                                    <?php echo $quote_status; ?>
-                                </span>
-                            </td>
-                            <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 = "ajax/ajax_quote_edit.php"
-                                            data-ajax-id = "<?php echo $quote_id; ?>"
-                                            >
-                                            <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                        </a>
-                                        <a class="dropdown-item" href="#"
-                                            data-toggle = "ajax-modal" 
-                                            data-ajax-url = "ajax/ajax_quote_copy.php?client_id=<?php echo $client_id; ?>"
-                                            data-ajax-id = "<?php echo $quote_id; ?>"
-                                            >
-                                            <i class="fas fa-fw fa-copy mr-2"></i>Copy
-                                        </a>
-                                        <div class="dropdown-divider"></div>
-                                        <?php if (!empty($config_smtp_host)) { ?>
-                                            <a class="dropdown-item" href="post.php?email_quote=<?php echo $quote_id; ?>">
-                                                <i class="fas fa-fw fa-paper-plane mr-2"></i>Send
-                                            </a>
-                                            <div class="dropdown-divider"></div>
-                                        <?php } ?>
-                                        <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_quote=<?php echo $quote_id; ?>&client_id=<?php echo $client_id; ?>">
-                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                        </a>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-
-                        <?php
-
-                    }
-
-                    ?>
-
-                    </tbody>
-                </table>
-            </div>
-            <?php require_once "includes/filter_footer.php";
- ?>
-        </div>
-    </div>
-
-<?php
-require_once "modals/quote_add_modal.php";
-require_once "modals/client_quote_export_modal.php";
-require_once "includes/footer.php";
diff --git a/includes/client_side_nav.php b/includes/client_side_nav.php
index aceeffc2..9d034062 100644
--- a/includes/client_side_nav.php
+++ b/includes/client_side_nav.php
@@ -285,7 +285,7 @@
                         </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" || basename($_SERVER["PHP_SELF"]) == "quote.php") { echo "active"; } ?>">
+                            <a href="quotes.php?client_id=<?php echo $client_id; ?>" 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>
                                 <p>
                                     Quotes
diff --git a/modals/client_quote_export_modal.php b/modals/quote_export_modal.php
similarity index 79%
rename from modals/client_quote_export_modal.php
rename to modals/quote_export_modal.php
index e64c6283..9fa53607 100644
--- a/modals/client_quote_export_modal.php
+++ b/modals/quote_export_modal.php
@@ -8,12 +8,14 @@
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
+                <?php if(isset($_GET['client_id'])) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } ?>
                 <div class="modal-body bg-white">
 
                 </div>
                 <div class="modal-footer bg-white">
-                    <button type="submit" name="export_client_quotes_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
+                    <button type="submit" name="export_quotes_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
             </form>
diff --git a/post/user/quote.php b/post/user/quote.php
index 44cda583..7e111e52 100644
--- a/post/user/quote.php
+++ b/post/user/quote.php
@@ -521,7 +521,7 @@ if (isset($_GET['email_quote'])) {
 
 }
 
-if(isset($_POST['export_client_quotes_csv'])){
+if(isset($_POST['export_quotes_csv'])){
 
     enforceUserPermission('module_sales');
 
diff --git a/quote.php b/quote.php
index acbd97a4..23f719a0 100644
--- a/quote.php
+++ b/quote.php
@@ -122,14 +122,14 @@ if (isset($_GET['quote_id'])) {
             <a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
         </li>
         <li class="breadcrumb-item">
-            <a href="client_quotes.php?client_id=<?php echo $client_id; ?>">Quotes</a>
+            <a href="quotes.php?client_id=<?php echo $client_id; ?>">Quotes</a>
         </li>
         <?php } else { ?>
         <li class="breadcrumb-item">
-            <a href="quotes.php">Quotes</a>
+            <a href="quotes.php">Global Quotes</a>
         </li>
         <li class="breadcrumb-item">
-            <a href="client_quotes.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
+            <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>
diff --git a/quotes.php b/quotes.php
index fac57234..f3e94e56 100644
--- a/quotes.php
+++ b/quotes.php
@@ -4,14 +4,18 @@
 $sort = "quote_number";
 $order = "DESC";
 
-require_once "includes/inc_all.php";
+// If client_id is in URI then show client Side Bar and client header
+if (isset($_GET['client_id'])) {
+    require_once "includes/inc_all_client.php";
+    $client_query = "AND quote_client_id = $client_id";
+} else {
+    require_once "includes/inc_all.php";
+    $client_query = '';
+}
 
 // Perms
 enforceUserPermission('module_sales');
 
-//Rebuild URL
-$url_query_strings_sort = http_build_query($get_copy);
-
 $sql = mysqli_query(
     $mysqli,
     "SELECT SQL_CALC_FOUND_ROWS * FROM quotes
@@ -19,234 +23,260 @@ $sql = mysqli_query(
     LEFT JOIN categories ON quote_category_id = category_id
     WHERE (CONCAT(quote_prefix,quote_number) LIKE '%$q%' OR quote_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR quote_status LIKE '%$q%' OR quote_amount LIKE '%$q%' OR client_name LIKE '%$q%')
     AND DATE(quote_date) BETWEEN '$dtf' AND '$dtt'
-    ORDER BY $sort $order LIMIT $record_from, $record_to");
+    $client_query
+    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-comment-dollar mr-2"></i>Quotes</h3>
-            <div class="card-tools">
-            <?php if (lookupUserPermission("module_sales") >= 2) { ?>
+<div class="card card-dark">
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fa fa-comment-dollar mr-2"></i>Quotes</h3>
+        <div class="card-tools">
+        <?php if (lookupUserPermission("module_sales") >= 2) { ?>
+            <div class="btn-group">
                 <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addQuoteModal"><i class="fas fa-plus mr-2"></i>New Quote</button>
-            <?php } ?>
+                <?php if ($num_rows[0] > 0) { ?>
+                    <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="#exportQuoteModal">
+                            <i class="fa fa-fw fa-download mr-2"></i>Export
+                        </a>
+                    </div>
+                <?php } ?>
             </div>
+        <?php } ?>
         </div>
+    </div>
 
-        <div class="card-body">
-            <form class="mb-4" autocomplete="off">
+    <div class="card-body">
+        <form class="mb-4" autocomplete="off">
+            <?php if(isset($_GET['client_id'])) { ?>
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+            <?php } ?>
+            <div class="row">
+                <div class="col-sm-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 Quotes">
+                        <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-sm-8">
+                    <div class="float-right">
+
+                    </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-sm-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 Quotes">
-                            <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 class="col-md-2">
+                        <div class="form-group">
+                            <label>Canned Date</label>
+                            <select onchange="this.form.submit()" 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-sm-8">
-                        <div class="float-right">
-
+                    <div class="col-md-2">
+                        <div class="form-group">
+                            <label>Date From</label>
+                            <input onchange="this.form.submit()" 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 onchange="this.form.submit()" type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
                         </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 onchange="this.form.submit()" 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 onchange="this.form.submit()" 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 onchange="this.form.submit()" 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-borderless table-hover">
-                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-                    <tr>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_number&order=<?php echo $disp; ?>">
-                                Number <?php if ($sort == 'quote_number') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_scope&order=<?php echo $disp; ?>">
-                                Scope <?php if ($sort == 'quote_scope') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-dark" 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>
-                        <th class="text-right">
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_amount&order=<?php echo $disp; ?>">
-                                Amount <?php if ($sort == 'quote_amount') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_date&order=<?php echo $disp; ?>">
-                                Date <?php if ($sort == 'quote_number') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_expire&order=<?php echo $disp; ?>">
-                                Expire <?php if ($sort == 'quote_number') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=category_name&order=<?php echo $disp; ?>">
-                                Category <?php if ($sort == 'category_name') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_status&order=<?php echo $disp; ?>">
-                                Status <?php if ($sort == 'quote_status') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th class="text-center">Action</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php
+            </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-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_number&order=<?php echo $disp; ?>">
+                            Number <?php if ($sort == 'quote_number') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_scope&order=<?php echo $disp; ?>">
+                            Scope <?php if ($sort == 'quote_scope') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <?php if (!isset($_GET['client_id'])) { ?>
+                    <th>
+                        <a class="text-dark" 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>
+                    <?php } ?>
+                    <th class="text-right">
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_amount&order=<?php echo $disp; ?>">
+                            Amount <?php if ($sort == 'quote_amount') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_date&order=<?php echo $disp; ?>">
+                            Date <?php if ($sort == 'quote_number') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_expire&order=<?php echo $disp; ?>">
+                            Expire <?php if ($sort == 'quote_number') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=category_name&order=<?php echo $disp; ?>">
+                            Category <?php if ($sort == 'category_name') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=quote_status&order=<?php echo $disp; ?>">
+                            Status <?php if ($sort == 'quote_status') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th class="text-center">Action</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
 
-                    while ($row = mysqli_fetch_array($sql)) {
-                        $quote_id = intval($row['quote_id']);
-                        $quote_prefix = nullable_htmlentities($row['quote_prefix']);
-                        $quote_number = intval($row['quote_number']);
-                        $quote_scope = nullable_htmlentities($row['quote_scope']);
-                        if (empty($quote_scope)) {
-                            $quote_scope_display = "-";
-                        } else {
-                            $quote_scope_display = $quote_scope;
-                        }
-                        $quote_status = nullable_htmlentities($row['quote_status']);
-                        $quote_date = nullable_htmlentities($row['quote_date']);
-                        $quote_expire = nullable_htmlentities($row['quote_expire']);
-                        $quote_amount = floatval($row['quote_amount']);
-                        $quote_discount = floatval($row['quote_discount_amount']);
-                        $quote_currency_code = nullable_htmlentities($row['quote_currency_code']);
-                        $quote_created_at = nullable_htmlentities($row['quote_created_at']);
-                        $client_id = intval($row['client_id']);
-                        $client_name = nullable_htmlentities($row['client_name']);
-                        $client_currency_code = nullable_htmlentities($row['client_currency_code']);
-                        $category_id = intval($row['category_id']);
-                        $category_name = nullable_htmlentities($row['category_name']);
-                        $client_net_terms = intval($row['client_net_terms']);
-                        if ($client_net_terms == 0) {
-                            $client_net_terms = $config_default_net_terms;
-                        }
-
-                        if ($quote_status == "Sent") {
-                            $quote_badge_color = "warning text-white";
-                        } elseif ($quote_status == "Viewed") {
-                            $quote_badge_color = "primary";
-                        } elseif ($quote_status == "Accepted") {
-                            $quote_badge_color = "success";
-                        } elseif ($quote_status == "Declined") {
-                            $quote_badge_color = "danger";
-                        } elseif ($quote_status == "Invoiced") {
-                            $quote_badge_color = "info";
-                        } else {
-                            $quote_badge_color = "secondary";
-                        }
-
-                        ?>
-
-                        <tr>
-                            <td class="text-bold"><a href="quote.php?quote_id=<?php echo $quote_id; ?>"><?php echo "$quote_prefix$quote_number"; ?></a></td>
-                            <td><?php echo $quote_scope_display; ?></td>
-                            <td class="text-bold"><a href="client_quotes.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
-                            <td class="text-right text-bold"><?php echo numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code); ?></td>
-                            <td><?php echo $quote_date; ?></td>
-                            <td><?php echo $quote_expire; ?></td>
-                            <td><?php echo $category_name; ?></td>
-                            <td>
-                                <span class="p-2 badge badge-<?php echo $quote_badge_color; ?>">
-                                    <?php echo $quote_status; ?>
-                                </span>
-                            </td>
-                            <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 = "ajax/ajax_quote_edit.php"
-                                            data-ajax-id = "<?php echo $quote_id; ?>"
-                                            >
-                                            <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                        </a>
-                                        <?php if (lookupUserPermission("module_sales") >= 2) { ?>
-                                            <a class="dropdown-item" href="#"
-                                                data-toggle = "ajax-modal" 
-                                                data-ajax-url = "ajax/ajax_quote_copy.php"
-                                                data-ajax-id = "<?php echo $quote_id; ?>"
-                                                >
-                                                <i class="fas fa-fw fa-copy mr-2"></i>Copy
-                                            </a>
-                                            <?php if (!empty($config_smtp_host)) { ?>
-                                                <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item" href="post.php?email_quote=<?php echo $quote_id; ?>">
-                                                    <i class="fas fa-fw fa-paper-plane mr-2"></i>Email
-                                                </a>
-                                            <?php } ?>
-                                            <?php if (lookupUserPermission("module_sales") >= 3) { ?>
-                                                <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_quote=<?php echo $quote_id; ?>">
-                                                    <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                                </a>
-                                            <?php } ?>
-                                        <?php } ?>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-
-                        <?php
+                while ($row = mysqli_fetch_array($sql)) {
+                    $quote_id = intval($row['quote_id']);
+                    $quote_prefix = nullable_htmlentities($row['quote_prefix']);
+                    $quote_number = intval($row['quote_number']);
+                    $quote_scope = nullable_htmlentities($row['quote_scope']);
+                    if (empty($quote_scope)) {
+                        $quote_scope_display = "-";
+                    } else {
+                        $quote_scope_display = $quote_scope;
+                    }
+                    $quote_status = nullable_htmlentities($row['quote_status']);
+                    $quote_date = nullable_htmlentities($row['quote_date']);
+                    $quote_expire = nullable_htmlentities($row['quote_expire']);
+                    $quote_amount = floatval($row['quote_amount']);
+                    $quote_discount = floatval($row['quote_discount_amount']);
+                    $quote_currency_code = nullable_htmlentities($row['quote_currency_code']);
+                    $quote_created_at = nullable_htmlentities($row['quote_created_at']);
+                    $client_id = intval($row['client_id']);
+                    $client_name = nullable_htmlentities($row['client_name']);
+                    $client_currency_code = nullable_htmlentities($row['client_currency_code']);
+                    $category_id = intval($row['category_id']);
+                    $category_name = nullable_htmlentities($row['category_name']);
+                    $client_net_terms = intval($row['client_net_terms']);
+                    if ($client_net_terms == 0) {
+                        $client_net_terms = $config_default_net_terms;
+                    }
 
+                    if ($quote_status == "Sent") {
+                        $quote_badge_color = "warning text-white";
+                    } elseif ($quote_status == "Viewed") {
+                        $quote_badge_color = "primary";
+                    } elseif ($quote_status == "Accepted") {
+                        $quote_badge_color = "success";
+                    } elseif ($quote_status == "Declined") {
+                        $quote_badge_color = "danger";
+                    } elseif ($quote_status == "Invoiced") {
+                        $quote_badge_color = "info";
+                    } else {
+                        $quote_badge_color = "secondary";
                     }
 
                     ?>
 
-                    </tbody>
-                </table>
-            </div>
-            <?php require_once "includes/filter_footer.php";
- ?>
+                    <tr>
+                        <td class="text-bold">
+                            <a href="quote.php?quote_id=<?php echo $quote_id; ?><?php if (isset($_GET['client_id'])) { echo "&client_id=$client_id"; } ?>">
+                                <?php echo "$quote_prefix$quote_number"; ?>  
+                            </a>
+                        </td>
+                        <td><?php echo $quote_scope_display; ?></td>
+                        <?php if (!isset($_GET['client_id'])) { ?>
+                        <td class="text-bold">
+                            <a href="quotes.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
+                        </td>
+                        <?php } ?>
+                        <td class="text-right text-bold"><?php echo numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code); ?></td>
+                        <td><?php echo $quote_date; ?></td>
+                        <td><?php echo $quote_expire; ?></td>
+                        <td><?php echo $category_name; ?></td>
+                        <td>
+                            <span class="p-2 badge badge-<?php echo $quote_badge_color; ?>">
+                                <?php echo $quote_status; ?>
+                            </span>
+                        </td>
+                        <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 = "ajax/ajax_quote_edit.php"
+                                        data-ajax-id = "<?php echo $quote_id; ?>"
+                                        >
+                                        <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                    </a>
+                                    <?php if (lookupUserPermission("module_sales") >= 2) { ?>
+                                        <a class="dropdown-item" href="#"
+                                            data-toggle = "ajax-modal" 
+                                            data-ajax-url = "ajax/ajax_quote_copy.php"
+                                            data-ajax-id = "<?php echo $quote_id; ?>"
+                                            >
+                                            <i class="fas fa-fw fa-copy mr-2"></i>Copy
+                                        </a>
+                                        <?php if (!empty($config_smtp_host)) { ?>
+                                            <div class="dropdown-divider"></div>
+                                            <a class="dropdown-item" href="post.php?email_quote=<?php echo $quote_id; ?>">
+                                                <i class="fas fa-fw fa-paper-plane mr-2"></i>Email
+                                            </a>
+                                        <?php } ?>
+                                        <?php if (lookupUserPermission("module_sales") >= 3) { ?>
+                                            <div class="dropdown-divider"></div>
+                                            <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_quote=<?php echo $quote_id; ?>">
+                                                <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                            </a>
+                                        <?php } ?>
+                                    <?php } ?>
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
+
+                    <?php
+
+                }
+
+                ?>
+
+                </tbody>
+            </table>
         </div>
+        <?php require_once "includes/filter_footer.php";
+?>
     </div>
+</div>
 
 <?php
 
 require_once "modals/quote_add_modal.php";
+require_once "modals/quote_export_modal.php";
 require_once "includes/footer.php";