diff --git a/agent/modals/product/product_add.php b/agent/modals/product/product_add.php
index 4448475f..51af4f00 100644
--- a/agent/modals/product/product_add.php
+++ b/agent/modals/product/product_add.php
@@ -1,133 +1,144 @@
-<div class="modal" id="addProductModal" 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 <?= $type_icon ?> mr-2"></i>New <strong><?= ucwords($type_filter); ?></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="type" value="<?= $type_filter ?>">
+<?php
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
-                        <label>Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fas fa-fw fa-box"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Product name" maxlength="200" required autofocus>
-                        </div>
-                    </div>
+$type = nullable_htmlentities($_GET['type'] ?? '');
+if ($type == 'product') {
+    $type_icon = "fa-box-open";
+} else {
+    $type_icon = "fa-wrench";
+}
 
-                    <div class="form-group">
-                        <label>Category <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-tag"></i></span>
-                            </div>
-                            <select class="form-control select2" name="category" required>
-                                <option value="">- Select Category -</option>
-                                <?php
+ob_start();
 
-                                $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL");
-                                while ($row = mysqli_fetch_array($sql)) {
-                                    $category_id = intval($row['category_id']);
-                                    $category_name = nullable_htmlentities($row['category_name']);
-                                    ?>
-                                    <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-
-                                    <?php
-                                }
-                                ?>
-                            </select>
-                            <div class="input-group-append">
-                                <button class="btn btn-secondary ajax-modal" type="button"
-                                    data-modal-url="../admin/modals/category/category_add.php?category=Income">
-                                    <i class="fas fa-fw fa-plus"></i>
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-row">
-                        <div class="col">
-                            <div class="form-group">
-                                <label>Price <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-dollar-sign"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="price" placeholder="0.00" required>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="col">
-                            <div class="form-group">
-                                <label>Tax</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="tax">
-                                        <option value="0">None</option>
-                                        <?php
-
-                                        $taxes_sql = mysqli_query($mysqli, "SELECT * FROM taxes WHERE tax_archived_at IS NULL ORDER BY tax_name ASC");
-                                        while ($row = mysqli_fetch_array($taxes_sql)) {
-                                            $tax_id = intval($row['tax_id']);
-                                            $tax_name = nullable_htmlentities($row['tax_name']);
-                                            $tax_percent = floatval($row['tax_percent']);
-                                            ?>
-                                            <option value="<?php echo $tax_id; ?>"><?php echo "$tax_name $tax_percent%"; ?></option>
-
-                                            <?php
-                                        }
-                                        ?>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <?php if ($type_filter == 'product') { ?>
-                    <div class="form-group">
-                        <label>Location</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="location" placeholder="Enter a location">
-                        </div>
-                    </div>
-                    <?php } ?>
-
-                    <div class="form-group">
-                        <label>Description</label>
-                        <textarea class="form-control" rows="4" name="description" placeholder="Product description"></textarea>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Code</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="code" placeholder="Enter product code eg. SKU #">
-                        </div>
-                    </div>
-
-                </div>
-
-                <div class="modal-footer">
-                    <button type="submit" name="add_product" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</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 class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw <?= $type_icon ?> mr-2"></i>New <strong><?= ucwords($type); ?></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="type" value="<?= $type ?>">
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fas fa-fw fa-box"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Product name" maxlength="200" required autofocus>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Category <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-tag"></i></span>
+                </div>
+                <select class="form-control select2" name="category" required>
+                    <option value="">- Select Category -</option>
+                    <?php
+
+                    $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL");
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $category_id = intval($row['category_id']);
+                        $category_name = nullable_htmlentities($row['category_name']);
+                        ?>
+                        <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+
+                        <?php
+                    }
+                    ?>
+                </select>
+                <div class="input-group-append">
+                    <button class="btn btn-secondary ajax-modal" type="button"
+                        data-modal-url="../admin/modals/category/category_add.php?category=Income">
+                        <i class="fas fa-fw fa-plus"></i>
+                    </button>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-row">
+            <div class="col">
+                <div class="form-group">
+                    <label>Price <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-dollar-sign"></i></span>
+                        </div>
+                        <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="price" placeholder="0.00" required>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col">
+                <div class="form-group">
+                    <label>Tax</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
+                        </div>
+                        <select class="form-control select2" name="tax">
+                            <option value="0">None</option>
+                            <?php
+
+                            $taxes_sql = mysqli_query($mysqli, "SELECT * FROM taxes WHERE tax_archived_at IS NULL ORDER BY tax_name ASC");
+                            while ($row = mysqli_fetch_array($taxes_sql)) {
+                                $tax_id = intval($row['tax_id']);
+                                $tax_name = nullable_htmlentities($row['tax_name']);
+                                $tax_percent = floatval($row['tax_percent']);
+                                ?>
+                                <option value="<?php echo $tax_id; ?>"><?php echo "$tax_name $tax_percent%"; ?></option>
+
+                                <?php
+                            }
+                            ?>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <?php if ($type == 'product') { ?>
+        <div class="form-group">
+            <label>Location</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                </div>
+                <input type="text" class="form-control" name="location" placeholder="Enter a location">
+            </div>
+        </div>
+        <?php } ?>
+
+        <div class="form-group">
+            <label>Description</label>
+            <textarea class="form-control" rows="4" name="description" placeholder="Product description"></textarea>
+        </div>
+
+        <div class="form-group">
+            <label>Code</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
+                </div>
+                <input type="text" class="form-control" name="code" placeholder="Enter product code eg. SKU #">
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="add_product" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</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/products.php b/agent/products.php
index 287846d2..7714fdf8 100644
--- a/agent/products.php
+++ b/agent/products.php
@@ -60,7 +60,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <h3 class="card-title mt-2"><i class="fas fa-fw <?= $type_icon ?> mr-2"></i><?= $type_display ?></h3>
             <div class="card-tools">
                 <div class="btn-group">
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addProductModal"><i class="fas fa-plus mr-2"></i>New <strong><?= ucwords($type_filter); ?></strong></button>
+                    <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/product/product_add.php?type=<?= $type_filter ?>"><i class="fas fa-plus mr-2"></i>New <strong><?= ucwords($type_filter); ?></strong></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="#exportProductsModal">
@@ -324,8 +324,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-
-require_once "modals/product/product_add.php";
 require_once "modals/product/product_export.php";
-
 require_once "../includes/footer.php";