diff --git a/add_account_modal.php b/account_add_modal.php
similarity index 100%
rename from add_account_modal.php
rename to account_add_modal.php
diff --git a/edit_account_modal.php b/account_edit_modal.php
similarity index 100%
rename from edit_account_modal.php
rename to account_edit_modal.php
diff --git a/accounts.php b/accounts.php
index 67175b1a6..8526c4da3 100644
--- a/accounts.php
+++ b/accounts.php
@@ -122,7 +122,7 @@
           </tr>
 
           <?php
-          include("edit_account_modal.php");
+          include("account_edit_modal.php");
           }
           ?>
 
@@ -135,7 +135,7 @@
 
 <?php
 
-  include("add_account_modal.php");
+  include("account_add_modal.php");
   
   include("footer.php");
 
diff --git a/add_calendar_modal.php b/calendar_add_modal.php
similarity index 100%
rename from add_calendar_modal.php
rename to calendar_add_modal.php
diff --git a/add_calendar_event_modal.php b/calendar_event_add_modal.php
similarity index 100%
rename from add_calendar_event_modal.php
rename to calendar_event_add_modal.php
diff --git a/edit_calendar_event_modal.php b/calendar_event_edit_modal.php
similarity index 100%
rename from edit_calendar_event_modal.php
rename to calendar_event_edit_modal.php
diff --git a/calendar_events.php b/calendar_events.php
index 9712a199b..333aa21a3 100644
--- a/calendar_events.php
+++ b/calendar_events.php
@@ -14,8 +14,8 @@
   
 <?php 
   
-  include("add_calendar_event_modal.php");
-  include("add_calendar_modal.php");
+  include("calendar_event_add_modal.php");
+  include("calendar_add_modal.php");
   include("add_quick_modal.php");
 
 ?>
@@ -35,7 +35,7 @@
   $calendar_color = $row['calendar_color'];
   $client_id = $row['event_client_id'];
 
-  include("edit_calendar_event_modal.php");
+  include("calendar_event_edit_modal.php");
 
 }
 
diff --git a/categories.php b/categories.php
index d61f474c1..93c8bc2cb 100644
--- a/categories.php
+++ b/categories.php
@@ -140,7 +140,7 @@
 
           //$colors_diff = array_diff($colors_array,$colors_used_array);
 
-          include("edit_category_modal.php");
+          include("category_edit_modal.php");
 
           }
 
@@ -155,7 +155,7 @@
 
 <?php 
 
-  include("add_category_modal.php");
+  include("category_add_modal.php");
 
   include("footer.php");
 
diff --git a/add_category_modal.php b/category_add_modal.php
similarity index 100%
rename from add_category_modal.php
rename to category_add_modal.php
diff --git a/edit_category_modal.php b/category_edit_modal.php
similarity index 100%
rename from edit_category_modal.php
rename to category_edit_modal.php
diff --git a/add_quick_modal.php b/category_quick_add_modal.php
similarity index 100%
rename from add_quick_modal.php
rename to category_quick_add_modal.php
diff --git a/client.php b/client.php
index 1dba52ecc..6a9e97c5d 100644
--- a/client.php
+++ b/client.php
@@ -261,8 +261,8 @@
   
   include("client_routes.php");
   include("client_edit_modal.php");
-  include("add_quick_modal.php");
   include("client_delete_modal.php");
+  include("category_quick_add_modal.php");
 
   }
 
diff --git a/add_asset_modal.php b/client_asset_add_modal.php
similarity index 100%
rename from add_asset_modal.php
rename to client_asset_add_modal.php
diff --git a/edit_asset_modal.php b/client_asset_edit_modal.php
similarity index 100%
rename from edit_asset_modal.php
rename to client_asset_edit_modal.php
diff --git a/add_asset_csv_modal.php b/client_asset_import_modal.php
similarity index 95%
rename from add_asset_csv_modal.php
rename to client_asset_import_modal.php
index 3b73a2c5e..f5820aa5f 100644
--- a/add_asset_csv_modal.php
+++ b/client_asset_import_modal.php
@@ -1,4 +1,4 @@
-<div class="modal" id="addAssetCSVModal" tabindex="-1">
+<div class="modal" id="importAssetModal" tabindex="-1">
 	<div class="modal-dialog">
 		<div class="modal-content bg-dark">
 			<div class="modal-header">
diff --git a/client_assets.php b/client_assets.php
index 14e81d4f1..c02499d75 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -150,7 +150,7 @@
         <div class="col-md-2">
           <div class="float-right">
             <a href="post.php?export_client_<?php echo $_GET['tab']; ?>_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
-            <button type="button" class="btn btn-default" data-toggle="modal" data-target="#addAssetCSVModal"><i class="fa fa-fw fa-upload"></i> Import</button>
+            <button type="button" class="btn btn-default" data-toggle="modal" data-target="#importAssetModal"><i class="fa fa-fw fa-upload"></i> Import</button>
           </div>
         </div>
 
@@ -344,7 +344,7 @@
 
           <?php
           
-          include("edit_asset_modal.php");
+          include("client_asset_edit_modal.php");
           }
           
           ?>
@@ -357,6 +357,6 @@
 </div>
 
 <?php
-include("add_asset_modal.php");
-include("add_asset_csv_modal.php");
+include("client_asset_add_modal.php");
+include("client_asset_import_modal.php");
 ?>
