From 310e3f0a4294dbb94e22ac19409e5c9f4690db8b Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Sat, 10 Feb 2024 17:10:14 -0500
Subject: [PATCH] Split Admin Menu and Settings Menu

---
 ...count_types.php => admin_account_types.php |   8 +-
 ...l.php => admin_account_types_add_modal.php |   0
 ....php => admin_account_types_edit_modal.php |   0
 settings_api.php => admin_api.php             |   4 +-
 ...d_modal.php => admin_api_key_add_modal.php |   0
 settings_backup.php => admin_backup.php       |   2 +-
 categories.php => admin_categories.php        |   6 +-
 ..._modal.php => admin_category_add_modal.php |   0
 ...modal.php => admin_category_edit_modal.php |   0
 settings_debug.php => admin_debug.php         |   2 +-
 ...p => admin_document_template_add_modal.php |   0
 ...php => admin_document_template_details.php |   8 +-
 ... => admin_document_template_edit_modal.php |   0
 ...plates.php => admin_document_templates.php |   8 +-
 logs.php => admin_logs.php                    |   2 +-
 ...ngs_mail_queue.php => admin_mail_queue.php |   2 +-
 admin_side_nav.php                            | 141 ++++++++++++++++++
 ...p => admin_software_template_add_modal.php |   0
 ... => admin_software_template_edit_modal.php |   0
 ...plates.php => admin_software_templates.php |   6 +-
 ...g_add_modal.php => admin_tag_add_modal.php |   0
 ...edit_modal.php => admin_tag_edit_modal.php |   0
 settings_tags.php => admin_tags.php           |   6 +-
 ...x_add_modal.php => admin_tax_add_modal.php |   0
 ...edit_modal.php => admin_tax_edit_modal.php |   0
 settings_taxes.php => admin_taxes.php         |   6 +-
 settings_update.php => admin_update.php       |   2 +-
 ..._add_modal.php => admin_user_add_modal.php |   0
 ...=> admin_user_all_reset_password_modal.php |   0
 ..._modal.php => admin_user_archive_modal.php |   0
 ...dit_modal.php => admin_user_edit_modal.php |   0
 ...t_modal.php => admin_user_export_modal.php |   0
 ...e_modal.php => admin_user_invite_modal.php |   0
 users.php => admin_users.php                  |  14 +-
 ...php => admin_vendor_template_add_modal.php |   0
 ...hp => admin_vendor_template_edit_modal.php |   0
 ...emplates.php => admin_vendor_templates.php |   6 +-
 inc_all_admin.php                             |  21 +++
 debug.php => inc_debug.php                    |   0
 settings_side_nav.php                         | 130 +---------------
 side_nav.php                                  |   4 +-
 41 files changed, 206 insertions(+), 172 deletions(-)
 rename settings_account_types.php => admin_account_types.php (96%)
 rename settings_account_types_add_modal.php => admin_account_types_add_modal.php (100%)
 rename settings_account_types_edit_modal.php => admin_account_types_edit_modal.php (100%)
 rename settings_api.php => admin_api.php (98%)
 rename api_key_add_modal.php => admin_api_key_add_modal.php (100%)
 rename settings_backup.php => admin_backup.php (97%)
 rename categories.php => admin_categories.php (98%)
 rename category_add_modal.php => admin_category_add_modal.php (100%)
 rename category_edit_modal.php => admin_category_edit_modal.php (100%)
 rename settings_debug.php => admin_debug.php (99%)
 rename document_template_add_modal.php => admin_document_template_add_modal.php (100%)
 rename document_template_details.php => admin_document_template_details.php (90%)
 rename document_template_edit_modal.php => admin_document_template_edit_modal.php (100%)
 rename settings_document_templates.php => admin_document_templates.php (92%)
 rename logs.php => admin_logs.php (99%)
 rename settings_mail_queue.php => admin_mail_queue.php (99%)
 create mode 100644 admin_side_nav.php
 rename settings_software_template_add_modal.php => admin_software_template_add_modal.php (100%)
 rename settings_software_template_edit_modal.php => admin_software_template_edit_modal.php (100%)
 rename settings_software_templates.php => admin_software_templates.php (97%)
 rename settings_tag_add_modal.php => admin_tag_add_modal.php (100%)
 rename settings_tag_edit_modal.php => admin_tag_edit_modal.php (100%)
 rename settings_tags.php => admin_tags.php (97%)
 rename settings_tax_add_modal.php => admin_tax_add_modal.php (100%)
 rename settings_tax_edit_modal.php => admin_tax_edit_modal.php (100%)
 rename settings_taxes.php => admin_taxes.php (96%)
 rename settings_update.php => admin_update.php (99%)
 rename user_add_modal.php => admin_user_add_modal.php (100%)
 rename user_all_reset_password_modal.php => admin_user_all_reset_password_modal.php (100%)
 rename user_archive_modal.php => admin_user_archive_modal.php (100%)
 rename user_edit_modal.php => admin_user_edit_modal.php (100%)
 rename user_export_modal.php => admin_user_export_modal.php (100%)
 rename user_invite_modal.php => admin_user_invite_modal.php (100%)
 rename users.php => admin_users.php (97%)
 rename vendor_template_add_modal.php => admin_vendor_template_add_modal.php (100%)
 rename vendor_template_edit_modal.php => admin_vendor_template_edit_modal.php (100%)
 rename settings_vendor_templates.php => admin_vendor_templates.php (98%)
 create mode 100644 inc_all_admin.php
 rename debug.php => inc_debug.php (100%)

