diff --git a/agent/modals/quote/quote_note.php b/agent/modals/quote/quote_note.php
index b71cfef0..26bdd8cd 100644
--- a/agent/modals/quote/quote_note.php
+++ b/agent/modals/quote/quote_note.php
@@ -1,24 +1,30 @@
 <div class="modal" id="quoteNoteModal" tabindex="-1">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <div class="modal-header bg-dark">
-        <h5 class="modal-title text-white"><i class="fas fa-fw fa-edit mr-2"></i>Quote Notes</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="quote_id" value="<?php echo $quote_id; ?>">
-        <div class="modal-body">  
-          <div class="form-group">
-            <textarea class="form-control" rows="8" name="note" placeholder="Enter some notes"><?php echo $quote_note; ?></textarea>
-          </div>
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
+                <h5 class="modal-title text-white">
+                    <i class="fas fa-fw fa-edit mr-2"></i>Quote Notes
+                </h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="quote_id" value="<?php echo $quote_id; ?>">
+                <div class="modal-body">
+                    <div class="form-group">
+                        <textarea class="form-control" rows="8" name="note" placeholder="Enter some notes"><?php echo $quote_note; ?></textarea>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="submit" name="quote_note" class="btn btn-primary text-bold">
+                        <i class="fas fa-check mr-2"></i>Save
+                    </button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal">
+                        <i class="fas fa-times mr-2"></i>Cancel
+                    </button>
+                </div>
+            </form>
         </div>
-        <div class="modal-footer">
-          <button type="submit" name="quote_note" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
-          <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/agent/modals/quote/quote_to_invoice.php b/agent/modals/quote/quote_to_invoice.php
index 77a5acc5..bdd36faa 100644
--- a/agent/modals/quote/quote_to_invoice.php
+++ b/agent/modals/quote/quote_to_invoice.php
@@ -1,33 +1,53 @@
-<div class="modal" id="addQuoteToInvoiceModal<?php echo $quote_id; ?>" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header bg-dark">
-        <h5 class="modal-title"><i class="fas fa-fw fa-file mr-2"></i>Quote <?php echo "$quote_prefix$quote_number"; ?> <i class="fas fa-arrow-right mr-2"></i>Invoice</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="quote_id" value="<?php echo $quote_id; ?>">
+<?php
 
-        <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-          <div class="form-group">
+$quote_id = intval($_GET['quote_id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM quotes WHERE quote_id = $quote_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$quote_prefix = nullable_htmlentities($row['quote_prefix']);
+$quote_number = intval($row['quote_number']);
+
+ob_start();
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title">
+        <i class="fas fa-fw fa-file mr-2"></i>
+        Quote <?= "$quote_prefix$quote_number" ?>
+        <i class="fas fa-arrow-right mr-2"></i>Invoice
+    </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="quote_id" value="<?= $quote_id ?>">
+
+    <div class="modal-body">
+
+        <div class="form-group">
             <label>Invoice Date <strong class="text-danger">*</strong></label>
             <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-              </div>
-              <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                </div>
+                <input type="date" class="form-control" name="date" max="2999-12-31" value="<?= date("Y-m-d"); ?>" required>
             </div>
-          </div>
+        </div>
 
-        </div>
-        <div class="modal-footer">
-          <button type="submit" name="add_quote_to_invoice" class="btn btn-primary text-bold"><strong><i class="fas fa-check mr-2"></i>Create Invoice</button>
-            <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_quote_to_invoice" class="btn btn-primary text-bold">
+            <strong><i class="fas fa-check mr-2"></i>Create Invoice</strong>
+        </button>
+        <button type="button" class="btn btn-light" data-dismiss="modal">
+            <i class="fas fa-times mr-2"></i>Cancel
+        </button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/quote.php b/agent/quote.php
index 11b269bc..d8e00f64 100644
--- a/agent/quote.php
+++ b/agent/quote.php
@@ -172,7 +172,8 @@ if (isset($_GET['quote_id'])) {
 
                 <?php if ($quote_status == 'Accepted') { ?>
                     <div class="btn-group fix-quote-dropdown">
-                        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addQuoteToInvoiceModal<?php echo $quote_id; ?>">
+                        <button type="button" class="btn btn-primary ajax-modal"
+                            data-modal-url="modals/quote/quote_to_invoice.php?quote_id=<?= $quote_id ?>">
                             <i class="fas fa-check mr-2"></i>Invoice
                         </button>
                         <button type="button" class="btn btn-primary dropdown-toggle dropdown-icon" data-toggle="dropdown" aria-expanded="false">
@@ -571,7 +572,6 @@ if (isset($_GET['quote_id'])) {
     </div>
 
 <?php
-    require_once "modals/quote/quote_to_invoice.php";
     require_once "modals/quote/quote_note.php";
 }