\ No newline at end of file
diff --git a/add_certificate_modal.php b/client_certificate_add_modal.php
similarity index 100%
rename from add_certificate_modal.php
rename to client_certificate_add_modal.php
diff --git a/edit_certificate_modal.php b/client_certificate_edit_modal.php
similarity index 100%
rename from edit_certificate_modal.php
rename to client_certificate_edit_modal.php
diff --git a/client_certificates.php b/client_certificates.php
index 8c935403f..dc631e65f 100644
--- a/client_certificates.php
+++ b/client_certificates.php
@@ -124,7 +124,7 @@
 
           <?php
 
-          include("edit_certificate_modal.php");
+          include("client_certificate_edit_modal.php");
           }
           
           ?>
@@ -136,7 +136,7 @@
   </div>
 </div>
 
-<?php include("add_certificate_modal.php"); ?>
+<?php include("client_certificate_add_modal.php"); ?>
 
 <script type="text/javascript">
     function fetchSSL()
diff --git a/add_contact_modal.php b/client_contact_add_modal.php
similarity index 100%
rename from add_contact_modal.php
rename to client_contact_add_modal.php
diff --git a/edit_contact_modal.php b/client_contact_edit_modal.php
similarity index 100%
rename from edit_contact_modal.php
rename to client_contact_edit_modal.php
diff --git a/client_contacts.php b/client_contacts.php
index c7516194f..c0108fa46 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -188,7 +188,7 @@
 
           <?php
           
-          include("edit_contact_modal.php");
+          include("client_contact_edit_modal.php");
 
           }
           
@@ -201,4 +201,4 @@
   </div>
 </div>
 
-<?php include("add_contact_modal.php"); ?>
+<?php include("client_contact_add_modal.php"); ?>
diff --git a/add_document_modal.php b/client_document_add_modal.php
similarity index 100%
rename from add_document_modal.php
rename to client_document_add_modal.php
diff --git a/edit_document_modal.php b/client_document_edit_modal.php
similarity index 100%
rename from edit_document_modal.php
rename to client_document_edit_modal.php
diff --git a/manage_document_tags_modal.php b/client_document_tags_modal.php
similarity index 100%
rename from manage_document_tags_modal.php
rename to client_document_tags_modal.php
diff --git a/view_document_modal.php b/client_document_view_modal.php
similarity index 100%
rename from view_document_modal.php
rename to client_document_view_modal.php
diff --git a/client_documents.php b/client_documents.php
index a4e2582ca..8c0abec8a 100644
--- a/client_documents.php
+++ b/client_documents.php
@@ -169,13 +169,13 @@
                   <a class="dropdown-item text-danger" href="post.php?delete_document=<?php echo $document_id; ?>">Delete</a>
                 </div>
               </div>
-              <?php include("view_document_modal.php"); ?>      
+              <?php include("client_document_view_modal.php"); ?>      
             </td>
           </tr>
 
           <?php
           
-          include("edit_document_modal.php");
+          include("client_document_edit_modal.php");
           }
 
           ?>
@@ -187,5 +187,5 @@
   </div>
 </div>
 
-<?php include("add_document_modal.php"); ?>
-<?php include("manage_document_tags_modal.php"); ?>
+<?php include("client_document_add_modal.php"); ?>
+<?php include("client_document_tags_modal.php"); ?>
diff --git a/add_domain_modal.php b/client_domain_add_modal.php
similarity index 100%
rename from add_domain_modal.php
rename to client_domain_add_modal.php
diff --git a/edit_domain_modal.php b/client_domain_edit_modal.php
similarity index 100%
rename from edit_domain_modal.php
rename to client_domain_edit_modal.php
diff --git a/client_domains.php b/client_domains.php
index ebb978f88..af89d6312 100644
--- a/client_domains.php
+++ b/client_domains.php
@@ -133,7 +133,7 @@
 
           <?php
 
-          include("edit_domain_modal.php");
+          include("client_domain_edit_modal.php");
           }
           
           ?>
@@ -145,4 +145,4 @@
   </div>
 </div>
 
-<?php include("add_domain_modal.php"); ?>
\ No newline at end of file
+<?php include("client_domain_add_modal.php"); ?>
\ No newline at end of file
diff --git a/client_events.php b/client_events.php
index 00a9dc309..5c9cece23 100644
--- a/client_events.php
+++ b/client_events.php
@@ -12,8 +12,8 @@
   <div id='calendar'></div>
 </div>
 
-<?php include("add_calendar_event_modal.php"); ?>
-<?php include("add_calendar_modal.php"); ?>
+<?php include("calendar_event_add_modal.php"); ?>
+<?php include("calendar_add_modal.php"); ?>
 
 <?php 
 ?>
@@ -32,7 +32,7 @@
   $calendar_name = $row['calendar_name'];
   $calendar_color = $row['calendar_color'];
 
-  include("edit_calendar_event_modal.php");
+  include("calendar_event_edit_modal.php");
 
 }
 
diff --git a/add_file_modal.php b/client_file_add_modal.php
similarity index 100%
rename from add_file_modal.php
rename to client_file_add_modal.php
diff --git a/view_file_modal.php b/client_file_view_modal.php
similarity index 100%
rename from view_file_modal.php
rename to client_file_view_modal.php
diff --git a/client_files.php b/client_files.php
index 063ce94d7..99add3e00 100644
--- a/client_files.php
+++ b/client_files.php
@@ -54,7 +54,7 @@
           </div>
          
           <?php 
-          include("view_file_modal.php");
+          include("client_file_view_modal.php");
           } 
           ?>
       </div>