diff --git a/settings_account_types.php b/admin_account_types.php
similarity index 96%
rename from settings_account_types.php
rename to admin_account_types.php
index 0b43b0df..88803e01 100644
--- a/settings_account_types.php
+++ b/admin_account_types.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 
 // Default Column Sortby Filter
@@ -62,7 +62,7 @@ $num_rows = mysqli_num_rows($sql);
                 </div>
                 <div class="col-sm-8">
                     <div class="btn-group float-right">
-                        <a href="settings_account_types.php" class="btn <?php if (!isset($_GET['account_type']) && !isset($_GET['archived'])) {
+                        <a href="admin_account_types.php" class="btn <?php if (!isset($_GET['account_type']) && !isset($_GET['archived'])) {
                             echo 'btn-primary';
                         } else {
                             echo 'btn-default';
@@ -159,7 +159,7 @@ $num_rows = mysqli_num_rows($sql);
 
                         <?php
 
-                        require "settings_account_types_edit_modal.php";
+                        require "admin_account_types_edit_modal.php";
 
                     }
 
@@ -175,7 +175,7 @@ $num_rows = mysqli_num_rows($sql);
 </div>
 
 <?php
-require_once "settings_account_types_add_modal.php";
+require_once "admin_account_types_add_modal.php";
 
 require_once "footer.php";
 
diff --git a/settings_account_types_add_modal.php b/admin_account_types_add_modal.php
similarity index 100%
rename from settings_account_types_add_modal.php
rename to admin_account_types_add_modal.php
diff --git a/settings_account_types_edit_modal.php b/admin_account_types_edit_modal.php
similarity index 100%
rename from settings_account_types_edit_modal.php
rename to admin_account_types_edit_modal.php
diff --git a/settings_api.php b/admin_api.php
similarity index 98%
rename from settings_api.php
rename to admin_api.php
index 45a08a1a..d5c8ae3e 100644
--- a/settings_api.php
+++ b/admin_api.php
@@ -4,7 +4,7 @@
 $sort = "api_key_name";
 $order = "ASC";
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 
 //Rebuild URL
@@ -154,7 +154,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     <script src="js/bulk_actions.js"></script>
 
 <?php
-require_once "api_key_add_modal.php";
+require_once "admin_api_key_add_modal.php";
 
 require_once "footer.php";
 
diff --git a/api_key_add_modal.php b/admin_api_key_add_modal.php
similarity index 100%
rename from api_key_add_modal.php
rename to admin_api_key_add_modal.php
diff --git a/settings_backup.php b/admin_backup.php
similarity index 97%
rename from settings_backup.php
rename to admin_backup.php
index 7c42002b..b9eefb19 100644
--- a/settings_backup.php
+++ b/admin_backup.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
  ?>
 
 <div class="card card-dark mb-3">
