diff --git a/categories.php b/categories.php
index b33a42af..efd9732a 100644
--- a/categories.php
+++ b/categories.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_admin.php"); 
+<?php include("inc_all_settings.php"); 
 
 if(isset($_GET['category'])){
   $category = mysqli_real_escape_string($mysqli,$_GET['category']);
diff --git a/companies.php b/companies.php
index 614b7c66..0b68bb7a 100644
--- a/companies.php
+++ b/companies.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_admin.php");
+<?php include("inc_all_settings.php");
 
 if(!empty($_GET['sb'])){
   $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
diff --git a/inc_all_admin.php b/inc_all_settings.php
similarity index 92%
rename from inc_all_admin.php
rename to inc_all_settings.php
index eb158605..d41672b6 100644
--- a/inc_all_admin.php
+++ b/inc_all_settings.php
@@ -13,7 +13,7 @@ if($session_user_role != 3){
 
 include("header.php");
 include("top_nav.php");
-include("admin_side_nav.php");
+include("settings_side_nav.php");
 include("inc_wrapper.php");
 include("inc_alert_feedback.php");
 include("pagination_head.php");
diff --git a/logs.php b/logs.php
index ca8765cf..6b4c1fc9 100644
--- a/logs.php
+++ b/logs.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_admin.php");
+<?php include("inc_all_settings.php");
 
 if(!empty($_GET['sb'])){
   $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
diff --git a/settings-general.php b/settings-general.php
deleted file mode 100644
index 8a58d9a8..00000000
--- a/settings-general.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php include("inc_all_admin.php"); ?>
-
-<div class="card card-dark">
-  <div class="card-header">
-    <h3 class="card-title"><i class="fa fa-fw fa-cog"></i> General Settings</h3>
-  </div>
-  <div class="card-body">
-    <form action="post.php" method="post" autocomplete="off">
-
-      <div class="form-group">
-        <label>Base URL</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-          </div>
-          <input type="text" class="form-control" name="config_base_url" placeholder="ex host.domain.ext" value="<?php echo $config_base_url; ?>">
-        </div>
-        <small class="form-text text-muted">This is used by cron to send the correct url for invoice guest views</small>
-      </div>
-
-      <hr>
-      
-      <button type="submit" name="edit_general_settings" class="btn btn-primary">Save</button>
-        
-    </form>
-  </div>
-</div>
-
-<?php include("footer.php");
\ No newline at end of file
diff --git a/settings-alerts.php b/settings_alerts.php
similarity index 96%
rename from settings-alerts.php
rename to settings_alerts.php
index c0b50382..9ed3d6fa 100644
--- a/settings-alerts.php
+++ b/settings_alerts.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_admin.php"); ?>
+<?php include("inc_all_settings.php"); ?>
 
 <div class="card card-dark">
   <div class="card-header">
diff --git a/settings-api.php b/settings_api.php
similarity index 99%
rename from settings-api.php
rename to settings_api.php
index 0068f9f7..61c42cc3 100644
--- a/settings-api.php
+++ b/settings_api.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_admin.php");
+<?php include("inc_all_settings.php");
 
   if(!empty($_GET['sb'])){
     $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
diff --git a/settings-backup.php b/settings_backup.php
similarity index 94%
rename from settings-backup.php
rename to settings_backup.php
index 5996bb38..632b6ad6 100644
--- a/settings-backup.php
+++ b/settings_backup.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_admin.php"); ?>
+<?php include("inc_all_settings.php"); ?>
 
 <div class="card card-dark mb-3">
     <div class="card-header">
diff --git a/settings-defaults.php b/settings_defaults.php
similarity index 99%
rename from settings-defaults.php
rename to settings_defaults.php
index 0469f142..67be35a9 100644
--- a/settings-defaults.php
+++ b/settings_defaults.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_admin.php"); ?>
+<?php include("inc_all_settings.php"); ?>
 
 <div class="card card-dark">
   <div class="card-header">
diff --git a/settings-integrations.php b/settings_integrations.php
similarity index 95%
rename from settings-integrations.php
rename to settings_integrations.php
index fb2a5352..34b3b267 100644
--- a/settings-integrations.php
+++ b/settings_integrations.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_admin.php"); ?>
+<?php include("inc_all_settings.php"); ?>
 
 <div class="card card-dark">
   <div class="card-header">
diff --git a/settings-invoice.php b/settings_invoice.php
similarity index 97%
rename from settings-invoice.php
rename to settings_invoice.php
index 68fed1b6..926b56c1 100644
--- a/settings-invoice.php
+++ b/settings_invoice.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_admin.php"); ?>
+<?php include("inc_all_settings.php"); ?>
 
 <div class="card card-dark">
   <div class="card-header">
diff --git a/settings-mail.php b/settings_mail.php
similarity index 98%
rename from settings-mail.php
rename to settings_mail.php
index 462976a4..34860908 100644
--- a/settings-mail.php
+++ b/settings_mail.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_admin.php"); ?>
+<?php include("inc_all_settings.php"); ?>
 
 <div class="card card-dark">
   <div class="card-header">
diff --git a/settings-modules.php b/settings_modules.php
similarity index 95%
rename from settings-modules.php
rename to settings_modules.php
index 0c1cf904..2e335e39 100644
--- a/settings-modules.php
+++ b/settings_modules.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_admin.php"); ?>
+<?php include("inc_all_settings.php"); ?>
 
 <div class="card card-dark">
   <div class="card-header">
diff --git a/settings-online-payment.php b/settings_online_payment.php
similarity index 96%
rename from settings-online-payment.php
rename to settings_online_payment.php
index 2ebca423..4a091123 100644
--- a/settings-online-payment.php
+++ b/settings_online_payment.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_admin.php"); ?>
+<?php include("inc_all_settings.php"); ?>
 
 <div class="alert alert-warning">
   Work in Progress
diff --git a/settings-quote.php b/settings_quote.php
similarity index 97%
rename from settings-quote.php
rename to settings_quote.php
index 4be6adea..8cb2f8b7 100644
--- a/settings-quote.php
+++ b/settings_quote.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_admin.php"); ?>
+<?php include("inc_all_settings.php"); ?>
 
 <div class="card card-dark">
   <div class="card-header">
diff --git a/admin_side_nav.php b/settings_side_nav.php
similarity index 72%
rename from admin_side_nav.php
rename to settings_side_nav.php
index a4bafb6d..22e18037 100644
--- a/admin_side_nav.php
+++ b/settings_side_nav.php
@@ -12,7 +12,7 @@
         <li class="nav-item mb-3">
           <a href="dashboard_financial.php" class="nav-link">
             <i class="nav-icon fas fa-arrow-left"></i>
-            <p class="h4">Back | <strong>Admin</strong></p>
+            <p class="h4">Back | <strong>Settings</strong></p>
           </a>
         </li>
 
@@ -31,8 +31,8 @@
         </li>
 
         <li class="nav-item">
-          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-api.php") { echo "active"; } ?>"
-             href="settings-api.php">
+          <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>
@@ -41,8 +41,8 @@
         <li class="nav-header mt-3">SETTINGS</li>
 
         <li class="nav-item">
-          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-mail.php") { echo "active"; } ?>" 
-            href="settings-mail.php">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_mail.php") { echo "active"; } ?>" 
+            href="settings_mail.php">
             <i class="nav-icon far fa-envelope"></i>
             <p>Mail</p>
           </a> 
@@ -50,40 +50,40 @@
 
         <?php if($config_module_enable_accounting){ ?>
         <li class="nav-item">
-          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-defaults.php") { echo "active"; } ?>" 
-            href="settings-defaults.php">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_defaults.php") { echo "active"; } ?>" 
+            href="settings_defaults.php">
             <i class="nav-icon fas fa-cog"></i>
             <p>Defaults</p>
           </a> 
         </li>
 
         <li class="nav-item">
-          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-invoice.php") { echo "active"; } ?>" 
-            href="settings-invoice.php">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_invoice.php") { echo "active"; } ?>" 
+            href="settings_invoice.php">
             <i class="nav-icon fas fa-file"></i>
             <p>Invoice</p>
           </a> 
         </li>
 
         <li class="nav-item">
-          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-quote.php") { echo "active"; } ?>" 
-            href="settings-quote.php">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_quote.php") { echo "active"; } ?>" 
+            href="settings_quote.php">
             <i class="nav-icon far fa-file"></i>
             <p>Quote</p>
           </a> 
         </li>
 
         <li class="nav-item">
-          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-alerts.php") { echo "active"; } ?>" 
-            href="settings-alerts.php">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_alerts.php") { echo "active"; } ?>" 
+            href="settings_alerts.php">
             <i class="nav-icon far fa-bell"></i>
             <p>Alerts</p>
           </a> 
         </li>
 
         <li class="nav-item">
-          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-online-payment.php") { echo "active"; } ?>" 
-            href="settings-online-payment.php">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_online_payment.php") { echo "active"; } ?>" 
+            href="settings_online_payment.php">
             <i class="nav-icon far fa-credit-card"></i>
             <p>Online Payment</p>
           </a> 
@@ -97,18 +97,25 @@
         </li>
 
         <li class="nav-item">
-          <a href="taxes.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "taxes.php") { echo "active"; } ?>">
+          <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_tags.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_tags.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-tag"></i>
+            <p>Tags</p>
+          </a>
+        </li>
+
         <?php } ?>
 
         <?php if($config_module_enable_ticketing){ ?>
         <li class="nav-item">
-          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-ticket.php") { echo "active"; } ?>" 
-            href="settings-ticket.php">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_ticket.php") { echo "active"; } ?>" 
+            href="settings_ticket.php">
             <i class="nav-icon fas fa-ticket-alt"></i>
             <p>Ticket</p>
           </a> 
@@ -116,31 +123,31 @@
         <?php } ?>
 
         <li class="nav-item">
-          <a href="settings-integrations.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-integrations.php") { echo "active"; } ?>">
+          <a href="settings_integrations.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_integrations.php") { echo "active"; } ?>">
             <i class="nav-icon fas fa-puzzle-piece"></i>
             <p>Integrations</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">
+          <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-arrow-alt-circle-up"></i>
             <p>Update</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">
+          <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-database"></i>
             <p>Backup</p>
           </a> 
         </li>
 
         <li class="nav-item">
-          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-modules.php") { echo "active"; } ?>"
-             href="settings-modules.php">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_modules.php") { echo "active"; } ?>"
+             href="settings_modules.php">
               <i class="nav-icon fas fa-puzzle-piece"></i>
               <p>Modules</p>
           </a>
diff --git a/tag_add_modal.php b/settings_tag_add_modal.php
similarity index 100%
rename from tag_add_modal.php
rename to settings_tag_add_modal.php
diff --git a/tag_edit_modal.php b/settings_tag_edit_modal.php
similarity index 100%
rename from tag_edit_modal.php
rename to settings_tag_edit_modal.php
diff --git a/tags.php b/settings_tags.php
similarity index 96%
rename from tags.php
rename to settings_tags.php
index d944f3a5..99fa44ca 100644
--- a/tags.php
+++ b/settings_tags.php
@@ -1,4 +1,6 @@
-<?php include("inc_all.php");
+<?php include("inc_all_settings.php"); ?>
+
+<?php
 
 if(!empty($_GET['sb'])){
   $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
@@ -102,7 +104,7 @@ $colors_diff = array_diff($colors_array,$colors_used_array);
 
           <?php
 
-          include("tag_edit_modal.php");
+          include("settings_tag_edit_modal.php");
 
           }
 
@@ -117,7 +119,7 @@ $colors_diff = array_diff($colors_array,$colors_used_array);
 
 <?php 
 
-  include("tag_add_modal.php");
+  include("settings_tag_add_modal.php");
 
   include("footer.php");
 
diff --git a/tax_add_modal.php b/settings_tax_add_modal.php
similarity index 100%
rename from tax_add_modal.php
rename to settings_tax_add_modal.php
diff --git a/tax_edit_modal.php b/settings_tax_edit_modal.php
similarity index 100%
rename from tax_edit_modal.php
rename to settings_tax_edit_modal.php
diff --git a/taxes.php b/settings_taxes.php
similarity index 95%
rename from taxes.php
rename to settings_taxes.php
index 34ada9f0..f2adc477 100644
--- a/taxes.php
+++ b/settings_taxes.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_admin.php"); 
+<?php include("inc_all_settings.php"); 
 
 if(!empty($_GET['sb'])){
   $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
@@ -64,7 +64,7 @@ $num_rows = mysqli_num_rows($sql);
 
           <?php
 
-          include("tax_edit_modal.php");
+          include("settings_tax_edit_modal.php");
           }
           
           if($num_rows == 0){
@@ -82,7 +82,7 @@ $num_rows = mysqli_num_rows($sql);
 
 <?php
   
-  include("tax_add_modal.php");
+  include("settings_tax_add_modal.php");
 
   include("footer.php");
 
diff --git a/settings-ticket.php b/settings_ticket.php
similarity index 96%
rename from settings-ticket.php
rename to settings_ticket.php
index 5f596eba..e280e3e2 100644
--- a/settings-ticket.php
+++ b/settings_ticket.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_admin.php"); ?>
+<?php include("inc_all_settings.php"); ?>
 
 <div class="card card-dark">
   <div class="card-header">
diff --git a/settings-update.php b/settings_update.php
similarity index 97%
rename from settings-update.php
rename to settings_update.php
index 15a66ed2..c9437636 100644
--- a/settings-update.php
+++ b/settings_update.php
@@ -1,5 +1,5 @@
 <?php
-include("inc_all_admin.php");
+include("inc_all_settings.php");
 include("database_version.php");
 ?>
 
diff --git a/side_nav.php b/side_nav.php
index 4c020a9d..66e9f825 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -184,7 +184,7 @@
         <li class="nav-item mt-3">
           <a href="users.php" class="nav-link">
             <i class="nav-icon fas fa-cog"></i>
-            <p>Admin</p>
+            <p>Settings</p>
             <i class="fas fa-angle-right nav-icon float-right"></i>
           </a>
         </li>
diff --git a/top_nav.php b/top_nav.php
index 295f1009..93736868 100644
--- a/top_nav.php
+++ b/top_nav.php
@@ -45,7 +45,7 @@
         </li>
         <!-- Menu Footer-->
         <li class="user-footer">
-          <a href="settings-user.php" class="btn btn-default btn-flat">Profile</a>
+          <a href="user_profile.php" class="btn btn-default btn-flat">Profile</a>
           <a href="post.php?logout" class="btn btn-default btn-flat float-right">Sign out</a>
         </li>
       </ul>
diff --git a/settings-user.php b/user_profile.php
similarity index 100%
rename from settings-user.php
rename to user_profile.php
diff --git a/users.php b/users.php
index 64fbd3c6..a94157ae 100644
--- a/users.php
+++ b/users.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_admin.php");
+<?php include("inc_all_settings.php");
 
   if(!empty($_GET['sb'])){
     $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);