@@ -101,4 +101,4 @@
   </div>
 </div>
 
-<?php include("add_file_modal.php"); ?>
\ No newline at end of file
+<?php include("client_file_add_modal.php"); ?>
\ No newline at end of file
diff --git a/client_invoices.php b/client_invoices.php
index 6dd65515a..7a7559acc 100644
--- a/client_invoices.php
+++ b/client_invoices.php
@@ -173,8 +173,8 @@
 
           <?php
           
-          include("add_invoice_copy_modal.php");
-          include("edit_invoice_modal.php");
+          include("invoice_copy_modal.php");
+          include("invoice_edit_modal.php");
           }
 
           ?>
@@ -186,4 +186,4 @@
   </div>
 </div>
 
-<?php include("add_invoice_modal.php"); ?>
\ No newline at end of file
+<?php include("invoice_add_modal.php"); ?>
\ No newline at end of file
diff --git a/add_location_modal.php b/client_location_add_modal.php
similarity index 100%
rename from add_location_modal.php
rename to client_location_add_modal.php
diff --git a/edit_location_modal.php b/client_location_edit_modal.php
similarity index 100%
rename from edit_location_modal.php
rename to client_location_edit_modal.php
diff --git a/client_locations.php b/client_locations.php
index 26d97bd04..d5c126185 100644
--- a/client_locations.php
+++ b/client_locations.php
@@ -145,7 +145,7 @@
                   <a class="dropdown-item text-danger" href="post.php?delete_location=<?php echo $location_id; ?>">Delete</a>
                 </div>
               </div> 
-              <?php include("edit_location_modal.php"); ?>     
+              <?php include("client_location_edit_modal.php"); ?>     
             </td>
           </tr>
 
@@ -162,4 +162,4 @@
   </div>
 </div>
 
-<?php include("add_location_modal.php"); ?>
\ No newline at end of file
+<?php include("client_location_add_modal.php"); ?>
\ No newline at end of file
diff --git a/add_login_modal.php b/client_login_add_modal.php
similarity index 100%
rename from add_login_modal.php
rename to client_login_add_modal.php
diff --git a/edit_login_modal.php b/client_login_edit_modal.php
similarity index 100%
rename from edit_login_modal.php
rename to client_login_edit_modal.php
diff --git a/client_logins.php b/client_logins.php
index 448f5c29a..38842dc9c 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -155,7 +155,7 @@
 
           <?php
           
-          include("edit_login_modal.php");
+          include("client_login_edit_modal.php");
           }
           
           ?>
@@ -167,4 +167,4 @@
   </div>
 </div>
 
-<?php include("add_login_modal.php"); ?>
\ No newline at end of file
+<?php include("client_login_add_modal.php"); ?>
\ No newline at end of file
diff --git a/add_network_modal.php b/client_network_add_modal.php
similarity index 100%
rename from add_network_modal.php
rename to client_network_add_modal.php
diff --git a/edit_network_modal.php b/client_network_edit_modal.php
similarity index 100%
rename from edit_network_modal.php
rename to client_network_edit_modal.php
diff --git a/client_networks.php b/client_networks.php
index 833c4c80c..1bd912312 100644
--- a/client_networks.php
+++ b/client_networks.php
@@ -148,7 +148,7 @@
 
           <?php
           
-          include("edit_network_modal.php");
+          include("client_network_edit_modal.php");
           }
           
           ?>
@@ -160,4 +160,4 @@
   </div>
 </div>
 
-<?php include("add_network_modal.php"); ?>
\ No newline at end of file
+<?php include("client_network_add_modal.php"); ?>
\ No newline at end of file
diff --git a/client_quotes.php b/client_quotes.php
index cf710418c..244763ca8 100644
--- a/client_quotes.php
+++ b/client_quotes.php
@@ -163,8 +163,8 @@
 
           <?php
 
-          include("edit_quote_modal.php");
-          include("add_quote_copy_modal.php");
+          include("quote_edit_modal.php");
+          include("quote_copy_modal.php");
           }
 
           ?>
@@ -176,4 +176,4 @@
   </div>
 </div>
 
-<?php include("add_quote_modal.php"); ?>
\ No newline at end of file
+<?php include("quote_add_modal.php"); ?>
\ No newline at end of file
diff --git a/client_recurring.php b/client_recurring_invoices.php
similarity index 98%
rename from client_recurring.php
rename to client_recurring_invoices.php
index 46de45daa..cc0a782d7 100644
--- a/client_recurring.php
+++ b/client_recurring_invoices.php
@@ -153,7 +153,7 @@
               </tr>
 
           <?php
-          include("edit_recurring_modal.php");
+          include("recurring_invoice_edit_modal.php");
           }
 
           ?>
@@ -165,4 +165,4 @@
   </div>
 </div>
 
-<?php include("add_recurring_modal.php"); ?>
\ No newline at end of file
+<?php include("recurring_invoice_add_modal.php"); ?>
\ No newline at end of file
diff --git a/client_routes.php b/client_routes.php
index 831e6b2a6..892c278e4 100644
--- a/client_routes.php
+++ b/client_routes.php
@@ -37,8 +37,8 @@
   elseif($_GET['tab'] == "invoices"){
     include("client_invoices.php");
   }