diff --git a/categories.php b/admin_categories.php
similarity index 98%
rename from categories.php
rename to admin_categories.php
index 25f12b2a..00c0991d 100644
--- a/categories.php
+++ b/admin_categories.php
@@ -4,7 +4,7 @@
 $sort = "category_name";
 $order = "ASC";
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 
 if (isset($_GET['category'])) {
@@ -171,7 +171,7 @@ if (isset($_GET['archived'])) {
 
                         <?php
                     
-                        include "category_edit_modal.php";
+                        include "admin_category_edit_modal.php";
 
                     }
 
@@ -186,6 +186,6 @@ if (isset($_GET['archived'])) {
 </div>
 
 <?php
-require_once "category_add_modal.php";
+require_once "admin_category_add_modal.php";
 
 require_once "footer.php";
diff --git a/category_add_modal.php b/admin_category_add_modal.php
similarity index 100%
rename from category_add_modal.php
rename to admin_category_add_modal.php
diff --git a/category_edit_modal.php b/admin_category_edit_modal.php
similarity index 100%
rename from category_edit_modal.php
rename to admin_category_edit_modal.php
diff --git a/settings_debug.php b/admin_debug.php
similarity index 99%
rename from settings_debug.php
rename to admin_debug.php
index 34eaf21d..6caa6614 100644
--- a/settings_debug.php
+++ b/admin_debug.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 require_once "database_version.php";
 
diff --git a/document_template_add_modal.php b/admin_document_template_add_modal.php
similarity index 100%
rename from document_template_add_modal.php
rename to admin_document_template_add_modal.php
diff --git a/document_template_details.php b/admin_document_template_details.php
similarity index 90%
rename from document_template_details.php
rename to admin_document_template_details.php
index 23909b2c..4768ea51 100644
--- a/document_template_details.php
+++ b/admin_document_template_details.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 
 //Initialize the HTML Purifier to prevent XSS
@@ -31,10 +31,10 @@ $document_updated_at = nullable_htmlentities($row['document_updated_at']);
     <a href="clients.php">Home</a>
   </li>
   <li class="breadcrumb-item">
-    <a href="users.php">Settings</a>
+    <a href="admin_users.php">Admin</a>
   </li>
   <li class="breadcrumb-item">
-    <a href="settings_document_templates.php">Document Templates</a>
+    <a href="admin_document_templates.php">Document Templates</a>
   </li>
   <li class="breadcrumb-item active"><i class="fas fa-file mr-2"></i><?php echo $document_name; ?></li>
 </ol>
@@ -59,7 +59,7 @@ $document_updated_at = nullable_htmlentities($row['document_updated_at']);
 
 <?php
 
-require_once "document_template_edit_modal.php";
+require_once "admin_document_template_edit_modal.php";
 
 require_once "footer.php";
 
diff --git a/document_template_edit_modal.php b/admin_document_template_edit_modal.php
similarity index 100%
rename from document_template_edit_modal.php
rename to admin_document_template_edit_modal.php
diff --git a/settings_document_templates.php b/admin_document_templates.php
similarity index 92%
rename from settings_document_templates.php
rename to admin_document_templates.php
index 74ef5470..2fe38285 100644
--- a/settings_document_templates.php
+++ b/admin_document_templates.php
@@ -4,7 +4,7 @@
 $sort = "document_name";
 $order = "ASC";
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 
 // Search query SQL snippet
@@ -86,7 +86,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
           <tr>
             <td>
-              <a class="text-bold" href="document_template_details.php?document_id=<?php echo $document_id; ?>"><i class="fas fa-fw fa-file-alt text-dark"></i> <?php echo $document_name; ?></a>
+              <a class="text-bold" href="admin_document_template_details.php?document_id=<?php echo $document_id; ?>"><i class="fas fa-fw fa-file-alt text-dark"></i> <?php echo $document_name; ?></a>
               <div class="mt-1 text-secondary"><?php echo $document_description; ?></div>
             </td>
             <td>
@@ -116,7 +116,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
           <?php
 
-          include "document_template_edit_modal.php";
+          include "admin_document_template_edit_modal.php";
 
           }
 
@@ -132,7 +132,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 
-<?php include "document_template_add_modal.php";
+<?php include "admin_document_template_add_modal.php";
  ?>
 
 <?php include "footer.php";
diff --git a/logs.php b/admin_logs.php
similarity index 99%
rename from logs.php
rename to admin_logs.php
index 578b6124..3cd7eeba 100644
--- a/logs.php
+++ b/admin_logs.php
@@ -4,7 +4,7 @@
 $sort = "log_id";
 $order = "DESC";
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 
 //Rebuild URL
diff --git a/settings_mail_queue.php b/admin_mail_queue.php
similarity index 99%
rename from settings_mail_queue.php
rename to admin_mail_queue.php
index 0791c6c7..041b8671 100644
--- a/settings_mail_queue.php
+++ b/admin_mail_queue.php
@@ -4,7 +4,7 @@
 $sort = "email_id";
 $order = "DESC";
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 
 //Initialize the HTML Purifier to prevent XSS
diff --git a/admin_side_nav.php b/admin_side_nav.php
new file mode 100644
index 00000000..8a26f652
--- /dev/null
+++ b/admin_side_nav.php
@@ -0,0 +1,141 @@
+<!-- Main Sidebar Container -->
+<aside class="main-sidebar sidebar-dark-<?php echo nullable_htmlentities($config_theme); ?> d-print-none">
+
+  <a class="brand-link pb-1 mt-1" href="clients.php">
+    <p class="h6"><i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i> Back | <strong>Administration</strong></p>
+  </a>
+
+  <!-- Sidebar -->
+  <div class="sidebar">
+
+    <!-- Sidebar Menu -->
+    <nav>
+
+      <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" data-accordion="false">
+
+        <li class="nav-header">ACCESS</li>
+
+        <li class="nav-item">
+          <a href="admin_users.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_users.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-users"></i>
+            <p>Users</p>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_api.php") { echo "active"; } ?>"
+             href="admin_api.php">
+              <i class="nav-icon fas fa-key"></i>
+              <p>API Keys</p>
+          </a>
+        </li>
+
+        <li class="nav-header mt-3">TAGS & CATEGORIES</li>
+
+        <li class="nav-item">
+          <a href="admin_tags.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_tags.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-tags"></i>
+            <p>Tags</p>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a href="admin_categories.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_categories.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-list-ul"></i>
+            <p>Categories</p>
+          </a>
+        </li>
+        <!-- ---------------------- TODO: Custom Fields ----------------------
+        <li class="nav-item">
+          <a href="settings_custom_fields.php" class="nav-link <?php //if (basename($_SERVER["PHP_SELF"]) == "settings_custom_fields.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-th-list"></i>
+            <p>Custom Fields</p>
+          </a>
+        </li>
+        -->
+
+        <li class="nav-item">
+          <a href="admin_taxes.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_taxes.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-balance-scale"></i>
+            <p>Taxes</p>
+          </a>
+        </li>
+        
+        <li class="nav-item">
+          <a href="admin_account_types.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_account_types.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-money-bill-wave"></i>
+            <p>Account Types</p>
+          </a>
+        </li>
+
+        <li class="nav-header mt-3">TEMPLATES</li>
+
+        <li class="nav-item">
+          <a href="admin_vendor_templates.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_vendor_templates.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-building"></i>
+            <p>Vendor Templates</p>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a href="admin_software_templates.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_software_templates.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-rocket"></i>
+            <p>License Templates</p>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a href="admin_document_templates.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_document_templates.php" || basename($_SERVER["PHP_SELF"]) == "admin_document_template_details.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-file"></i>
+            <p>Document Templates</p>
+          </a>
+        </li>
+
+        <li class="nav-header mt-3">MAINTENANCE</li>
+
+        <li class="nav-item">
+          <a href="admin_mail_queue.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_mail_queue.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-mail-bulk"></i>
+            <p>Mail Queue</p>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a href="admin_logs.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_logs.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-history"></i>
+            <p>Audit Logs</p>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_backup.php") { echo "active"; } ?>"
+            href="admin_backup.php">
+            <i class="nav-icon fas fa-cloud-upload-alt"></i>
+            <p>Backup</p>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a href="admin_debug.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_debug.php") { echo "active"; } ?>">
+            <i class="nav-icon fa fa-bug"></i>
+            <p>Debug</p>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_update.php") { echo "active"; } ?>"
+            href="admin_update.php">
+            <i class="nav-icon fas fa-download"></i>
+            <p>Update</p>
+          </a>
+        </li>
+
+      </ul>
+    </nav>
+    <!-- /.sidebar-menu -->
+
+    <div class="mb-3"></div>
+
+  </div>
+  <!-- /.sidebar -->
+</aside>
diff --git a/settings_software_template_add_modal.php b/admin_software_template_add_modal.php
similarity index 100%
rename from settings_software_template_add_modal.php
rename to admin_software_template_add_modal.php
diff --git a/settings_software_template_edit_modal.php b/admin_software_template_edit_modal.php
similarity index 100%
rename from settings_software_template_edit_modal.php
rename to admin_software_template_edit_modal.php
diff --git a/settings_software_templates.php b/admin_software_templates.php
similarity index 97%
rename from settings_software_templates.php
rename to admin_software_templates.php
index 85f4fc41..2a98a09c 100644
--- a/settings_software_templates.php
+++ b/admin_software_templates.php
@@ -4,7 +4,7 @@
 $sort = "software_name";
 $order = "ASC";
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 
 //Rebuild URL
