diff --git a/accounts.php b/accounts.php
index fb4e4af6..3397a380 100644
--- a/accounts.php
+++ b/accounts.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php
   
diff --git a/api_keys.php b/api_keys.php
index 1718b0ea..55306989 100644
--- a/api_keys.php
+++ b/api_keys.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
 
   //Paging
   if(isset($_GET['p'])){
diff --git a/assets.php b/assets.php
index 02ab7986..369fcc52 100644
--- a/assets.php
+++ b/assets.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/blank.php b/blank.php
index b987543d..8c4c7d9a 100644
--- a/blank.php
+++ b/blank.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <!-- Breadcrumbs-->
 <ol class="breadcrumb">
diff --git a/calendar_events.php b/calendar_events.php
index 1a696f43..88621582 100644
--- a/calendar_events.php
+++ b/calendar_events.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <link href='plugins/fullcalendar/main.min.css' rel='stylesheet' />
 
diff --git a/campaign.php b/campaign.php
index 946679b3..3038be6d 100644
--- a/campaign.php
+++ b/campaign.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
 
 if(isset($_GET['campaign_id'])){
   $campaign_id = intval($_GET['campaign_id']);
diff --git a/campaigns.php b/campaigns.php
index 19faebd2..57ec4ecc 100644
--- a/campaigns.php
+++ b/campaigns.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
 
   //Paging
   if(isset($_GET['p'])){
diff --git a/categories.php b/categories.php
index 93c8bc2c..147d5ffc 100644
--- a/categories.php
+++ b/categories.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); 
+<?php include("inc_all.php"); 
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/client.php b/client.php
index 2b38c3f6..1bd82389 100644
--- a/client.php
+++ b/client.php
@@ -1,6 +1,9 @@
 <?php include("config.php"); ?>
 <?php include("functions.php"); ?>
 <?php include("check_login.php"); ?>
+<?php include("header.php"); ?>
+<?php include("top_nav.php"); ?>
+
 
 <?php 
 
@@ -144,7 +147,13 @@ if(isset($_GET['client_id'])){
 
 ?>
 
-<?php include("header.php"); ?>
+<?php
+
+include("inc_side_nav.php");
+include("inc_wrapper.php");
+include("inc_alert_feedback.php");
+
+?>
 
 <?php
 
diff --git a/clients.php b/clients.php
index 3e34b820..2345df31 100644
--- a/clients.php
+++ b/clients.php
@@ -1,4 +1,6 @@
-<?php include("header.php");
+<?php
+  
+include("inc_all.php");
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/companies.php b/companies.php
index 3c1a126b..21342611 100644
--- a/companies.php
+++ b/companies.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/custom_links.php b/custom_links.php
index 97123d55..89e61633 100644
--- a/custom_links.php
+++ b/custom_links.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); 
+<?php include("inc_all.php"); 
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/dashboard_financial.php b/dashboard_financial.php
index 68f1a058..8ea68e62 100644
--- a/dashboard_financial.php
+++ b/dashboard_financial.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php 
 
diff --git a/expenses.php b/expenses.php
index 6e8cf3f9..45dd8d20 100644
--- a/expenses.php
+++ b/expenses.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
   
 //Paging
 if(isset($_GET['p'])){
diff --git a/global_search.php b/global_search.php
index 0f6d5f82..adf1b380 100644
--- a/global_search.php
+++ b/global_search.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php
 
diff --git a/header.php b/header.php
index b4e9d2e1..bb4330a8 100644
--- a/header.php
+++ b/header.php
@@ -4,10 +4,6 @@
   // uncomment for test
   //$time_start = microtime(true);
 
-  include("config.php");
-  include_once("functions.php");
-  include("check_login.php");
-
 ?>
 
 <!DOCTYPE html>
@@ -39,49 +35,4 @@
 
 </head>
 <body class="hold-transition sidebar-mini">
-  <div class="wrapper text-sm">
-    <?php include("top_nav.php"); ?>
-
-    <?php 
-    
-    if(basename(parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH)) == "client.php"){
-      include("client_side_nav.php");
-    //}elseif(basename(parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH)) == "settings-general.php"){
-      //include("admin_side_nav.php");
-    }else{
-      include("side_nav.php");
-    } 
-    
-    ?>
-    
-    <!-- Content Wrapper. Contains page content -->
-    <div class="content-wrapper">
-
-      <!-- Main content -->
-      <div class="content mt-3">
-        <div class="container-fluid">
-
-    <?php
-    //Alert Feedback
-    if(!empty($_SESSION['alert_message'])){
-        if (!isset($_SESSION['alert_type'])){
-            $_SESSION['alert_type'] = "info";
-        }
-      ?>
-        <div class="alert alert-<?php echo $_SESSION['alert_type']; ?>" id="alert">
-          <?php echo $_SESSION['alert_message']; ?>
-          <button class='close' data-dismiss='alert'>&times;</button>
-        </div>
-      <?php
-      
-      unset($_SESSION['alert_type']);
-      unset($_SESSION['alert_message']);
-
-    }
-
-    //Set Records Per Page
-    if(empty($_SESSION['records_per_page'])){
-      $_SESSION['records_per_page'] = 10;
-    }
-
-    ?>
+  <div class="wrapper text-sm">
\ No newline at end of file
diff --git a/inc_alert_feedback.php b/inc_alert_feedback.php
new file mode 100644
index 00000000..0038b1ed
--- /dev/null
+++ b/inc_alert_feedback.php
@@ -0,0 +1,25 @@
+<?php
+
+//Alert Feedback
+if(!empty($_SESSION['alert_message'])){
+    if (!isset($_SESSION['alert_type'])){
+        $_SESSION['alert_type'] = "info";
+    }
+  ?>
+    <div class="alert alert-<?php echo $_SESSION['alert_type']; ?>" id="alert">
+      <?php echo $_SESSION['alert_message']; ?>
+      <button class='close' data-dismiss='alert'>&times;</button>
+    </div>
+  <?php
+  
+  unset($_SESSION['alert_type']);
+  unset($_SESSION['alert_message']);
+
+}
+
+//Set Records Per Page
+if(empty($_SESSION['records_per_page'])){
+  $_SESSION['records_per_page'] = 10;
+}
+
+?>
\ No newline at end of file
diff --git a/inc_all.php b/inc_all.php
new file mode 100644
index 00000000..f49efe5a
--- /dev/null
+++ b/inc_all.php
@@ -0,0 +1,12 @@
+<?php 
+
+include("config.php");
+include_once("functions.php");
+include("check_login.php");
+include("header.php");
+include("top_nav.php");
+include("inc_side_nav.php");
+include("inc_wrapper.php");
+include("inc_alert_feedback.php");
+
+?>
\ No newline at end of file
diff --git a/inc_side_nav.php b/inc_side_nav.php
new file mode 100644
index 00000000..09b8e372
--- /dev/null
+++ b/inc_side_nav.php
@@ -0,0 +1,11 @@
+<?php 
+    
+if(basename(parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH)) == "client.php"){
+  include("client_side_nav.php");
+//}elseif(basename(parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH)) == "settings-general.php"){
+  //include("admin_side_nav.php");
+}else{
+  include("side_nav.php");
+} 
+
+?>
\ No newline at end of file
diff --git a/inc_wrapper.php b/inc_wrapper.php
new file mode 100644
index 00000000..226e2b9e
--- /dev/null
+++ b/inc_wrapper.php
@@ -0,0 +1,31 @@
+ <!-- Content Wrapper. Contains page content -->
+    <div class="content-wrapper">
+
+      <!-- Main content -->
+      <div class="content mt-3">
+        <div class="container-fluid">
+
+    <?php
+    //Alert Feedback
+    if(!empty($_SESSION['alert_message'])){
+        if (!isset($_SESSION['alert_type'])){
+            $_SESSION['alert_type'] = "info";
+        }
+      ?>
+        <div class="alert alert-<?php echo $_SESSION['alert_type']; ?>" id="alert">
+          <?php echo $_SESSION['alert_message']; ?>
+          <button class='close' data-dismiss='alert'>&times;</button>
+        </div>
+      <?php
+      
+      unset($_SESSION['alert_type']);
+      unset($_SESSION['alert_message']);
+
+    }
+
+    //Set Records Per Page
+    if(empty($_SESSION['records_per_page'])){
+      $_SESSION['records_per_page'] = 10;
+    }
+
+    ?>
\ No newline at end of file
diff --git a/index.php b/index.php
index d5a3ee96..befca16e 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 	<!-- Breadcrumbs-->
 	<ol class="breadcrumb">
 	  <li class="breadcrumb-item">
diff --git a/invoice.php b/invoice.php
index ddf25b61..1cd1c3a9 100644
--- a/invoice.php
+++ b/invoice.php
@@ -1,6 +1,6 @@
 <?php 
 
-include("header.php"); 
+include("inc_all.php"); 
 
 if(isset($_GET['invoice_id'])){
 
diff --git a/invoices.php b/invoices.php
index a3ee846b..9e8f806b 100644
--- a/invoices.php
+++ b/invoices.php
@@ -1,6 +1,6 @@
 <?php 
   
-  include("header.php");
+  include("inc_all.php");
   
   $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent' AND company_id = $session_company_id"));
   $sent_count = $row['num'];
diff --git a/logs.php b/logs.php
index c275943a..d007fd8a 100644
--- a/logs.php
+++ b/logs.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/notifications.php b/notifications.php
index ffeff6d3..785d3485 100644
--- a/notifications.php
+++ b/notifications.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php 
 
diff --git a/notifications_dismissed.php b/notifications_dismissed.php
index 20f401af..df0ce134 100644
--- a/notifications_dismissed.php
+++ b/notifications_dismissed.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/payments.php b/payments.php
index bd2daff7..39c90ae6 100644
--- a/payments.php
+++ b/payments.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/products.php b/products.php
index c1c3282d..bd297cc9 100644
--- a/products.php
+++ b/products.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/quote.php b/quote.php
index f3a98fcd..ff1b9f42 100644
--- a/quote.php
+++ b/quote.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php 
 
diff --git a/quotes.php b/quotes.php
index 73153e0d..f8407ffc 100644
--- a/quotes.php
+++ b/quotes.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/recurring_invoice.php b/recurring_invoice.php
index abe69219..0e8455d2 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php 
 
diff --git a/recurring_invoices.php b/recurring_invoices.php
index 721de476..c4983d41 100644
--- a/recurring_invoices.php
+++ b/recurring_invoices.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/report_expense_summary.php b/report_expense_summary.php
index 01c42fac..d8aa8895 100644
--- a/report_expense_summary.php
+++ b/report_expense_summary.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 <?php 
 
 function roundUpToNearestMultiple($n, $increment = 1000)
diff --git a/report_income_summary.php b/report_income_summary.php
index cbb7d8b0..416a0645 100644
--- a/report_income_summary.php
+++ b/report_income_summary.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 <?php 
 
 function roundUpToNearestMultiple($n, $increment = 1000)
diff --git a/report_profit_loss.php b/report_profit_loss.php
index a9a10d1a..f894f941 100644
--- a/report_profit_loss.php
+++ b/report_profit_loss.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php
 
diff --git a/report_tax_summary.php b/report_tax_summary.php
index d33de0cb..61f6d5b0 100644
--- a/report_tax_summary.php
+++ b/report_tax_summary.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php
 
diff --git a/revenues.php b/revenues.php
index 5dbc6f3a..407b9be1 100644
--- a/revenues.php
+++ b/revenues.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/scheduled_tickets.php b/scheduled_tickets.php
index a954f833..03080515 100644
--- a/scheduled_tickets.php
+++ b/scheduled_tickets.php
@@ -1,5 +1,5 @@
 <?php
-include("header.php");
+include("inc_all.php");
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/settings-alerts.php b/settings-alerts.php
index 37e3cd08..02365211 100644
--- a/settings-alerts.php
+++ b/settings-alerts.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php include("settings-nav.php"); ?>
 
diff --git a/settings-backup.php b/settings-backup.php
index 601c0bde..8c6ab8d1 100644
--- a/settings-backup.php
+++ b/settings-backup.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php include("settings-nav.php"); ?>
 
diff --git a/settings-defaults.php b/settings-defaults.php
index fb400dd4..c06c3417 100644
--- a/settings-defaults.php
+++ b/settings-defaults.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php include("settings-nav.php"); ?>
 
diff --git a/settings-general.php b/settings-general.php
index a106850a..db8c9cc6 100644
--- a/settings-general.php
+++ b/settings-general.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php include("settings-nav.php"); ?>
 
diff --git a/settings-invoice.php b/settings-invoice.php
index a86d4966..2bab41cc 100644
--- a/settings-invoice.php
+++ b/settings-invoice.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php include("settings-nav.php"); ?>
 
diff --git a/settings-mail.php b/settings-mail.php
index 1d399822..0488fa31 100644
--- a/settings-mail.php
+++ b/settings-mail.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php include("settings-nav.php"); ?>
 
diff --git a/settings-online-payment.php b/settings-online-payment.php
index 64150d93..2a37f94d 100644
--- a/settings-online-payment.php
+++ b/settings-online-payment.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php include("settings-nav.php"); ?>
 
diff --git a/settings-quote.php b/settings-quote.php
index 1f43957f..d00c6a0f 100644
--- a/settings-quote.php
+++ b/settings-quote.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php include("settings-nav.php"); ?>
 
diff --git a/settings-ticket.php b/settings-ticket.php
index 1b90baff..6958b569 100644
--- a/settings-ticket.php
+++ b/settings-ticket.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php include("settings-nav.php"); ?>
 
diff --git a/settings-update.php b/settings-update.php
index b0f54a20..492196bd 100644
--- a/settings-update.php
+++ b/settings-update.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php include("settings-nav.php"); ?>
 
diff --git a/settings-user.php b/settings-user.php
index eceb5600..f4c4e0b9 100644
--- a/settings-user.php
+++ b/settings-user.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php
 
diff --git a/tags.php b/tags.php
index 7ff617e1..bad8bcb9 100644
--- a/tags.php
+++ b/tags.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); 
+<?php include("inc_all.php"); 
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/taxes.php b/taxes.php
index 1a38920d..d54c31f7 100644
--- a/taxes.php
+++ b/taxes.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); 
+<?php include("inc_all.php"); 
 
 if(!empty($_GET['sb'])){
   $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
diff --git a/test_noclients.php b/test_noclients.php
index ca950177..f362c74b 100644
--- a/test_noclients.php
+++ b/test_noclients.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <div class="row justify-content-md-center">
 	<div class="col-md-5">
diff --git a/ticket.php b/ticket.php
index 6299491a..ac91ddf6 100644
--- a/ticket.php
+++ b/ticket.php
@@ -1,5 +1,4 @@
-<?php include("config.php"); ?>
-<?php include("header.php"); ?>
+<?php include("inc_all.php"); ?>
 
 <?php
 
diff --git a/tickets.php b/tickets.php
index 89d508b3..730e74a3 100644
--- a/tickets.php
+++ b/tickets.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
 
 //Paging
 if (isset($_GET['p'])) {
diff --git a/transfers.php b/transfers.php
index c7e53975..4a8379c4 100644
--- a/transfers.php
+++ b/transfers.php
@@ -1,4 +1,4 @@
-<?php include("header.php"); 
+<?php include("inc_all.php"); 
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/trips.php b/trips.php
index 4035e10d..9ada00d5 100644
--- a/trips.php
+++ b/trips.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
 
   //Paging
   if(isset($_GET['p'])){
diff --git a/user_logs.php b/user_logs.php
index da8e604b..2d680ef1 100644
--- a/user_logs.php
+++ b/user_logs.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
   
   //Rebuild URL
 
diff --git a/users.php b/users.php
index 344f1f67..e0c0ee3c 100644
--- a/users.php
+++ b/users.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
 
   //Paging
   if(isset($_GET['p'])){
diff --git a/vendors.php b/vendors.php
index 02c634d6..bc90e1f5 100644
--- a/vendors.php
+++ b/vendors.php
@@ -1,4 +1,4 @@
-<?php include("header.php");
+<?php include("inc_all.php");
 
 //Paging
 if(isset($_GET['p'])){