-  elseif($_GET['tab'] == "recurring"){
-    include("client_recurring.php");
+  elseif($_GET['tab'] == "recurring_invoices"){
+    include("client_recurring_invoices.php");
   }
   elseif($_GET['tab'] == "payments"){
     include("client_payments.php");
diff --git a/service_add_modal.php b/client_service_add_modal.php
similarity index 100%
rename from service_add_modal.php
rename to client_service_add_modal.php
diff --git a/service_edit_modal.php b/client_service_edit_modal.php
similarity index 100%
rename from service_edit_modal.php
rename to client_service_edit_modal.php
diff --git a/service_view_modal.php b/client_service_view_modal.php
similarity index 100%
rename from service_view_modal.php
rename to client_service_view_modal.php
diff --git a/client_services.php b/client_services.php
index 677ac40da..332576c38 100644
--- a/client_services.php
+++ b/client_services.php
@@ -146,8 +146,8 @@
                                                             ON service_documents.document_id = documents.document_id
                                                           WHERE service_id = '$service_id'");
 
-                    include("service_edit_modal.php");
-                    include("service_view_modal.php");
+                    include("client_service_edit_modal.php");
+                    include("client_service_view_modal.php");
 
                 }
                 ?>
@@ -158,4 +158,4 @@
     </div>
 </div>
 
-<?php include("service_add_modal.php"); ?>
\ No newline at end of file
+<?php include("client_service_add_modal.php"); ?>
\ No newline at end of file
diff --git a/client_side_nav.php b/client_side_nav.php
index 25b08d79f..44c95f345 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -224,7 +224,7 @@
         </li>
 
         <li class="nav-item">
-          <a href="?client_id=<?php echo $client_id; ?>&tab=recurring" class="nav-link <?php if($_GET['tab'] == "recurring") { echo "active"; } ?>">
+          <a href="?client_id=<?php echo $client_id; ?>&tab=recurring_invoices" class="nav-link <?php if($_GET['tab'] == "recurring_invoices") { echo "active"; } ?>">
             <i class="nav-icon fas fa-sync-alt"></i>
             <p>
               Recurring
diff --git a/client_software.php b/client_software.php
index 313bc27bd..03eb0d008 100644
--- a/client_software.php
+++ b/client_software.php
@@ -171,7 +171,7 @@
 
           <?php
 
-          include("edit_software_modal.php");
+          include("client_software_edit_modal.php");
           }
           
           ?>
@@ -183,4 +183,4 @@
   </div>
 </div>
 
-<?php include("add_software_modal.php"); ?>
\ No newline at end of file
+<?php include("client_software_add_modal.php"); ?>
\ No newline at end of file
diff --git a/add_software_modal.php b/client_software_add_modal.php
similarity index 100%
rename from add_software_modal.php
rename to client_software_add_modal.php
diff --git a/edit_software_modal.php b/client_software_edit_modal.php
similarity index 100%
rename from edit_software_modal.php
rename to client_software_edit_modal.php
diff --git a/client_trips.php b/client_trips.php
index ab3c13189..9b3a9b8c1 100644
--- a/client_trips.php
+++ b/client_trips.php
@@ -148,8 +148,8 @@
 
           <?php
 
-          include("add_trip_copy_modal.php");
-          include("edit_trip_modal.php");
+          include("trip_copy_modal.php");
+          include("trip_edit_modal.php");
           }
           
           ?>
@@ -161,4 +161,4 @@
   </div>
 </div>
 
-<?php include("add_trip_modal.php"); ?>
\ No newline at end of file
+<?php include("trip_add_modal.php"); ?>
\ No newline at end of file
diff --git a/client_vendors.php b/client_vendors.php
index c7942238c..04245e8b7 100644
--- a/client_vendors.php
+++ b/client_vendors.php
@@ -179,7 +179,7 @@
 
           <?php
           
-          include("edit_vendor_modal.php");
+          include("vendor_edit_modal.php");
           }
           
           ?>
@@ -193,4 +193,4 @@
   </div>
 </div>
 
-<?php include("add_vendor_modal.php"); ?>
\ No newline at end of file
+<?php include("vendor_add_modal.php"); ?>
\ No newline at end of file
diff --git a/clients-test.php b/clients-test.php
deleted file mode 100644
index 5f41718be..000000000
--- a/clients-test.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php include("header.php");
-
-$sql = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN contacts ON clients.primary_contact = contacts.contact_id LEFT JOIN locations ON clients.primary_location = locations.location_id");
-
-?>
-
-<div class="card card-dark">
-  <div class="card-header py-2">
-    <h3 class="card-title mt-2"><i class="fa fa-fw fa-users"></i> Clients</h3>
-    <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addClientModal"><i class="fas fa-fw fa-plus"></i> New Client</button>
-    </div>
-  </div>
-
-  <div class="card-body">
-    <hr>
-    <div class="table-responsive">
-      <table class="table table-striped table-hover table-borderless">
-        <thead>
-          <tr>
-            <th>Client ID</th>
-            <th>Client</th>
-            <th>Contact Name</th>
-            <th>Location</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while($row = mysqli_fetch_array($sql)){
-            $client_id = $row['client_id'];
-            $client_name = $row['client_name'];
-            $contact_name = $row['contact_name'];
-            $location_address = $row['location_address'];
-      
-          ?>
-          <tr>
-            <td><?php echo $client_id; ?></td>
-            <td><?php echo $client_name; ?></td>
-            <td><?php echo $contact_name; ?></td>
-            <td><?php echo $location_address; ?></td>
-          </tr>
-
-          <?php } ?>
-        </tbody>
-      </table>
-    </div>
-  </div>
-</div>
-
-<?php include("footer.php");
diff --git a/clients.php b/clients.php
index 953e82370..27ef0c827 100644
--- a/clients.php
+++ b/clients.php
@@ -340,6 +340,6 @@
 </div>
 
 <?php include("client_add_modal.php"); ?>