@@ -103,7 +103,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     <?php
 
-                    require "settings_software_template_edit_modal.php";
+                    require "admin_software_template_edit_modal.php";
 
                 }
 
@@ -118,7 +118,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-require_once "settings_software_template_add_modal.php";
+require_once "admin_software_template_add_modal.php";
 
 require_once "footer.php";
 
diff --git a/settings_tag_add_modal.php b/admin_tag_add_modal.php
similarity index 100%
rename from settings_tag_add_modal.php
rename to admin_tag_add_modal.php
diff --git a/settings_tag_edit_modal.php b/admin_tag_edit_modal.php
similarity index 100%
rename from settings_tag_edit_modal.php
rename to admin_tag_edit_modal.php
diff --git a/settings_tags.php b/admin_tags.php
similarity index 97%
rename from settings_tags.php
rename to admin_tags.php
index f14d96c6..939e4c4c 100644
--- a/settings_tags.php
+++ b/admin_tags.php
@@ -4,7 +4,7 @@
 $sort = "tag_name";
 $order = "ASC";
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 
 //Rebuild URL
@@ -93,7 +93,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "settings_tag_edit_modal.php";
+                        require "admin_tag_edit_modal.php";
 
 
                     }
@@ -109,7 +109,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "settings_tag_add_modal.php";
+require_once "admin_tag_add_modal.php";
 
 require_once "footer.php";
 
