diff --git a/agent/modals/product/product_bulk_edit_category.php b/agent/modals/product/product_bulk_edit_category.php
index aa39be30..34f5a13e 100644
--- a/agent/modals/product/product_bulk_edit_category.php
+++ b/agent/modals/product/product_bulk_edit_category.php
@@ -1,42 +1,58 @@
-<div class="modal" id="bulkEditCategoryModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-list mr-2"></i>Bulk Set Category</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
 
-                <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-list"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_category_id">
-                            <?php
+<?php
 
-                            $sql = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                            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>
+require_once '../../../includes/modal_header.php';
 
-                                <?php
-                            }
-                            ?>
-                        </select>
-                    </div>
+$product_ids = array_map('intval', $_GET['product_ids'] ?? []);
+
+$count = count($product_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-list mr-2"></i>Set Category for <strong><?= $count ?></strong> Products</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="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($product_ids as $product_id) { ?><input type="hidden" name="product_ids[]" value="<?= $product_id ?>"><?php } ?>
+    <div class="modal-body">
+
+        <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-list"></i></span>
                 </div>
+                <select class="form-control select2" name="bulk_category_id">
+                    <?php
 
-            </div>
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_product_category" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check mr-2"></i>Set</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                    $sql = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                    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>
         </div>
+
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_product_category" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check mr-2"></i>Set</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/modal_footer.php';
diff --git a/agent/modals/rack/rack_add.php b/agent/modals/quote/rack/rack_add.php
similarity index 100%
rename from agent/modals/rack/rack_add.php
rename to agent/modals/quote/rack/rack_add.php
diff --git a/agent/modals/rack/rack_device_add.php b/agent/modals/quote/rack/rack_device_add.php
similarity index 100%
rename from agent/modals/rack/rack_device_add.php
rename to agent/modals/quote/rack/rack_device_add.php
diff --git a/agent/modals/rack/rack_edit.php b/agent/modals/quote/rack/rack_edit.php
similarity index 100%
rename from agent/modals/rack/rack_edit.php
rename to agent/modals/quote/rack/rack_edit.php
diff --git a/agent/products.php b/agent/products.php
index 7714fdf8..5acfbd83 100644
--- a/agent/products.php
+++ b/agent/products.php
@@ -119,7 +119,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <a href="?type=service" class="btn btn-<?php if ($type_filter == 'service'){ echo "primary"; } else { echo "default"; } ?>"><i class="fa fa-fw fa-wrench"></i><span class="d-none d-sm-inline ml-2">Service</span></a>
                                     <a href="?type=product" class="btn btn-<?php if ($type_filter == 'product'){ echo "primary"; } else { echo "default"; } ?>"><i class="fa fa-fw fa-cube"></i><span class="d-none d-sm-inline ml-2">Product</span></a>
                                 </div>
-                                <a href="?<?php echo $url_query_strings_sort ?>&archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>" 
+                                <a href="?<?php echo $url_query_strings_sort ?>&archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
                                     class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"; } ?>">
                                     <i class="fa fa-fw fa-archive mr-2"></i>Archived
                                 </a>
@@ -128,7 +128,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                                     </button>
                                     <div class="dropdown-menu">
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditCategoryModal">
+                                        <a class="dropdown-item ajax-modal" href="#"
+                                            data-modal-url="modals/product/product_bulk_edit_category.php"
+                                            data-bulk="true">
                                             <i class="fas fa-fw fa-list mr-2"></i>Set Category
                                         </a>
                                         <?php if ($archived) { ?>
@@ -263,7 +265,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <td><?= $tax_name ?></td>
                                 <td><?= $tax_percent ?>%</td>
                                 <td class="text-right"><?php echo numfmt_format_currency($currency_format, $product_price, $product_currency_code); ?></td>
-                                
+
                                 <td>
                                     <div class="dropdown dropleft text-center">
                                         <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
@@ -314,14 +316,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </tbody>
                     </table>
                 </div>
-                <?php require_once "modals/product/product_bulk_edit_category.php"; ?>
             </form>
-            <?php require_once "../includes/filter_footer.php";
- ?>
+            <?php require_once "../includes/filter_footer.php"; ?>
         </div>
     </div>
 
-<script src="../js/bulk_actions.js"></script>
+<script src="/js/bulk_actions.js"></script>
 
 <?php
 require_once "modals/product/product_export.php";