-<?php include("add_quick_modal.php"); ?>
+<?php include("category_quick_add_modal.php"); ?>
 
 <?php include("footer.php"); ?>
diff --git a/companies.php b/companies.php
index e445aa29f..b2f7cb25a 100644
--- a/companies.php
+++ b/companies.php
@@ -138,7 +138,7 @@
 
           <?php
           
-          include("edit_company_modal.php");
+          include("company_edit_modal.php");
           }
           
           ?>
@@ -150,6 +150,6 @@
   </div>
 </div>
 
-<?php include("add_company_modal.php"); ?>
+<?php include("company_add_modal.php"); ?>
 
 <?php include("footer.php");
\ No newline at end of file
diff --git a/add_company_modal.php b/company_add_modal.php
similarity index 100%
rename from add_company_modal.php
rename to company_add_modal.php
diff --git a/edit_company_modal.php b/company_edit_modal.php
similarity index 100%
rename from edit_company_modal.php
rename to company_edit_modal.php
diff --git a/create.php b/create.php
deleted file mode 100644
index 09db949b8..000000000
--- a/create.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php 
-include("config.php");
-include("check_login.php");
-include("functions.php");
-?>
-
-<?php
-
-require 'vendor/stripe-php-7.72.0/init.php';
-
-// This is your real test secret API key.
-\Stripe\Stripe::setApiKey("$config_stripe_secret");
-
-
-function calculateOrderAmount(array $items): int {
-  // Replace this constant with a calculation of the order's amount
-  // Calculate the order total on the server to prevent
-  // customers from directly manipulating the amount on the client
-  return 1400;
-}
-
-header('Content-Type: application/json');
-
-try {
-  // retrieve JSON from POST body
-  $json_str = file_get_contents('php://input');
-  $json_obj = json_decode($json_str);
-
-  $paymentIntent = \Stripe\PaymentIntent::create([
-    'amount' => calculateOrderAmount($json_obj->items),
-    'currency' => 'usd',
-  ]);
-
-  $output = [
-    'clientSecret' => $paymentIntent->client_secret,
-  ];
-
-  echo json_encode($output);
-} catch (Error $e) {
-  http_response_code(500);
-  echo json_encode(['error' => $e->getMessage()]);
-}
\ No newline at end of file
diff --git a/add_custom_link_modal.php b/custom_link_add_modal.php
similarity index 100%
rename from add_custom_link_modal.php
rename to custom_link_add_modal.php
diff --git a/edit_custom_link_modal.php b/custom_link_edit_modal.php
similarity index 100%
rename from edit_custom_link_modal.php
rename to custom_link_edit_modal.php
diff --git a/custom_links.php b/custom_links.php
index 59a9f251b..97123d554 100644
--- a/custom_links.php
+++ b/custom_links.php
@@ -114,7 +114,7 @@
 
           <?php
 
-          include("edit_custom_link_modal.php");
+          include("custom_link_edit_modal.php");
 
           }
 
@@ -129,7 +129,7 @@
 
 <?php 
 
-  include("add_custom_link_modal.php");
+  include("custom_link_add_modal.php");
 
   include("footer.php");
 
diff --git a/dashboard.php b/dashboard_financial.php
similarity index 100%
rename from dashboard.php
rename to dashboard_financial.php
diff --git a/add_expense_modal.php b/expense_add_modal.php
similarity index 100%
rename from add_expense_modal.php
rename to expense_add_modal.php
diff --git a/add_expense_copy_modal.php b/expense_copy_modal.php
similarity index 100%
rename from add_expense_copy_modal.php
rename to expense_copy_modal.php
diff --git a/edit_expense_modal.php b/expense_edit_modal.php
similarity index 100%
rename from edit_expense_modal.php
rename to expense_edit_modal.php
diff --git a/export_expenses_modal.php b/expense_export_modal.php
similarity index 100%
rename from export_expenses_modal.php
rename to expense_export_modal.php
diff --git a/add_expense_refund_modal.php b/expense_refund_modal.php
similarity index 100%
rename from add_expense_refund_modal.php
rename to expense_refund_modal.php
diff --git a/expenses.php b/expenses.php
index f666c57e1..0015e5f0a 100644
--- a/expenses.php
+++ b/expenses.php
@@ -225,10 +225,10 @@
 
           <?php
 
-          include("edit_expense_modal.php");
-          include("add_expense_copy_modal.php");
-          include("add_expense_refund_modal.php");
-          include("export_expenses_modal.php");
+          include("expense_edit_modal.php");
+          include("expense_copy_modal.php");
+          include("expense_refund_modal.php");
+          include("expense_export_modal.php");
           
           }
 
@@ -241,7 +241,7 @@
   </div>
 </div>
 
-<?php include("add_expense_modal.php"); ?>
-<?php include("add_quick_modal.php"); ?>
+<?php include("expense_add_modal.php"); ?>
+<?php include("category_quick_add_modal.php"); ?>
 
 <?php include("footer.php");
\ No newline at end of file
diff --git a/checkout.php b/guest_checkout.php
similarity index 100%
rename from checkout.php
rename to guest_checkout.php
diff --git a/invoice.php b/invoice.php
index 13b3fa785..d4c6e4932 100644
--- a/invoice.php
+++ b/invoice.php
@@ -287,7 +287,7 @@
 
                 <?php 
 