diff --git a/settings_tax_add_modal.php b/admin_tax_add_modal.php
similarity index 100%
rename from settings_tax_add_modal.php
rename to admin_tax_add_modal.php
diff --git a/settings_tax_edit_modal.php b/admin_tax_edit_modal.php
similarity index 100%
rename from settings_tax_edit_modal.php
rename to admin_tax_edit_modal.php
diff --git a/settings_taxes.php b/admin_taxes.php
similarity index 96%
rename from settings_taxes.php
rename to admin_taxes.php
index c686362e..4cc333f5 100644
--- a/settings_taxes.php
+++ b/admin_taxes.php
@@ -4,7 +4,7 @@
 $sort = "tax_name";
 $order = "ASC";
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 
 //Rebuild URL
@@ -70,7 +70,7 @@ $num_rows = mysqli_num_rows($sql);
 
                         <?php
 
-                        require "settings_tax_edit_modal.php";
+                        require "admin_tax_edit_modal.php";
 
                     }
 
@@ -88,7 +88,7 @@ $num_rows = mysqli_num_rows($sql);
     </div>
 
 <?php
-require_once "settings_tax_add_modal.php";
+require_once "admin_tax_add_modal.php";
 
 require_once "footer.php";
 
diff --git a/settings_update.php b/admin_update.php
similarity index 99%
rename from settings_update.php
rename to admin_update.php
index 771a7c5d..21229d82 100644
--- a/settings_update.php
+++ b/admin_update.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 require_once "database_version.php";
 