-                include("edit_item_modal.php");
+                include("item_edit_modal.php");
 
                 }
 
@@ -484,12 +484,12 @@
 </div>
 
 <?php 
-  include("add_payment_modal.php");
-  include("add_invoice_copy_modal.php");
-  include("add_invoice_recurring_modal.php");
-  include("edit_invoice_modal.php");
+  include("invoice_payment_add_modal.php");
+  include("invoice_copy_modal.php");
+  include("invoice_recurring_add_modal.php");
+  include("invoice_edit_modal.php");
   include("invoice_note_modal.php");
-  include("add_quick_modal.php");
+  include("category_quick_add_modal.php");
   
   } 
 }
diff --git a/add_invoice_modal.php b/invoice_add_modal.php
similarity index 100%
rename from add_invoice_modal.php
rename to invoice_add_modal.php
diff --git a/add_invoice_copy_modal.php b/invoice_copy_modal.php
similarity index 100%
rename from add_invoice_copy_modal.php
rename to invoice_copy_modal.php
diff --git a/edit_invoice_modal.php b/invoice_edit_modal.php
similarity index 100%
rename from edit_invoice_modal.php
rename to invoice_edit_modal.php
diff --git a/add_payment_modal.php b/invoice_payment_add_modal.php
similarity index 100%
rename from add_payment_modal.php
rename to invoice_payment_add_modal.php
diff --git a/add_invoice_recurring_modal.php b/invoice_recurring_add_modal.php
similarity index 100%
rename from add_invoice_recurring_modal.php
rename to invoice_recurring_add_modal.php
diff --git a/invoices.php b/invoices.php
index 4badb9b94..13afaf0a1 100644
--- a/invoices.php
+++ b/invoices.php
@@ -374,8 +374,8 @@
           <?php
 
             
-            include("edit_invoice_modal.php");
-            include("add_invoice_copy_modal.php");
+            include("invoice_edit_modal.php");
+            include("invoice_copy_modal.php");
           
           }
 
@@ -390,8 +390,8 @@
 
 <?php 
   
-  include("add_invoice_modal.php");
-  include("add_quick_modal.php");
+  include("invoice_add_modal.php");
+  include("category_quick_add_modal.php");
 
   include("footer.php");
 
diff --git a/edit_item_modal.php b/item_edit_modal.php
similarity index 100%
rename from edit_item_modal.php
rename to item_edit_modal.php
diff --git a/login.php b/login.php
index 0d8458386..54b0d83e5 100644
--- a/login.php
+++ b/login.php
@@ -93,7 +93,7 @@
                 $_SESSION['logged'] = TRUE;
                 mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Login', log_action = 'Success', log_description = '$user_name successfully logged in', log_ip = '$ip', log_user_agent = '$user_agent', log_created_at = NOW(), log_user_id = $user_id");
 
-                header("Location: dashboard.php");
+                header("Location: dashboard_financial.php");
             } else {
                 $token_field = "<div class='input-group mb-3'>
                 <input type='text' class='form-control' placeholder='Token' name='current_code' autofocus>
@@ -110,7 +110,7 @@
                     $_SESSION['logged'] = TRUE;
                     mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Login 2FA', log_action = 'Success', log_description = '$user_name successfully logged in using 2FA', log_ip = '$ip', log_user_agent = '$user_agent', log_created_at = NOW(), log_user_id = $user_id");
                     //header("Location: $config_start_page");
-                    header("Location: dashboard.php");
+                    header("Location: dashboard_financial.php");
                 } else {
                     mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Login', log_action = '2FA Failed', log_description = '$user_name failed 2FA', log_ip = '$ip', log_user_agent = '$user_agent', log_created_at = NOW(), log_user_id = $user_id");
 
diff --git a/products.php b/products.php
index aa7bb3749..eba466515 100644
--- a/products.php
+++ b/products.php
@@ -137,7 +137,7 @@
 <?php 
   
   include("product_add_modal.php"); 
-  include("add_quick_modal.php");
+  include("category_quick_add_modal.php");
 
   include("footer.php");
 
diff --git a/quote.php b/quote.php
index c16073319..5c584eeda 100644
--- a/quote.php
+++ b/quote.php
@@ -251,7 +251,7 @@
 
                 <?php
 
-                include("edit_item_modal.php");
+                include("item_edit_modal.php");
 
                 }
 
@@ -391,11 +391,11 @@
 </div>
 
 <?php 
-  include("edit_quote_modal.php");
-  include("add_quote_to_invoice_modal.php");
-  include("add_quote_copy_modal.php");
+  include("quote_edit_modal.php");
+  include("quote_to_invoice_modal.php");
+  include("quote_copy_modal.php");
   include("quote_note_modal.php");
-  include("add_quick_modal.php");
+  include("category_quick_add_modal.php");
 
 } 
 
diff --git a/add_quote_modal.php b/quote_add_modal.php
similarity index 100%
rename from add_quote_modal.php
rename to quote_add_modal.php
diff --git a/add_quote_copy_modal.php b/quote_copy_modal.php
similarity index 100%
rename from add_quote_copy_modal.php
rename to quote_copy_modal.php
diff --git a/edit_quote_modal.php b/quote_edit_modal.php
similarity index 100%
rename from edit_quote_modal.php
rename to quote_edit_modal.php
diff --git a/add_quote_to_invoice_modal.php b/quote_to_invoice_modal.php
similarity index 100%
rename from add_quote_to_invoice_modal.php
rename to quote_to_invoice_modal.php
diff --git a/quotes.php b/quotes.php
index 79d3e4c6b..6d3fd922a 100644
--- a/quotes.php
+++ b/quotes.php
@@ -238,8 +238,8 @@
 
           <?php
             
-            include("edit_quote_modal.php");
-            include("add_quote_copy_modal.php");
+            include("quote_edit_modal.php");
+            include("quote_copy_modal.php");
 
           }
 
@@ -254,8 +254,8 @@
 
 <?php 
   
-  include("add_quote_modal.php"); 
-  include("add_quick_modal.php");
+  include("quote_add_modal.php"); 
+  include("category_quick_add_modal.php");
   
   include("footer.php");
 
diff --git a/recurring_invoice.php b/recurring_invoice.php
index 9d4c43b12..df7843f70 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -220,7 +220,7 @@
 
                 <?php
 
-                include("edit_item_modal.php"); 
+                include("item_edit_modal.php"); 
 
                 }
 
@@ -354,9 +354,9 @@
 
 <?php 
   
-  include("edit_recurring_modal.php");
-  include("recurring_note_modal.php");
-  include("add_quick_modal.php");
+  include("recurring_invoice_edit_modal.php");
+  include("recurring_invoice_note_modal.php");
+  include("category_quick_add_modal.php");
 
 }
 
diff --git a/add_recurring_modal.php b/recurring_invoice_add_modal.php
similarity index 100%
rename from add_recurring_modal.php
rename to recurring_invoice_add_modal.php
diff --git a/edit_recurring_modal.php b/recurring_invoice_edit_modal.php
similarity index 100%
rename from edit_recurring_modal.php
rename to recurring_invoice_edit_modal.php
diff --git a/recurring_note_modal.php b/recurring_invoice_note_modal.php
similarity index 100%
rename from recurring_note_modal.php
rename to recurring_invoice_note_modal.php
diff --git a/recurring.php b/recurring_invoices.php
similarity index 98%
rename from recurring.php
rename to recurring_invoices.php
index ea758344b..6deeb745f 100644
--- a/recurring.php
+++ b/recurring_invoices.php
@@ -225,7 +225,7 @@
           </tr>
           
           <?php
-          include("edit_recurring_modal.php");
+          include("recurring_invoice_edit_modal.php");
 
           }
           ?>
@@ -239,8 +239,8 @@
 
 <?php 
   
-  include("add_recurring_modal.php");
-  include("add_quick_modal.php");
+  include("recurring_invoice_add_modal.php");
+  include("category_quick_add_modal.php");
 
   include("footer.php");
 
diff --git a/add_revenue_modal.php b/revenue_add_modal.php
similarity index 100%
rename from add_revenue_modal.php
rename to revenue_add_modal.php
diff --git a/edit_revenue_modal.php b/revenue_edit_modal.php
similarity index 100%
rename from edit_revenue_modal.php
rename to revenue_edit_modal.php
diff --git a/revenues.php b/revenues.php
index 56e2185ff..bc15203a0 100644
--- a/revenues.php
+++ b/revenues.php
@@ -202,7 +202,7 @@
               </div>
               <?php
 
-              include("edit_revenue_modal.php");
+              include("revenue_edit_modal.php");
 
               ?>      
             </td>
@@ -223,7 +223,7 @@
 
 <?php 
 
-  include("add_revenue_modal.php");
+  include("revenue_add_modal.php");
   include("add_quick_modal.php");
 
   include("footer.php");
diff --git a/scheduled_tickets_edit_modal.php b/scheduled_ticket_edit_modal.php
similarity index 100%
rename from scheduled_tickets_edit_modal.php
rename to scheduled_ticket_edit_modal.php
diff --git a/scheduled_tickets.php b/scheduled_tickets.php
index 944c4c65c..1012a4793 100644
--- a/scheduled_tickets.php
+++ b/scheduled_tickets.php
@@ -75,7 +75,7 @@
                 </tr>
 
                 <?php
-                include("scheduled_tickets_edit_modal.php");
+                include("scheduled_ticket_edit_modal.php");
                 }
                 ?>
 
diff --git a/side_nav.php b/side_nav.php
index b000a4162..8e7cf8be8 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -49,7 +49,7 @@
       <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" data-accordion="false">
 
         <li class="nav-item">
-          <a href="dashboard.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "dashboard.php") { echo "active"; } ?>">
+          <a href="dashboard_financial.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "dashboard_financial.php") { echo "active"; } ?>">
             <i class="nav-icon fas fa-tachometer-alt"></i>
             <p>Dashboard</p>
           </a>
@@ -115,7 +115,7 @@
           </a>
         </li>
         <li class="nav-item">
-          <a href="recurring.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "recurring.php" OR basename($_SERVER["PHP_SELF"]) == "recurring_invoice.php") { echo "active"; } ?>">
+          <a href="recurring_invoices.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "recurring_invoices.php" OR basename($_SERVER["PHP_SELF"]) == "recurring_invoices.php") { echo "active"; } ?>">
             <i class="nav-icon fas fa-sync-alt"></i>
             <p>Recurring</p>
           </a>
diff --git a/add_tag_modal.php b/tag_add_modal.php
similarity index 100%
rename from add_tag_modal.php
rename to tag_add_modal.php
diff --git a/edit_tag_modal.php b/tag_edit_modal.php
similarity index 100%
rename from edit_tag_modal.php
rename to tag_edit_modal.php
diff --git a/tags.php b/tags.php
index 8cdc404f9..7ff617e16 100644
--- a/tags.php
+++ b/tags.php
@@ -132,7 +132,7 @@
 
           <?php
 