diff --git a/user_add_modal.php b/admin_user_add_modal.php
similarity index 100%
rename from user_add_modal.php
rename to admin_user_add_modal.php
diff --git a/user_all_reset_password_modal.php b/admin_user_all_reset_password_modal.php
similarity index 100%
rename from user_all_reset_password_modal.php
rename to admin_user_all_reset_password_modal.php
diff --git a/user_archive_modal.php b/admin_user_archive_modal.php
similarity index 100%
rename from user_archive_modal.php
rename to admin_user_archive_modal.php
diff --git a/user_edit_modal.php b/admin_user_edit_modal.php
similarity index 100%
rename from user_edit_modal.php
rename to admin_user_edit_modal.php
diff --git a/user_export_modal.php b/admin_user_export_modal.php
similarity index 100%
rename from user_export_modal.php
rename to admin_user_export_modal.php
diff --git a/user_invite_modal.php b/admin_user_invite_modal.php
similarity index 100%
rename from user_invite_modal.php
rename to admin_user_invite_modal.php
diff --git a/users.php b/admin_users.php
similarity index 97%
rename from users.php
rename to admin_users.php
index feb6d7a4..d8a3c393 100644
--- a/users.php
+++ b/admin_users.php
@@ -4,7 +4,7 @@
 $sort = "user_name";
 $order = "ASC";
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 
 //Rebuild URL
@@ -187,9 +187,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     <?php
 
-                    require "user_edit_modal.php";
+                    require "admin_user_edit_modal.php";
 
-                    require "user_archive_modal.php";
+                    require "admin_user_archive_modal.php";
 
 
                 }
@@ -211,13 +211,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "user_add_modal.php";
+require_once "admin_user_add_modal.php";
 
-require_once "user_invite_modal.php";
+require_once "admin_user_invite_modal.php";
 
-require_once "user_export_modal.php";
+require_once "admin_user_export_modal.php";
 
-require_once "user_all_reset_password_modal.php";
+require_once "admin_user_all_reset_password_modal.php";
 
 require_once "footer.php";
 
diff --git a/vendor_template_add_modal.php b/admin_vendor_template_add_modal.php
similarity index 100%
rename from vendor_template_add_modal.php
rename to admin_vendor_template_add_modal.php
diff --git a/vendor_template_edit_modal.php b/admin_vendor_template_edit_modal.php
similarity index 100%
rename from vendor_template_edit_modal.php
rename to admin_vendor_template_edit_modal.php
diff --git a/settings_vendor_templates.php b/admin_vendor_templates.php
similarity index 98%
rename from settings_vendor_templates.php
rename to admin_vendor_templates.php
index 7adedd9b..24393037 100644
--- a/settings_vendor_templates.php
+++ b/admin_vendor_templates.php
@@ -4,7 +4,7 @@
 $sort = "vendor_name";
 $order = "ASC";
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 
 //Rebuild URL
@@ -147,7 +147,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "vendor_template_edit_modal.php";
+                        require "admin_vendor_template_edit_modal.php";
 
                     }
 
@@ -162,7 +162,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "vendor_template_add_modal.php";
+require_once "admin_vendor_template_add_modal.php";
 
 require_once "footer.php";
 
diff --git a/inc_all_admin.php b/inc_all_admin.php
new file mode 100644
index 00000000..8bfd19f5
--- /dev/null
+++ b/inc_all_admin.php
@@ -0,0 +1,21 @@
+<?php
+
+require_once "config.php";
+
+require_once "functions.php";
+
+require_once "check_login.php";
+
+validateAdminRole();
+
+require_once "header.php";
+
+require_once "top_nav.php";
+
+require_once "admin_side_nav.php";
+
+require_once "inc_wrapper.php";
+
+require_once "inc_alert_feedback.php";
+
+require_once "pagination_head.php";
diff --git a/debug.php b/inc_debug.php
similarity index 100%
rename from debug.php
rename to inc_debug.php
diff --git a/settings_side_nav.php b/settings_side_nav.php
index 9a7ea305..d540b2f8 100644
--- a/settings_side_nav.php
+++ b/settings_side_nav.php
@@ -2,7 +2,7 @@
 <aside class="main-sidebar sidebar-dark-<?php echo nullable_htmlentities($config_theme); ?> d-print-none">
 
   <a class="brand-link pb-1 mt-1" href="clients.php">
-    <p class="h6"><i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i> Back | <strong>Administration</strong></p>
+    <p class="h6"><i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i> Back | <strong>Settings</strong></p>
   </a>
 
   <!-- Sidebar -->