-          include("edit_tag_modal.php");
+          include("tag_edit_modal.php");
 
           }
 
@@ -147,7 +147,7 @@
 
 <?php 
 
-  include("add_tag_modal.php");
+  include("tag_add_modal.php");
 
   include("footer.php");
 
diff --git a/add_tax_modal.php b/tax_add_modal.php
similarity index 100%
rename from add_tax_modal.php
rename to tax_add_modal.php
diff --git a/edit_tax_modal.php b/tax_edit_modal.php
similarity index 100%
rename from edit_tax_modal.php
rename to tax_edit_modal.php
diff --git a/taxes.php b/taxes.php
index c4f25b588..1a38920d0 100644
--- a/taxes.php
+++ b/taxes.php
@@ -77,7 +77,7 @@
 
           <?php
 
-          include("edit_tax_modal.php");
+          include("tax_edit_modal.php");
           }
           
           if($num_rows == 0){
@@ -95,7 +95,7 @@
 
 <?php
   
-  include("add_tax_modal.php");
+  include("tax_add_modal.php");
 
   include("footer.php");
 
diff --git a/totp-test.php b/test_totp-test.php
similarity index 100%
rename from totp-test.php
rename to test_totp-test.php
diff --git a/totp-test2.php b/test_totp-test2.php
similarity index 100%
rename from totp-test2.php
rename to test_totp-test2.php
diff --git a/add_transfer_modal.php b/transfer_add_modal.php
similarity index 100%
rename from add_transfer_modal.php
rename to transfer_add_modal.php
diff --git a/edit_transfer_modal.php b/transfer_edit_modal.php
similarity index 100%
rename from edit_transfer_modal.php
rename to transfer_edit_modal.php
diff --git a/transfers.php b/transfers.php
index d061e7768..bdd1d2714 100644
--- a/transfers.php
+++ b/transfers.php
@@ -203,7 +203,7 @@
 
           <?php
 
-          include("edit_transfer_modal.php");
+          include("transfer_edit_modal.php");
         
           }
           
@@ -216,6 +216,6 @@
   </div>
 </div>
 
-<?php include("add_transfer_modal.php"); ?>
+<?php include("transfer_add_modal.php"); ?>
 
 <?php include("footer.php");
\ No newline at end of file
diff --git a/add_trip_modal.php b/trip_add_modal.php
similarity index 100%
rename from add_trip_modal.php
rename to trip_add_modal.php
diff --git a/add_trip_copy_modal.php b/trip_copy_modal.php
similarity index 100%
rename from add_trip_copy_modal.php
rename to trip_copy_modal.php
diff --git a/edit_trip_modal.php b/trip_edit_modal.php
similarity index 100%
rename from edit_trip_modal.php
rename to trip_edit_modal.php
diff --git a/export_trips_modal.php b/trip_export_modal.php
similarity index 100%
rename from export_trips_modal.php
rename to trip_export_modal.php
diff --git a/trips.php b/trips.php
index 8366f39b2..4035e10d5 100644
--- a/trips.php
+++ b/trips.php
@@ -218,9 +218,9 @@
 
           <?php
 
-          include("add_trip_copy_modal.php");
-          include("edit_trip_modal.php");
-          include("export_trips_modal.php");
+          include("trip_copy_modal.php");
+          include("trip_edit_modal.php");
+          include("trip_export_modal.php");
           
           }
           
@@ -233,6 +233,6 @@
   </div>
 </div>
 
-<?php include("add_trip_modal.php"); ?>
+<?php include("trip_add_modal.php"); ?>
 
 <?php include("footer.php");
\ No newline at end of file
diff --git a/add_user_modal.php b/user_add_modal.php
similarity index 100%
rename from add_user_modal.php
rename to user_add_modal.php
diff --git a/edit_user_modal.php b/user_edit_modal.php
similarity index 100%
rename from edit_user_modal.php
rename to user_edit_modal.php
diff --git a/users.php b/users.php
index 181c1cd76..5d6275a18 100644
--- a/users.php
+++ b/users.php
@@ -170,7 +170,7 @@
 
           <?php
 
-          include("edit_user_modal.php");
+          include("user_edit_modal.php");
           include("user_companies_modal.php");
           include("user_clients_modal.php");
           
@@ -187,7 +187,7 @@
 
 <?php
   
-  include("add_user_modal.php");
+  include("user_add_modal.php");
   
   include("footer.php");
 
diff --git a/add_vendor_modal.php b/vendor_add_modal.php
similarity index 100%
rename from add_vendor_modal.php
rename to vendor_add_modal.php
diff --git a/edit_vendor_modal.php b/vendor_edit_modal.php
similarity index 100%
rename from edit_vendor_modal.php
rename to vendor_edit_modal.php
diff --git a/vendors.php b/vendors.php
index aa8078b4d..02c634d6a 100644
--- a/vendors.php
+++ b/vendors.php
@@ -201,7 +201,7 @@
 
           <?php
 
-            include("edit_vendor_modal.php");
+            include("vendor_edit_modal.php");
   
           }
           
@@ -216,7 +216,7 @@
 
 <?php 
   
-  include("add_vendor_modal.php");
+  include("vendor_add_modal.php");
 
   include("footer.php");