@@ -13,134 +13,6 @@
 
       <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" data-accordion="false">
 
-        <li class="nav-header">ACCESS</li>
-
-        <li class="nav-item">
-          <a href="users.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "users.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-users"></i>
-            <p>Users</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_api.php") { echo "active"; } ?>"
-             href="settings_api.php">
-              <i class="nav-icon fas fa-key"></i>
-              <p>API Keys</p>
-          </a>
-        </li>
-
-        <li class="nav-header mt-3">TAGS & CATEGORIES</li>
-
-        <li class="nav-item">
-          <a href="settings_tags.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_tags.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-tags"></i>
-            <p>Tags</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a href="categories.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "categories.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-list-ul"></i>
-            <p>Categories</p>
-          </a>
-        </li>
-        <!-- ---------------------- TODO: Custom Fields ----------------------
-        <li class="nav-item">
-          <a href="settings_custom_fields.php" class="nav-link <?php //if (basename($_SERVER["PHP_SELF"]) == "settings_custom_fields.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-th-list"></i>
-            <p>Custom Fields</p>
-          </a>
-        </li>
-        -->
-
-        <li class="nav-item">
-          <a href="settings_taxes.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_taxes.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-balance-scale"></i>
-            <p>Taxes</p>
-          </a>
-        </li>
-        
-        <li class="nav-item">
-          <a href="settings_account_types.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_account_types.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-money-bill-wave"></i>
-            <p>Account Types</p>
-          </a>
-        </li>
-
-        <li class="nav-header mt-3">TEMPLATES</li>
-
-        <li class="nav-item">
-          <a href="settings_vendor_templates.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_vendor_templates.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-building"></i>
-            <p>Vendor Templates</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a href="settings_software_templates.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_software_templates.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-rocket"></i>
-            <p>License Templates</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a href="settings_document_templates.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_document_templates.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-file"></i>
-            <p>Document Templates</p>
-          </a>
-        </li>
-
-        <li class="nav-header mt-3">MAINTENANCE</li>
-
-        <li class="nav-item">
-          <a href="settings_mail_queue.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_mail_queue.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-mail-bulk"></i>
-            <p>Mail Queue</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a href="logs.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "logs.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-history"></i>
-            <p>Audit Logs</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_backup.php") { echo "active"; } ?>"
-            href="settings_backup.php">
-            <i class="nav-icon fas fa-cloud-upload-alt"></i>
-            <p>Backup</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a href="settings_debug.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_debug.php") { echo "active"; } ?>">
-            <i class="nav-icon fa fa-bug"></i>
-            <p>Debug</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_update.php") { echo "active"; } ?>"
-            href="settings_update.php">
-            <i class="nav-icon fas fa-download"></i>
-            <p>Update</p>
-          </a>
-        </li>
-
-<!--        <li class="nav-item">-->
-<!--          <a href="settings_maintenance.php" class="nav-link --><?php //if (basename($_SERVER["PHP_SELF"]) == "settings_maintenance.php") { echo "active"; } ?><!--">-->
-<!--            <i class="nav-icon fa fa-wrench"></i>-->
-<!--            <p>Maintenance</p>-->
-<!--          </a>-->
-<!--        </li>-->
-
-        
-
-        <li class="nav-header mt-3">SETTINGS</li>
-
         <li class="nav-item">
           <a href="settings_company.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_company.php") { echo "active"; } ?>">
             <i class="nav-icon fa fa-briefcase"></i>
diff --git a/side_nav.php b/side_nav.php
index a7dd0719..37239409 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -169,7 +169,7 @@
                 <?php if ($session_user_role == 3) { ?>
 
                     <li class="nav-item">
-                        <a href="users.php" class="nav-link">
+                        <a href="admin_users.php" class="nav-link">
                             <i class="nav-icon fas fa-user-shield"></i>
                             <p>Admin</p>
                             <i class="fas fa-angle-right nav-icon float-right"></i>
@@ -177,7 +177,7 @@
                     </li>
 
                     <li class="nav-item">
-                        <a href="users.php" class="nav-link">
+                        <a href="settings_company.php" class="nav-link">
                             <i class="nav-icon fas fa-cogs"></i>
                             <p>Settings</p>
                             <i class="fas fa-angle-right nav-icon float-right"></i>