diff --git a/accounts.php b/accounts.php
index 6b6413e8..c73e7fe6 100644
--- a/accounts.php
+++ b/accounts.php
@@ -9,11 +9,14 @@ if (!empty($_GET['sb'])) {
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM accounts
-  WHERE account_name LIKE '%$q%' AND company_id = $session_company_id
-  ORDER BY $sb $o LIMIT $record_from, $record_to");
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM accounts
+    WHERE account_name LIKE '%$q%' AND company_id = $session_company_id
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
+);
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
diff --git a/ajax.php b/ajax.php
index 3902a37b..2e8610c0 100644
--- a/ajax.php
+++ b/ajax.php
@@ -141,7 +141,9 @@ if (isset($_GET['network_get_json_details'])) {
     }
 
     // Lookup all client locations, as networks can be associated with any client location
-    $locations_sql = mysqli_query($mysqli, "SELECT location_id, location_name FROM locations 
+    $locations_sql = mysqli_query(
+        $mysqli,
+        "SELECT location_id, location_name FROM locations 
         WHERE location_client_id = '$client_id' AND company_id = '$session_company_id'"
     );
     while ($row = mysqli_fetch_array($locations_sql)) {
@@ -226,11 +228,11 @@ if (isset($_GET['share_generate_link'])) {
     $item_encrypted_credential = '';  // Default empty
 
     $client_id = intval($_GET['client_id']);
-    $item_type = trim(strip_tags(mysqli_real_escape_string($mysqli,$_GET['type'])));
+    $item_type = trim(strip_tags(mysqli_real_escape_string($mysqli, $_GET['type'])));
     $item_id = intval($_GET['id']);
-    $item_note = trim(strip_tags(mysqli_real_escape_string($mysqli,$_GET['note'])));
+    $item_note = trim(strip_tags(mysqli_real_escape_string($mysqli, $_GET['note'])));
     $item_view_limit = intval($_GET['views']);
-    $item_expires = trim(strip_tags(mysqli_real_escape_string($mysqli,$_GET['expires'])));
+    $item_expires = trim(strip_tags(mysqli_real_escape_string($mysqli, $_GET['expires'])));
     $item_key = randomString(156);
 
     if ($item_type == "Document") {
diff --git a/base32static.php b/base32static.php
index 1bfad4cc..a59feaff 100644
--- a/base32static.php
+++ b/base32static.php
@@ -44,7 +44,7 @@ class Base32Static {
         $i=0;
 
         while($i < count($fiveBitBinaryArray)) {
-            $base32 .= self::$map[base_convert(str_pad($fiveBitBinaryArray[$i], 5,'0'), 2, 10)];
+            $base32 .= self::$map[base_convert(str_pad($fiveBitBinaryArray[$i], 5, '0'), 2, 10)];
             $i++;
         }
 
@@ -71,7 +71,7 @@ class Base32Static {
                 substr($input, -($allowedValues[$i])) != str_repeat(self::$map[32], $allowedValues[$i])) return false;
         }
 
-        $input = str_replace('=','', $input);
+        $input = str_replace('=', '', $input);
         $input = str_split($input);
         $binaryString = "";
 
diff --git a/calendar_event_add_modal.php b/calendar_event_add_modal.php
index a3428a52..40a8be28 100644
--- a/calendar_event_add_modal.php
+++ b/calendar_event_add_modal.php
@@ -48,7 +48,7 @@
                                         <option value="">- Calendar -</option>
                                         <?php
 
-                                        $sql = mysqli_query($mysqli,"SELECT * FROM calendars WHERE company_id = $session_company_id ORDER BY calendar_name ASC");
+                                        $sql = mysqli_query($mysqli, "SELECT * FROM calendars WHERE company_id = $session_company_id ORDER BY calendar_name ASC");
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $calendar_id = $row['calendar_id'];
                                             $calendar_name = htmlentities($row['calendar_name']);
@@ -117,7 +117,7 @@
                                             <option value="">- Client -</option>
                                             <?php
 
-                                            $sql = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN contacts ON primary_contact = contact_id WHERE clients.company_id = $session_company_id ORDER BY client_name ASC");
+                                            $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN contacts ON primary_contact = contact_id WHERE clients.company_id = $session_company_id ORDER BY client_name ASC");
                                             while ($row = mysqli_fetch_array($sql)) {
                                                 $client_id = $row['client_id'];
                                                 $client_name = htmlentities($row['client_name']);
diff --git a/calendar_event_edit_modal.php b/calendar_event_edit_modal.php
index 3bb800c0..e00a6802 100644
--- a/calendar_event_edit_modal.php
+++ b/calendar_event_edit_modal.php
@@ -50,7 +50,7 @@
                                     <select class="form-control select2" name="calendar" required>
                                         <?php
 
-                                        $sql_calendars_select = mysqli_query($mysqli,"SELECT * FROM calendars WHERE company_id = $session_company_id ORDER BY calendar_name ASC");
+                                        $sql_calendars_select = mysqli_query($mysqli, "SELECT * FROM calendars WHERE company_id = $session_company_id ORDER BY calendar_name ASC");
                                         while ($row = mysqli_fetch_array($sql_calendars_select)) {
                                             $calendar_id_select = $row['calendar_id'];
                                             $calendar_name_select = htmlentities($row['calendar_name']);
@@ -116,7 +116,7 @@
                                             <option value="">- Client -</option>
                                             <?php
 
-                                            $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN contacts ON primary_contact = contact_id WHERE clients.company_id = $session_company_id ORDER BY client_name ASC");
+                                            $sql_clients = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN contacts ON primary_contact = contact_id WHERE clients.company_id = $session_company_id ORDER BY client_name ASC");
                                             while ($row = mysqli_fetch_array($sql_clients)) {
                                                 $client_id_select = $row['client_id'];
                                                 $client_name_select = htmlentities($row['client_name']);
diff --git a/calendar_events.php b/calendar_events.php
index a43d255e..f3c12491 100644
--- a/calendar_events.php
+++ b/calendar_events.php
@@ -18,7 +18,7 @@ require_once("calendar_add_modal.php");
 require_once("category_quick_add_modal.php");
 
 //loop through IDs and create a modal for each
-$sql = mysqli_query($mysqli,"SELECT * FROM events LEFT JOIN calendars ON event_calendar_id = calendar_id WHERE calendars.company_id = $session_company_id");
+$sql = mysqli_query($mysqli, "SELECT * FROM events LEFT JOIN calendars ON event_calendar_id = calendar_id WHERE calendars.company_id = $session_company_id");
 while ($row = mysqli_fetch_array($sql)) {
     $event_id = $row['event_id'];
     $event_title = htmlentities($row['event_title']);
@@ -70,7 +70,7 @@ while ($row = mysqli_fetch_array($sql)) {
             },
             events: [
                 <?php
-                $sql = mysqli_query($mysqli,"SELECT * FROM events LEFT JOIN calendars ON event_calendar_id = calendar_id WHERE calendars.company_id = $session_company_id");
+                $sql = mysqli_query($mysqli, "SELECT * FROM events LEFT JOIN calendars ON event_calendar_id = calendar_id WHERE calendars.company_id = $session_company_id");
                 while ($row = mysqli_fetch_array($sql)) {
                     $event_id = json_encode($row['event_id']);
                     $event_title = json_encode($row['event_title']);
@@ -84,7 +84,7 @@ while ($row = mysqli_fetch_array($sql)) {
                 }
 
                 //Invoices Created
-                $sql = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN invoices ON client_id = invoice_client_id WHERE clients.company_id = $session_company_id");
+                $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN invoices ON client_id = invoice_client_id WHERE clients.company_id = $session_company_id");
                 while ($row = mysqli_fetch_array($sql)) {
                     $event_id = json_encode($row['invoice_id']);
                     $event_title = json_encode($row['invoice_prefix'] . $row['invoice_number'] . " " . $row['invoice_scope']);
@@ -94,7 +94,7 @@ while ($row = mysqli_fetch_array($sql)) {
                 }
 
                 //Quotes Created
-                $sql = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN quotes ON client_id = quote_client_id WHERE clients.company_id = $session_company_id");
+                $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN quotes ON client_id = quote_client_id WHERE clients.company_id = $session_company_id");
                 while ($row = mysqli_fetch_array($sql)) {
                     $event_id = json_encode($row['quote_id']);
                     $event_title = json_encode($row['quote_prefix'] . $row['quote_number'] . " " . $row['quote_scope']);
@@ -104,7 +104,7 @@ while ($row = mysqli_fetch_array($sql)) {
                 }
 
                 //Tickets Created
-                $sql = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id WHERE clients.company_id = $session_company_id");
+                $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id WHERE clients.company_id = $session_company_id");
                 while ($row = mysqli_fetch_array($sql)) {
                     $event_id = json_encode($row['ticket_id']);
                     $event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " " . $row['ticket_subject']);
@@ -115,7 +115,7 @@ while ($row = mysqli_fetch_array($sql)) {
                 }
 
                 //Vendors Added Created
-                $sql = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN vendors ON client_id = vendor_client_id WHERE vendor_template = 0 AND clients.company_id = $session_company_id");
+                $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN vendors ON client_id = vendor_client_id WHERE vendor_template = 0 AND clients.company_id = $session_company_id");
                 while ($row = mysqli_fetch_array($sql)) {
                     $event_id = json_encode($row['vendor_id']);
                     $event_title = json_encode($row['vendor_name']);
@@ -125,7 +125,7 @@ while ($row = mysqli_fetch_array($sql)) {
                 }
 
                 //Clients Added
-                $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE clients.company_id = $session_company_id");
+                $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE clients.company_id = $session_company_id");
                 while ($row = mysqli_fetch_array($sql)) {
                     $event_id = json_encode($row['client_id']);
                     $event_title = json_encode($row['client_name']);
diff --git a/categories.php b/categories.php
index fd24b2e5..a20bc85c 100644
--- a/categories.php
+++ b/categories.php
@@ -3,35 +3,39 @@
 require_once("inc_all_settings.php");
 
 if (isset($_GET['category'])) {
-    $category = strip_tags(mysqli_real_escape_string($mysqli,$_GET['category']));
+    $category = strip_tags(mysqli_real_escape_string($mysqli, $_GET['category']));
 } else {
     $category = "Expense";
 }
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "category_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM categories
-  WHERE category_name LIKE '%$q%'
-  AND category_type = '$category'
-  AND category_archived_at IS NULL
-  AND company_id = $session_company_id 
-  ORDER BY $sb $o LIMIT $record_from, $record_to"
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM categories
+    WHERE category_name LIKE '%$q%'
+    AND category_type = '$category'
+    AND category_archived_at IS NULL
+    AND company_id = $session_company_id 
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
 );
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 //Colors Used
-$sql_colors_used = mysqli_query($mysqli,"SELECT category_color FROM categories 
-  WHERE category_type = '$category'
-  AND category_archived_at IS NULL
-  AND company_id = $session_company_id"
+$sql_colors_used = mysqli_query(
+    $mysqli,
+    "SELECT category_color FROM categories 
+    WHERE category_type = '$category'
+    AND category_archived_at IS NULL
+    AND company_id = $session_company_id"
 );
 
 while ($color_used_row = mysqli_fetch_array($sql_colors_used)) {
diff --git a/client_add_modal.php b/client_add_modal.php
index c1db4453..b3515ea7 100644
--- a/client_add_modal.php
+++ b/client_add_modal.php
@@ -64,7 +64,7 @@
                                         <option value="">N/A</option>
                                         <?php
 
-                                        $referral_sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC");
+                                        $referral_sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC");
                                         while ($row = mysqli_fetch_array($referral_sql)) {
                                             $referral = htmlentities($row['category_name']); ?>
                                             <option><?php echo $referral; ?></option>
@@ -271,7 +271,7 @@
                             <ul class="list-group">
 
                                 <?php
-                                $sql_tags_select = mysqli_query($mysqli,"SELECT * FROM tags WHERE tag_type = 1 AND company_id = $session_company_id ORDER BY tag_name ASC");
+                                $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 1 AND company_id = $session_company_id ORDER BY tag_name ASC");
 
                                 while ($row = mysqli_fetch_array($sql_tags_select)) {
                                     $tag_id_select = $row['tag_id'];
diff --git a/client_asset_add_modal.php b/client_asset_add_modal.php
index 6ad4b808..0031f630 100644
--- a/client_asset_add_modal.php
+++ b/client_asset_add_modal.php
@@ -122,7 +122,7 @@
                                         <option value="">- Location -</option>
                                         <?php
 
-                                        $sql = mysqli_query($mysqli,"SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
+                                        $sql = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $location_id = $row['location_id'];
                                             $location_name = htmlentities($row['location_name']);
@@ -145,7 +145,7 @@
                                             <option value="">- Contact -</option>
                                             <?php
 
-                                            $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
+                                            $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
                                             while ($row = mysqli_fetch_array($sql)) {
                                                 $contact_id = $row['contact_id'];
                                                 $contact_name = htmlentities($row['contact_name']);
@@ -184,7 +184,7 @@
                                         <option value="">- Network -</option>
                                         <?php
 
-                                        $sql = mysqli_query($mysqli,"SELECT * FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id ORDER BY network_name ASC");
+                                        $sql = mysqli_query($mysqli, "SELECT * FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id ORDER BY network_name ASC");
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $network_id = $row['network_id'];
                                             $network_name = htmlentities($row['network_name']);
@@ -232,7 +232,7 @@
                                         <option value="">- Vendor -</option>
                                         <?php
 
-                                        $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id AND vendor_template = 0 ORDER BY vendor_name ASC");
+                                        $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id AND vendor_template = 0 ORDER BY vendor_name ASC");
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $vendor_id = $row['vendor_id'];
                                             $vendor_name = htmlentities($row['vendor_name']);
diff --git a/client_asset_copy_modal.php b/client_asset_copy_modal.php
index df33a44d..b39623fa 100644
--- a/client_asset_copy_modal.php
+++ b/client_asset_copy_modal.php
@@ -119,7 +119,7 @@
                                         <option value="">- Location -</option>
                                         <?php
 
-                                        $sql_locations = mysqli_query($mysqli,"SELECT * FROM locations WHERE location_client_id = $client_id ORDER BY location_name ASC");
+                                        $sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_client_id = $client_id ORDER BY location_name ASC");
                                         while ($row = mysqli_fetch_array($sql_locations)) {
                                             $location_id_select = $row['location_id'];
                                             $location_name_select = htmlentities($row['location_name']);
@@ -142,7 +142,7 @@
                                             <option value="">- Contact -</option>
                                             <?php
 
-                                            $sql_contacts = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
+                                            $sql_contacts = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
                                             while ($row = mysqli_fetch_array($sql_contacts)) {
                                                 $contact_id = $row['contact_id'];
                                                 $contact_name = htmlentities($row['contact_name']);
@@ -179,7 +179,7 @@
                                         <option value="">- Network -</option>
                                         <?php
 
-                                        $sql_networks = mysqli_query($mysqli,"SELECT * FROM networks WHERE (network_archived_at > '$asset_created_at' OR network_archived_at IS NULL) AND network_client_id = $client_id ORDER BY network_name ASC");
+                                        $sql_networks = mysqli_query($mysqli, "SELECT * FROM networks WHERE (network_archived_at > '$asset_created_at' OR network_archived_at IS NULL) AND network_client_id = $client_id ORDER BY network_name ASC");
                                         while ($row = mysqli_fetch_array($sql_networks)) {
                                             $network_id_select = $row['network_id'];
                                             $network_name_select = htmlentities($row['network_name']);
@@ -227,7 +227,7 @@
                                         <option value="">- Vendor -</option>
                                         <?php
 
-                                        $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE (vendor_archived_at > '$asset_created_at' OR vendor_archived_at IS NULL) AND vendor_client_id = $client_id  AND vendor_template = 0 ORDER BY vendor_name ASC");
+                                        $sql_vendors = mysqli_query($mysqli, "SELECT * FROM vendors WHERE (vendor_archived_at > '$asset_created_at' OR vendor_archived_at IS NULL) AND vendor_client_id = $client_id  AND vendor_template = 0 ORDER BY vendor_name ASC");
                                         while ($row = mysqli_fetch_array($sql_vendors)) {
                                             $vendor_id_select = $row['vendor_id'];
                                             $vendor_name_select = htmlentities($row['vendor_name']);
diff --git a/client_asset_edit_modal.php b/client_asset_edit_modal.php
index a2bc1180..74ab4a28 100644
--- a/client_asset_edit_modal.php
+++ b/client_asset_edit_modal.php
@@ -121,7 +121,7 @@
                                         <option value="">- Location -</option>
                                         <?php
 
-                                        $sql_locations = mysqli_query($mysqli,"SELECT * FROM locations WHERE location_client_id = $client_id ORDER BY location_name ASC");
+                                        $sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_client_id = $client_id ORDER BY location_name ASC");
                                         while ($row = mysqli_fetch_array($sql_locations)) {
                                             $location_id_select = $row['location_id'];
                                             $location_name_select = htmlentities($row['location_name']);
@@ -143,13 +143,13 @@
                                         <option value="">- Contact -</option>
                                         <?php
 
-                                        $sql_contacts = mysqli_query($mysqli,"SELECT * FROM contacts WHERE (contact_archived_at > '$asset_created_at' OR contact_archived_at IS NULL) AND contact_client_id = $client_id ORDER BY contact_name ASC");
+                                        $sql_contacts = mysqli_query($mysqli, "SELECT * FROM contacts WHERE (contact_archived_at > '$asset_created_at' OR contact_archived_at IS NULL) AND contact_client_id = $client_id ORDER BY contact_name ASC");
                                         while ($row = mysqli_fetch_array($sql_contacts)) {
                                             $contact_id_select = $row['contact_id'];
                                             $contact_name_select = htmlentities($row['contact_name']);
                                             ?>
                                             <option <?php if ($asset_contact_id == $contact_id_select) { echo "selected"; } ?> value="<?php echo $contact_id_select; ?>">
-                                                <?php echo $contact_name_select; ?> <?php if (!empty($row['contact_archived_at'])) { echo " (Archived " . date('Y-m-d',strtotime($row['contact_archived_at'])) .")"; } ?>
+                                                <?php echo $contact_name_select; ?> <?php if (!empty($row['contact_archived_at'])) { echo " (Archived " . date('Y-m-d', strtotime($row['contact_archived_at'])) .")"; } ?>
                                             </option>
 
                                         <?php } ?>
@@ -181,7 +181,7 @@
                                         <option value="">- Network -</option>
                                         <?php
 
-                                        $sql_networks = mysqli_query($mysqli,"SELECT * FROM networks WHERE (network_archived_at > '$asset_created_at' OR network_archived_at IS NULL) AND network_client_id = $client_id ORDER BY network_name ASC");
+                                        $sql_networks = mysqli_query($mysqli, "SELECT * FROM networks WHERE (network_archived_at > '$asset_created_at' OR network_archived_at IS NULL) AND network_client_id = $client_id ORDER BY network_name ASC");
                                         while ($row = mysqli_fetch_array($sql_networks)) {
                                             $network_id_select = $row['network_id'];
                                             $network_name_select = htmlentities($row['network_name']);
@@ -229,7 +229,7 @@
                                         <option value="">- Vendor -</option>
                                         <?php
 
-                                        $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE (vendor_archived_at > '$asset_created_at' OR vendor_archived_at IS NULL) AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
+                                        $sql_vendors = mysqli_query($mysqli, "SELECT * FROM vendors WHERE (vendor_archived_at > '$asset_created_at' OR vendor_archived_at IS NULL) AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
                                         while ($row = mysqli_fetch_array($sql_vendors)) {
                                             $vendor_id_select = $row['vendor_id'];
                                             $vendor_name_select = htmlentities($row['vendor_name']);
diff --git a/client_asset_interface_add_modal.php b/client_asset_interface_add_modal.php
index 48873d5b..6a36cc0b 100644
--- a/client_asset_interface_add_modal.php
+++ b/client_asset_interface_add_modal.php
@@ -75,7 +75,7 @@
                                         <option value="">- None -</option>
                                         <?php
 
-                                        $sql_network_select = mysqli_query($mysqli,"SELECT * FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id ORDER BY network_name ASC");
+                                        $sql_network_select = mysqli_query($mysqli, "SELECT * FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id ORDER BY network_name ASC");
                                         while ($row = mysqli_fetch_array($sql_network_select)) {
                                             $network_id = $row['network_id'];
                                             $network_name = htmlentities($row['network_name']);
diff --git a/client_assets.php b/client_assets.php
index 089572b0..4e889f87 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -31,7 +31,7 @@ $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(*) AS count FROM a
 $other_count = $row['count'];
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "asset_name";
 }
@@ -53,17 +53,19 @@ if (isset($_GET['type']) && ($_GET['type']) == 'workstation') {
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM assets 
-  LEFT JOIN contacts ON asset_contact_id = contact_id 
-  LEFT JOIN locations ON asset_location_id = location_id 
-  LEFT JOIN logins ON login_asset_id = asset_id
-  WHERE asset_client_id = $client_id
-  AND asset_archived_at IS NULL
-  AND (asset_name LIKE '%$q%' OR asset_type LIKE '%$q%' OR asset_ip LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial LIKE '%$q%' OR asset_os LIKE '%$q%' OR contact_name LIKE '%$q%' OR location_name LIKE '%$q%')
-  AND ($type_query)
-  ORDER BY $sb $o LIMIT $record_from, $record_to"
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM assets 
+    LEFT JOIN contacts ON asset_contact_id = contact_id 
+    LEFT JOIN locations ON asset_location_id = location_id 
+    LEFT JOIN logins ON login_asset_id = asset_id
+    WHERE asset_client_id = $client_id
+    AND asset_archived_at IS NULL
+    AND (asset_name LIKE '%$q%' OR asset_type LIKE '%$q%' OR asset_ip LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial LIKE '%$q%' OR asset_os LIKE '%$q%' OR contact_name LIKE '%$q%' OR location_name LIKE '%$q%')
+    AND ($type_query)
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
 );
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
diff --git a/client_certificates.php b/client_certificates.php
index 7a7d6315..852ba6f6 100644
--- a/client_certificates.php
+++ b/client_certificates.php
@@ -1,21 +1,21 @@
 <?php require_once("inc_all_client.php"); ?>
 
-<?php 
+<?php
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
+  $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
   $sb = "certificate_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM certificates 
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM certificates 
   WHERE certificate_client_id = $client_id AND (certificate_name LIKE '%$q%' OR certificate_domain LIKE '%$q%' OR certificate_issued_by LIKE '%$q%') 
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
@@ -30,7 +30,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
     <form autocomplete="off">
       <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
       <div class="row">
-        
+
         <div class="col-md-4">
           <div class="input-group mb-3 mb-md-0">
             <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Certificates">
@@ -62,7 +62,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
         </thead>
         <tbody>
           <?php
-      
+
           while ($row = mysqli_fetch_array($sql)) {
             $certificate_id = $row['certificate_id'];
             $certificate_name = htmlentities($row['certificate_name']);
diff --git a/client_contact_add_modal.php b/client_contact_add_modal.php
index ba87dbd6..a7e24878 100644
--- a/client_contact_add_modal.php
+++ b/client_contact_add_modal.php
@@ -120,7 +120,7 @@
                                         <option value="">- Location -</option>
                                         <?php
 
-                                        $sql = mysqli_query($mysqli,"SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
+                                        $sql = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $location_id = $row['location_id'];
                                             $location_name = htmlentities($row['location_name']);
diff --git a/client_contact_details.php b/client_contact_details.php
index d56ba3cc..82b90128 100644
--- a/client_contact_details.php
+++ b/client_contact_details.php
@@ -94,7 +94,7 @@ if (isset($_GET['contact_id'])) {
                     if (!empty($contact_mobile)) { ?>
                         <div class="mb-2"><i class="fa fa-fw fa-mobile-alt text-secondary mr-3"></i><?php echo $contact_mobile; ?></div>
                     <?php } ?>
-                    <div class="mb-2"><i class="fa fa-fw fa-clock text-secondary mr-3"></i><?php echo date('Y-m-d',strtotime($contact_created_at)); ?></div>
+                    <div class="mb-2"><i class="fa fa-fw fa-clock text-secondary mr-3"></i><?php echo date('Y-m-d', strtotime($contact_created_at)); ?></div>
                     <hr>
                     <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#editContactModal<?php echo $contact_id; ?>">
                         <i class="fas fa-fw fa-user-edit"></i> Edit
@@ -389,7 +389,7 @@ if (isset($_GET['contact_id'])) {
                                     $asset_licenses_array[] = $row['asset_id'];
                                     $seat_count = $seat_count + 1;
                                 }
-                                $asset_licenses = implode(',',$asset_licenses_array);
+                                $asset_licenses = implode(',', $asset_licenses_array);
 
                                 // Contact Licenses
                                 $contact_licenses_sql = mysqli_query($mysqli, "SELECT contact_id FROM software_contacts WHERE software_id = $software_id");
@@ -398,7 +398,7 @@ if (isset($_GET['contact_id'])) {
                                     $contact_licenses_array[] = $row['contact_id'];
                                     $seat_count = $seat_count + 1;
                                 }
-                                $contact_licenses = implode(',',$contact_licenses_array);
+                                $contact_licenses = implode(',', $contact_licenses_array);
 
                                 ?>
                                 <tr>
diff --git a/client_contact_edit_modal.php b/client_contact_edit_modal.php
index a86ed394..3e9d76a1 100644
--- a/client_contact_edit_modal.php
+++ b/client_contact_edit_modal.php
@@ -122,7 +122,7 @@
                                         <option value="">- Location -</option>
                                         <?php
 
-                                        $sql_locations = mysqli_query($mysqli,"SELECT * FROM locations WHERE (location_archived_at > '$contact_created_at' OR location_archived_at IS NULL) AND location_client_id = $client_id ORDER BY location_name ASC");
+                                        $sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE (location_archived_at > '$contact_created_at' OR location_archived_at IS NULL) AND location_client_id = $client_id ORDER BY location_name ASC");
                                         while ($row = mysqli_fetch_array($sql_locations)) {
                                             $location_id_select = $row['location_id'];
                                             $location_name_select = htmlentities($row['location_name']);
diff --git a/client_contacts.php b/client_contacts.php
index bb5a8985..760dd7fc 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -3,9 +3,9 @@
 require_once("inc_all_client.php");
 
 if (isset($_GET['q'])) {
-    $q = strip_tags(mysqli_real_escape_string($mysqli,$_GET['q']));
+    $q = strip_tags(mysqli_real_escape_string($mysqli, $_GET['q']));
     //Phone Numbers
-    $n = preg_replace("/[^0-9]/", '',$q);
+    $n = preg_replace("/[^0-9]/", '', $q);
     if (empty($n)) {
         $n = $q;
     }
@@ -16,21 +16,21 @@ if (isset($_GET['q'])) {
 }
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "contact_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM contacts 
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM contacts 
   LEFT JOIN locations ON location_id = contact_location_id
   WHERE contact_archived_at IS NULL 
   AND (contact_name LIKE '%$q%' OR contact_title LIKE '%$q%' OR location_name LIKE '%$q%'  OR contact_email LIKE '%$q%' OR contact_department LIKE '%$q%' OR contact_phone LIKE '%$n%' OR contact_extension LIKE '%$q%' OR contact_mobile LIKE '%$n%')
   AND contact_client_id = $client_id ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
@@ -145,19 +145,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                     $auth_method = htmlentities($row['contact_auth_method']);
 
                     // Related Assets Query
-                    $sql_related_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_contact_id = $contact_id AND company_id = $session_company_id ORDER BY asset_id DESC");
+                    $sql_related_assets = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_contact_id = $contact_id AND company_id = $session_company_id ORDER BY asset_id DESC");
                     $asset_count = mysqli_num_rows($sql_related_assets);
 
                     // Related Logins Query
-                    $sql_related_logins = mysqli_query($mysqli,"SELECT * FROM logins WHERE login_contact_id = $contact_id AND company_id = $session_company_id ORDER BY login_id DESC");
+                    $sql_related_logins = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_contact_id = $contact_id AND company_id = $session_company_id ORDER BY login_id DESC");
                     $login_count = mysqli_num_rows($sql_related_logins);
 
                     // Related Software Query
-                    $sql_related_software = mysqli_query($mysqli,"SELECT * FROM software, software_contacts WHERE software.software_id = software_contacts.software_id AND software_contacts.contact_id = $contact_id AND software.company_id = $session_company_id ORDER BY software.software_id DESC");
+                    $sql_related_software = mysqli_query($mysqli, "SELECT * FROM software, software_contacts WHERE software.software_id = software_contacts.software_id AND software_contacts.contact_id = $contact_id AND software.company_id = $session_company_id ORDER BY software.software_id DESC");
                     $software_count = mysqli_num_rows($sql_related_software);
 
                     // Related Tickets Query
-                    $sql_related_tickets = mysqli_query($mysqli,"SELECT * FROM tickets WHERE ticket_contact_id = $contact_id AND company_id = $session_company_id ORDER BY ticket_id DESC");
+                    $sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_contact_id = $contact_id AND company_id = $session_company_id ORDER BY ticket_id DESC");
                     $ticket_count = mysqli_num_rows($sql_related_tickets);
 
                     ?>
diff --git a/client_document_add_from_template_modal.php b/client_document_add_from_template_modal.php
index af0feeeb..a6cc0771 100644
--- a/client_document_add_from_template_modal.php
+++ b/client_document_add_from_template_modal.php
@@ -20,7 +20,7 @@
               <select class="form-control" name="document_template_id" required>
                 <option value="">- Select Template -</option>
                 <?php
-                $sql_document_templates = mysqli_query($mysqli,"SELECT * FROM documents WHERE document_template = 1 AND company_id = $session_company_id AND document_archived_at IS NULL ORDER BY document_name ASC");
+                $sql_document_templates = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_template = 1 AND company_id = $session_company_id AND document_archived_at IS NULL ORDER BY document_name ASC");
                 while ($row = mysqli_fetch_array($sql_document_templates)) {
                   $document_template_id = $row['document_id'];
                   $document_template_name = htmlentities($row['document_name']);
@@ -54,7 +54,7 @@
               <select class="form-control" name="folder">
                 <option value="0">/</option>
                 <?php
-                $sql_folders = mysqli_query($mysqli,"SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
+                $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
                 while ($row = mysqli_fetch_array($sql_folders)) {
                   $folder_id = $row['folder_id'];
                   $folder_name = htmlentities($row['folder_name']);
diff --git a/client_document_add_modal.php b/client_document_add_modal.php
index 1611d0b5..9a7c84b4 100644
--- a/client_document_add_modal.php
+++ b/client_document_add_modal.php
@@ -27,7 +27,7 @@
                             <select class="form-control" name="folder">
                                 <option value="0">/</option>
                                 <?php
-                                $sql_folders = mysqli_query($mysqli,"SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
+                                $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
                                 while ($row = mysqli_fetch_array($sql_folders)) {
                                     $folder_id = $row['folder_id'];
                                     $folder_name = htmlentities($row['folder_name']);
diff --git a/client_document_details.php b/client_document_details.php
index dacdaafc..699e11fd 100644
--- a/client_document_details.php
+++ b/client_document_details.php
@@ -7,7 +7,7 @@ if (isset($_GET['document_id'])) {
 }
 
 
-$sql_document = mysqli_query($mysqli,"SELECT * FROM documents LEFT JOIN folders ON document_folder_id = folder_id WHERE document_client_id = $client_id AND document_id = $document_id AND documents.company_id = $session_company_id");
+$sql_document = mysqli_query($mysqli, "SELECT * FROM documents LEFT JOIN folders ON document_folder_id = folder_id WHERE document_client_id = $client_id AND document_id = $document_id AND documents.company_id = $session_company_id");
 
 $row = mysqli_fetch_array($sql_document);
 
diff --git a/client_document_edit_modal.php b/client_document_edit_modal.php
index c61d45c5..594b1899 100644
--- a/client_document_edit_modal.php
+++ b/client_document_edit_modal.php
@@ -27,7 +27,7 @@
                             <select class="form-control" name="folder">
                                 <option value="0">/</option>
                                 <?php
-                                $sql_folders_select = mysqli_query($mysqli,"SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
+                                $sql_folders_select = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
                                 while ($row = mysqli_fetch_array($sql_folders_select)) {
                                     $folder_id_select = $row['folder_id'];
                                     $folder_name_select = htmlentities($row['folder_name']);
diff --git a/client_document_template_details.php b/client_document_template_details.php
index b6c8ea47..8a3ffedd 100644
--- a/client_document_template_details.php
+++ b/client_document_template_details.php
@@ -8,7 +8,7 @@ if (isset($_GET['document_id'])) {
 }
 
 
-$sql_document = mysqli_query($mysqli,"SELECT * FROM documents WHERE document_template = 1 AND document_id = $document_id AND documents.company_id = $session_company_id");
+$sql_document = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_template = 1 AND document_id = $document_id AND documents.company_id = $session_company_id");
 
 $row = mysqli_fetch_array($sql_document);
 
diff --git a/client_document_templates.php b/client_document_templates.php
index 9d259903..b0765d9b 100644
--- a/client_document_templates.php
+++ b/client_document_templates.php
@@ -4,8 +4,8 @@
 
 // Sort by
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
+  $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
   $sb = "document_name";
 }
 
@@ -17,16 +17,18 @@ if (!empty($q)) {
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM documents
-  WHERE document_template = 1
-  AND documents.company_id = $session_company_id
-  $query_snippet
-  ORDER BY $sb $o LIMIT $record_from, $record_to"
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM documents
+    WHERE document_template = 1
+    AND documents.company_id = $session_company_id
+    $query_snippet
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
 );
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
@@ -44,7 +46,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
     </div>
   </div>
   <div class="card-body">
-    
+
     <form autocomplete="off">
       <input type="hidden" name="client_id" value="<?php echo intval($client_id); ?>">
       <div class="input-group">
@@ -76,7 +78,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
         </thead>
         <tbody>
           <?php
-      
+
           while ($row = mysqli_fetch_array($sql)) {
             $document_id = $row['document_id'];
             $document_name = htmlentities($row['document_name']);
@@ -110,7 +112,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
           </tr>
 
           <?php
-          
+
           include("client_document_template_edit_modal.php");
           }
 
diff --git a/client_documents.php b/client_documents.php
index a103f205..3e9dd824 100644
--- a/client_documents.php
+++ b/client_documents.php
@@ -11,7 +11,7 @@ if (!empty($_GET['folder_id'])) {
 
 // Sort by
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "document_name";
 }
@@ -24,7 +24,7 @@ if (!empty($q)) {
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
 // Folder ID
 $get_folder_id = 0;
@@ -32,16 +32,18 @@ if (!empty($_GET['folder_id'])) {
     $get_folder_id = intval($_GET['folder_id']);
 }
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM documents
-  WHERE document_client_id = $client_id
-  AND documents.company_id = $session_company_id
-  AND document_template = 0
-  AND document_folder_id = $folder
-  $query_snippet
-  ORDER BY $sb $o LIMIT $record_from, $record_to"
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM documents
+    WHERE document_client_id = $client_id
+    AND documents.company_id = $session_company_id
+    AND document_template = 0
+    AND document_folder_id = $folder
+    $query_snippet
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
 );
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
@@ -82,12 +84,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                             <a class="nav-link <?php if ($get_folder_id == 0) { echo "active"; } ?>" href="?client_id=<?php echo $client_id; ?>&folder_id=0">/</a>
                         </li>
                         <?php
-                        $sql_folders = mysqli_query($mysqli,"SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
+                        $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
                         while ($row = mysqli_fetch_array($sql_folders)) {
                             $folder_id = $row['folder_id'];
                             $folder_name = htmlentities($row['folder_name']);
 
-                            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('document_id') AS num FROM documents WHERE document_folder_id = $folder_id"));
+                            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_folder_id = $folder_id"));
                             $num_documents = $row['num'];
 
                             ?>
diff --git a/client_domain_add_modal.php b/client_domain_add_modal.php
index 95b21c9f..c64c2ebc 100644
--- a/client_domain_add_modal.php
+++ b/client_domain_add_modal.php
@@ -31,7 +31,7 @@
                                 <option value="">- Vendor -</option>
                                 <?php
 
-                                $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
+                                $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
                                 while ($row = mysqli_fetch_array($sql)) {
                                     $vendor_id = $row['vendor_id'];
                                     $vendor_name = htmlentities($row['vendor_name']);
@@ -52,7 +52,7 @@
                                 <option value="">- Vendor -</option>
                                 <?php
 
-                                $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
+                                $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
                                 while ($row = mysqli_fetch_array($sql)) {
                                     $vendor_id = $row['vendor_id'];
                                     $vendor_name = htmlentities($row['vendor_name']);
diff --git a/client_domains.php b/client_domains.php
index d03133f5..9776097e 100644
--- a/client_domains.php
+++ b/client_domains.php
@@ -3,19 +3,19 @@
 require_once("inc_all_client.php");
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "domain_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM domains LEFT JOIN vendors ON domain_registrar = vendor_id
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM domains LEFT JOIN vendors ON domain_registrar = vendor_id
   WHERE domain_client_id = $client_id AND (domain_name LIKE '%$q%' OR vendor_name LIKE '%$q%') 
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
@@ -75,7 +75,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                             $domain_registrar_name = "-";
                         }
 
-                        $sql_domain_webhost = mysqli_query($mysqli,"SELECT vendor_name FROM vendors WHERE vendor_id = $domain_webhost");
+                        $sql_domain_webhost = mysqli_query($mysqli, "SELECT vendor_name FROM vendors WHERE vendor_id = $domain_webhost");
                         $row = mysqli_fetch_array($sql_domain_webhost);
                         $domain_webhost_name = htmlentities($row['vendor_name']);
                         if (empty($domain_webhost_name)) {
diff --git a/client_edit_modal.php b/client_edit_modal.php
index d694c73f..2f5f950d 100644
--- a/client_edit_modal.php
+++ b/client_edit_modal.php
@@ -59,7 +59,7 @@
                                         <option value="">N/A</option>
                                         <?php
 
-                                        $referral_sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Referral' AND (category_archived_at > '$client_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC");
+                                        $referral_sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Referral' AND (category_archived_at > '$client_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC");
                                         while ($row = mysqli_fetch_array($referral_sql)) {
                                             $referral = htmlentities($row['category_name']);
                                             ?>
@@ -137,7 +137,7 @@
 
                                 <?php
 
-                                $sql_tags_select = mysqli_query($mysqli,"SELECT * FROM tags WHERE tag_type = 1 AND company_id = $session_company_id ORDER BY tag_name ASC");
+                                $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 1 AND company_id = $session_company_id ORDER BY tag_name ASC");
 
                                 while ($row = mysqli_fetch_array($sql_tags_select)) {
                                     $tag_id_select = $row['tag_id'];
diff --git a/client_events.php b/client_events.php
index 45dc60c1..6cdae7f9 100644
--- a/client_events.php
+++ b/client_events.php
@@ -22,7 +22,7 @@ if (isset($_GET['calendar_id'])) {
 
 <?php
 //loop through IDs and create a modal for each
-$sql = mysqli_query($mysqli,"SELECT * FROM calendars LEFT JOIN events ON calendar_id = event_calendar_id WHERE event_client_id = $client_id AND calendars.company_id = $session_company_id");
+$sql = mysqli_query($mysqli, "SELECT * FROM calendars LEFT JOIN events ON calendar_id = event_calendar_id WHERE event_client_id = $client_id AND calendars.company_id = $session_company_id");
 while ($row = mysqli_fetch_array($sql)) {
   $event_id = $row['event_id'];
   $event_title = htmlentities($row['event_title']);
@@ -71,7 +71,7 @@ while ($row = mysqli_fetch_array($sql)) {
         },
         events: [
           <?php
-          $sql = mysqli_query($mysqli,"SELECT * FROM calendars LEFT JOIN events ON calendar_id = event_calendar_id WHERE event_client_id = $client_id AND calendars.company_id = $session_company_id");
+          $sql = mysqli_query($mysqli, "SELECT * FROM calendars LEFT JOIN events ON calendar_id = event_calendar_id WHERE event_client_id = $client_id AND calendars.company_id = $session_company_id");
           while ($row = mysqli_fetch_array($sql)) {
             $event_id = json_encode($row['event_id']);
             $event_title = json_encode($row['event_title']);
diff --git a/client_invoices.php b/client_invoices.php
index 11a31590..ecb08e4e 100644
--- a/client_invoices.php
+++ b/client_invoices.php
@@ -2,7 +2,7 @@
 require_once("inc_all_client.php");
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "invoice_number";
 }
@@ -14,7 +14,7 @@ if (!isset($_GET['o'])) {
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
 $sql = mysqli_query(
     $mysqli,
@@ -22,9 +22,10 @@ $sql = mysqli_query(
     LEFT JOIN categories ON invoice_category_id = category_id
     WHERE invoice_client_id = $client_id 
     AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR invoice_status LIKE '%$q%' OR invoice_amount LIKE '%$q%') 
-    ORDER BY $sb $o LIMIT $record_from, $record_to");
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
+);
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
diff --git a/client_location_add_modal.php b/client_location_add_modal.php
index 9db12960..19a151c6 100644
--- a/client_location_add_modal.php
+++ b/client_location_add_modal.php
@@ -113,7 +113,7 @@
                                         <option value="">- Contact -</option>
                                         <?php
 
-                                        $sql_contacts = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
+                                        $sql_contacts = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
                                         while ($row = mysqli_fetch_array($sql_contacts)) {
                                             $contact_id = $row['contact_id'];
                                             $contact_name = htmlentities($row['contact_name']);
diff --git a/client_location_edit_modal.php b/client_location_edit_modal.php
index 41856e3a..ac24da7b 100644
--- a/client_location_edit_modal.php
+++ b/client_location_edit_modal.php
@@ -115,7 +115,7 @@
                                         <option value="">- Contact -</option>
                                         <?php
 
-                                        $sql_contacts = mysqli_query($mysqli,"SELECT * FROM contacts WHERE (contact_archived_at > '$location_created_at' OR contact_archived_at IS NULL) AND contact_client_id = $client_id ORDER BY contact_name ASC");
+                                        $sql_contacts = mysqli_query($mysqli, "SELECT * FROM contacts WHERE (contact_archived_at > '$location_created_at' OR contact_archived_at IS NULL) AND contact_client_id = $client_id ORDER BY contact_name ASC");
                                         while ($row = mysqli_fetch_array($sql_contacts)) {
                                             $contact_id_select = $row['contact_id'];
                                             $contact_name_select = htmlentities($row['contact_name']);
diff --git a/client_locations.php b/client_locations.php
index 22255184..ba0a6d94 100644
--- a/client_locations.php
+++ b/client_locations.php
@@ -3,9 +3,9 @@
 <?php 
  
 if (isset($_GET['q'])) {
-  $q = strip_tags(mysqli_real_escape_string($mysqli,$_GET['q']));
+  $q = strip_tags(mysqli_real_escape_string($mysqli, $_GET['q']));
   //Phone Numbers
-  $phone_query = preg_replace("/[^0-9]/", '',$q);
+  $phone_query = preg_replace("/[^0-9]/", '', $q);
   if (empty($phone_query)) {
     $phone_query = $q;
   }
@@ -15,21 +15,21 @@ if (isset($_GET['q'])) {
 }
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+  $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 }else{
   $sb = "location_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM locations 
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM locations 
   WHERE location_client_id = $client_id
   AND location_archived_at IS NULL
   AND (location_name LIKE '%$q%' OR location_address LIKE '%$q%' OR location_phone LIKE '%$phone_query%') 
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
diff --git a/client_login_add_modal.php b/client_login_add_modal.php
index 57f83bb4..f9cb1e88 100644
--- a/client_login_add_modal.php
+++ b/client_login_add_modal.php
@@ -107,7 +107,7 @@
                                         <option value="">- Contact -</option>
                                         <?php
 
-                                        $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
+                                        $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $contact_id = $row['contact_id'];
                                             $contact_name = htmlentities($row['contact_name']);
@@ -131,7 +131,7 @@
                                         <option value="">- Vendor -</option>
                                         <?php
 
-                                        $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = $client_id ORDER BY vendor_name ASC");
+                                        $sql_vendors = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = $client_id ORDER BY vendor_name ASC");
                                         while ($row = mysqli_fetch_array($sql_vendors)) {
                                             $vendor_id = $row['vendor_id'];
                                             $vendor_name = htmlentities($row['vendor_name']);
@@ -155,7 +155,7 @@
                                         <option value="">- Asset -</option>
                                         <?php
 
-                                        $sql = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
+                                        $sql = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $asset_id = $row['asset_id'];
                                             $asset_name = htmlentities($row['asset_name']);
@@ -179,7 +179,7 @@
                                         <option value="">- software -</option>
                                         <?php
 
-                                        $sql = mysqli_query($mysqli,"SELECT * FROM software WHERE software_client_id = $client_id ORDER BY software_name ASC");
+                                        $sql = mysqli_query($mysqli, "SELECT * FROM software WHERE software_client_id = $client_id ORDER BY software_name ASC");
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $software_id = $row['software_id'];
                                             $software_name = htmlentities($row['software_name']);
diff --git a/client_login_edit_modal.php b/client_login_edit_modal.php
index fdc34ef5..c11623c0 100644
--- a/client_login_edit_modal.php
+++ b/client_login_edit_modal.php
@@ -115,7 +115,7 @@
                                         <option value="">- Contact -</option>
                                         <?php
 
-                                        $sql_contacts = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
+                                        $sql_contacts = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
                                         while ($row = mysqli_fetch_array($sql_contacts)) {
                                             $contact_id_select = $row['contact_id'];
                                             $contact_name_select = htmlentities($row['contact_name']);
@@ -136,7 +136,7 @@
                                         <option value="0">- None -</option>
                                         <?php
 
-                                        $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = $client_id ORDER BY vendor_name ASC");
+                                        $sql_vendors = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = $client_id ORDER BY vendor_name ASC");
                                         while ($row = mysqli_fetch_array($sql_vendors)) {
                                             $vendor_id_select = $row['vendor_id'];
                                             $vendor_name_select = htmlentities($row['vendor_name']);
@@ -158,7 +158,7 @@
                                         <option value="0">- None -</option>
                                         <?php
 
-                                        $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
+                                        $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
                                         while ($row = mysqli_fetch_array($sql_assets)) {
                                             $asset_id_select = $row['asset_id'];
                                             $asset_name_select = htmlentities($row['asset_name']);
@@ -180,7 +180,7 @@
                                         <option value="0">- None -</option>
                                         <?php
 
-                                        $sql_software = mysqli_query($mysqli,"SELECT * FROM software WHERE software_client_id = $client_id ORDER BY software_name ASC");
+                                        $sql_software = mysqli_query($mysqli, "SELECT * FROM software WHERE software_client_id = $client_id ORDER BY software_name ASC");
                                         while ($row = mysqli_fetch_array($sql_software)) {
                                             $software_id_select = $row['software_id'];
                                             $software_name_select = htmlentities($row['software_name']);
diff --git a/client_logins.php b/client_logins.php
index 07d2fef7..be55ac01 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -3,20 +3,23 @@
 <?php
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+  $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 }else{
   $sb = "login_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM logins 
-  WHERE login_client_id = $client_id
-  AND (login_name LIKE '%$q%' OR login_uri LIKE '%$q%')
-  ORDER BY $sb $o LIMIT $record_from, $record_to");
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM logins 
+    WHERE login_client_id = $client_id
+    AND (login_name LIKE '%$q%' OR login_uri LIKE '%$q%')
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
+);
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
diff --git a/client_logs.php b/client_logs.php
index f9b7585f..35ce7b6f 100644
--- a/client_logs.php
+++ b/client_logs.php
@@ -1,10 +1,9 @@
-<?php require_once("inc_all_client.php"); ?>
-
-<?php 
+<?php
+require_once("inc_all_client.php");
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
+  $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
   $sb = "log_id";
 }
 
@@ -15,16 +14,18 @@ if (!isset($_GET['o'])) {
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM logs
-  LEFT JOIN users ON log_user_id = user_id
-  WHERE (log_type LIKE '%$q%' OR log_action LIKE '%$q%' OR log_description LIKE '%$q%' OR log_ip LIKE '%$q%' OR log_user_agent LIKE '%$q%' OR user_name LIKE '%$q%')
-  AND log_client_id = $client_id
-  ORDER BY $sb $o LIMIT $record_from, $record_to"
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM logs
+    LEFT JOIN users ON log_user_id = user_id
+    WHERE (log_type LIKE '%$q%' OR log_action LIKE '%$q%' OR log_description LIKE '%$q%' OR log_ip LIKE '%$q%' OR log_user_agent LIKE '%$q%' OR user_name LIKE '%$q%')
+    AND log_client_id = $client_id
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
 );
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
@@ -37,7 +38,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
     <form autocomplete="off">
       <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
       <div class="row">
-        
+
         <div class="col-md-4">
           <div class="input-group mb-3 mb-md-0">
             <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Logs">
@@ -69,7 +70,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
         </thead>
         <tbody>
           <?php
-      
+
           while ($row = mysqli_fetch_array($sql)) {
             $log_id = $row['log_id'];
             $log_type = htmlentities($row['log_type']);
@@ -84,13 +85,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $user_name = htmlentities($row['user_name']);
             if (empty($user_name)) {
               $user_name_display = "-";
-            }else{
+            } else {
               $user_name_display = $user_name;
             }
             $log_entity_id = $row['log_entity_id'];
-          
+
           ?>
-          
+
           <tr>
             <td><?php echo $log_created_at; ?></td>
             <td><?php echo $user_name_display; ?></td>
@@ -109,8 +110,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
         </tbody>
       </table>
     </div>
-    <?php include("pagination.php"); ?>
+    <?php require_once("pagination.php"); ?>
   </div>
 </div>
 
-<?php include("footer.php"); ?>
+<?php require_once("footer.php"); ?>
diff --git a/client_network_add_modal.php b/client_network_add_modal.php
index 396e5ca6..a2bba179 100644
--- a/client_network_add_modal.php
+++ b/client_network_add_modal.php
@@ -71,7 +71,7 @@
                 <option value="">- Location -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC"); 
+                $sql = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC"); 
                 while ($row = mysqli_fetch_array($sql)) {
                   $location_id = $row['location_id'];
                   $location_name = htmlentities($row['location_name']);
diff --git a/client_networks.php b/client_networks.php
index 3907cf8b..638c08b2 100644
--- a/client_networks.php
+++ b/client_networks.php
@@ -1,23 +1,22 @@
-<?php require_once("inc_all_client.php"); ?>
-
 <?php
+require_once("inc_all_client.php");
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
+  $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
   $sb = "network_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM networks
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM networks
   LEFT JOIN locations ON location_id = network_location_id
   WHERE network_client_id = $client_id 
   AND (network_name LIKE '%$q%' OR network_vlan LIKE '%$q%' OR network LIKE '%$q%' OR network_gateway LIKE '%$q%' OR network_dhcp_range LIKE '%$q%' OR location_name LIKE '%$q%') 
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
@@ -32,7 +31,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
     <form autocomplete="off">
       <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
       <div class="row">
-        
+
         <div class="col-md-4">
           <div class="input-group mb-3 mb-md-0">
             <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Networks">
@@ -66,7 +65,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
         </thead>
         <tbody>
           <?php
-      
+
           while ($row = mysqli_fetch_array($sql)) {
             $network_id = $row['network_id'];
             $network_name = htmlentities($row['network_name']);
@@ -88,14 +87,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $location_name = htmlentities($row['location_name']);
             if (empty($location_name)) {
               $location_name_display = "-";
-            }else{
+            } else {
               $location_name_display = $location_name;
             }
-      
+
           ?>
           <tr>
             <th>
-              <i class="fa fa-fw fa-network-wired text-secondary"></i> 
+              <i class="fa fa-fw fa-network-wired text-secondary"></i>
               <a class="text-dark" href="#" data-toggle="modal" onclick="populateNetworkEditModal(<?php echo $client_id, ",", $network_id ?>)" data-target="#editNetworkModal"><?php echo $network_name; ?></a></th>
             <td><?php echo $network_vlan_display; ?></td>
             <td><?php echo $network; ?></td>
@@ -121,7 +120,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
           <?php
 
           }
-          
+
           ?>
 
         </tbody>
@@ -140,7 +139,7 @@ include("client_network_add_modal.php");
 
 <script>
 function populateNetworkEditModal(client_id, network_id) {
-  
+
   // Send a GET request to post.php as post.php?network_get_json_details=true&client_id=NUM&network_id=NUM
   jQuery.get(
     "ajax.php",
diff --git a/client_overview.php b/client_overview.php
index 2a33df92..2b931ed5 100644
--- a/client_overview.php
+++ b/client_overview.php
@@ -15,7 +15,9 @@ $sql_logins = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_client_id
 // Expiring Items
 
 // Get Domains Expiring
-$sql_domains_expiring = mysqli_query($mysqli, "SELECT * FROM domains
+$sql_domains_expiring = mysqli_query(
+    $mysqli,
+    "SELECT * FROM domains
     WHERE domain_client_id = $client_id
     AND domain_expire != '0000-00-00'
     AND domain_archived_at IS NULL
diff --git a/client_payments.php b/client_payments.php
index faad8d45..d51bfd13 100644
--- a/client_payments.php
+++ b/client_payments.php
@@ -3,8 +3,8 @@
 <?php
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
+  $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
   $sb = "payment_date";
 }
 
@@ -15,16 +15,16 @@ if (!isset($_GET['o'])) {
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM payments
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM payments
   LEFT JOIN invoices ON payment_invoice_id = invoice_id
   LEFT JOIN accounts ON payment_account_id = account_id
   WHERE invoice_client_id = $client_id
   AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR account_name LIKE '%$q%' OR payment_method LIKE '%$q%') 
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
@@ -36,7 +36,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
     <form autocomplete="off">
       <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
       <div class="row">
-        
+
         <div class="col-md-4">
           <div class="input-group mb-3 mb-md-0">
             <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Payments">
@@ -71,7 +71,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
         </thead>
         <tbody>
           <?php
-      
+
           while ($row = mysqli_fetch_array($sql)) {
             $invoice_id = $row['invoice_id'];
             $invoice_prefix = htmlentities($row['invoice_prefix']);
@@ -92,7 +92,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $payment_currency_code = htmlentities($row['payment_currency_code']);
             $account_name = htmlentities($row['account_name']);
 
-      
+
           ?>
           <tr>
             <td><?php echo $payment_date; ?></td>
@@ -106,9 +106,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
           </tr>
 
           <?php
-        
+
           }
-          
+
           ?>
 
         </tbody>
diff --git a/client_quotes.php b/client_quotes.php
index afbb21ee..405a00c7 100644
--- a/client_quotes.php
+++ b/client_quotes.php
@@ -3,7 +3,7 @@
 require_once("inc_all_client.php");
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "quote_number";
 }
@@ -15,15 +15,15 @@ if (!isset($_GET['o'])) {
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM quotes 
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM quotes 
   LEFT JOIN categories ON category_id = quote_category_id
   WHERE quote_client_id = $client_id 
   AND (CONCAT(quote_prefix,quote_number) LIKE '%$q%' OR quote_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR quote_status LIKE '%$q%') 
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php
index 3def656e..3c978527 100644
--- a/client_recurring_invoices.php
+++ b/client_recurring_invoices.php
@@ -3,21 +3,21 @@
 <?php
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
+  $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
   $sb = "recurring_id";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
- 
-$sql = mysqli_query($mysqli,"SELECT * FROM recurring
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
+
+$sql = mysqli_query($mysqli, "SELECT * FROM recurring
   LEFT JOIN categories ON recurring_category_id = category_id
   WHERE recurring_client_id = $client_id
   AND (CONCAT(recurring_prefix,recurring_number) LIKE '%$q%' OR recurring_frequency LIKE '%$q%' OR recurring_scope LIKE '%$q%' OR category_name LIKE '%$q%') 
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
@@ -32,7 +32,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
     <form autocomplete="off">
       <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
       <div class="row">
-        
+
         <div class="col-md-4">
           <div class="input-group mb-3 mb-md-0">
             <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Recurring Invoices">
@@ -68,7 +68,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
         </thead>
         <tbody>
           <?php
-      
+
            while ($row = mysqli_fetch_array($sql)) {
                 $recurring_id = $row['recurring_id'];
                 $recurring_prefix = htmlentities($row['recurring_prefix']);
@@ -119,7 +119,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                       <div class="dropdown-divider"></div>
                       <a class="dropdown-item text-danger" href="post.php?delete_recurring=<?php echo $recurring_id; ?>">Delete</a>
                     </div>
-                  </div>      
+                  </div>
                 </td>
               </tr>
 
diff --git a/client_scheduled_tickets.php b/client_scheduled_tickets.php
index 9052f86b..99b01f8a 100644
--- a/client_scheduled_tickets.php
+++ b/client_scheduled_tickets.php
@@ -3,23 +3,25 @@
 require_once("inc_all_client.php");
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "scheduled_ticket_subject";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
 // SQL
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM scheduled_tickets
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM scheduled_tickets
   LEFT JOIN clients on scheduled_ticket_client_id = client_id
   WHERE scheduled_ticket_client_id = $client_id 
   AND scheduled_tickets.scheduled_ticket_subject LIKE '%$q%'
   ORDER BY $sb $o LIMIT $record_from, $record_to"
 );
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 
 ?>
diff --git a/client_service_edit_modal.php b/client_service_edit_modal.php
index fc7188fc..97158655 100644
--- a/client_service_edit_modal.php
+++ b/client_service_edit_modal.php
@@ -101,7 +101,7 @@
                 <select multiple class="form-control" id="contacts" name="contacts[]">
                   <?php
                   // Get just the currently selected contact IDs
-                  $selected_ids = array_column(mysqli_fetch_all($sql_contacts,MYSQLI_ASSOC), "contact_id");
+                  $selected_ids = array_column(mysqli_fetch_all($sql_contacts, MYSQLI_ASSOC), "contact_id");
 
                   // Get all contacts
                   // NOTE: These are called $sql_all and $row_all for a reason - anything overwriting $sql or $row will break the current while loop we are in from client_services.php
@@ -126,7 +126,7 @@
                 <label for="vendors">Vendors</label>
                 <select multiple class="form-control" id="vendors" name="vendors[]">
                   <?php
-                  $selected_ids = array_column(mysqli_fetch_all($sql_vendors,MYSQLI_ASSOC), "vendor_id");
+                  $selected_ids = array_column(mysqli_fetch_all($sql_vendors, MYSQLI_ASSOC), "vendor_id");
 
                   $sql_all = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_template = 0 AND vendor_client_id = '$client_id'");
                   while ($row_all = mysqli_fetch_array($sql_all)) {
@@ -148,7 +148,7 @@
                 <label for="documents">Documents</label>
                 <select multiple class="form-control" id="documents" name="documents[]">
                   <?php
-                  $selected_ids = array_column(mysqli_fetch_all($sql_docs,MYSQLI_ASSOC), "document_id");
+                  $selected_ids = array_column(mysqli_fetch_all($sql_docs, MYSQLI_ASSOC), "document_id");
 
                   $sql_all = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_client_id = '$client_id'");
                   while ($row_all = mysqli_fetch_array($sql_all)) {
@@ -181,7 +181,7 @@
                     <label for="assets">Assets</label>
                     <select multiple class="form-control" id="assets" name="assets[]">
                       <?php
-                      $selected_ids = array_column(mysqli_fetch_all($sql_assets,MYSQLI_ASSOC), "asset_id");
+                      $selected_ids = array_column(mysqli_fetch_all($sql_assets, MYSQLI_ASSOC), "asset_id");
 
                       $sql_all = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = '$client_id'");
                       while ($row_all = mysqli_fetch_array($sql_all)) {
@@ -205,7 +205,7 @@
                     <label for="logins">Logins</label>
                     <select multiple class="form-control" id="logins" name="logins[]">
                       <?php
-                      $selected_ids = array_column(mysqli_fetch_all($sql_logins,MYSQLI_ASSOC), "login_id");
+                      $selected_ids = array_column(mysqli_fetch_all($sql_logins, MYSQLI_ASSOC), "login_id");
 
                       $sql_all = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_client_id = '$client_id'");
                       while ($row_all = mysqli_fetch_array($sql_all)) {
@@ -234,7 +234,7 @@
                     <label for="domains">Domains</label>
                     <select multiple class="form-control" id="domains" name="domains[]">
                       <?php
-                      $selected_ids = array_column(mysqli_fetch_all($sql_domains,MYSQLI_ASSOC), "domain_id");
+                      $selected_ids = array_column(mysqli_fetch_all($sql_domains, MYSQLI_ASSOC), "domain_id");
 
                       $sql_all = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_client_id = '$client_id'");
                       while ($row_all = mysqli_fetch_array($sql_all)) {
@@ -258,7 +258,7 @@
                     <label for="certificates">Certificates</label>
                     <select multiple class="form-control" id="certificates" name="certificates[]">
                       <?php
-                      $selected_ids = array_column(mysqli_fetch_all($sql_certificates,MYSQLI_ASSOC), "certificate_id");
+                      $selected_ids = array_column(mysqli_fetch_all($sql_certificates, MYSQLI_ASSOC), "certificate_id");
 
                       $sql_all = mysqli_query($mysqli, "SELECT * FROM certificates WHERE certificate_client_id = '$client_id'");
                       while ($row_all = mysqli_fetch_array($sql_all)) {
diff --git a/client_services.php b/client_services.php
index 6694af4d..943eb574 100644
--- a/client_services.php
+++ b/client_services.php
@@ -12,13 +12,15 @@ if (!empty($_GET['sb'])) {
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
 // Overview SQL query
-$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM services 
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM services 
     WHERE service_client_id = '$client_id' 
     AND (service_name LIKE '%$q%' OR service_description LIKE '%$q%' OR service_category LIKE '%$q%')
-  ORDER BY $sb $o LIMIT $record_from, $record_to"
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
 );
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
     <div class="card card-dark">
@@ -108,36 +110,37 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                         <?php
 
                         // Associated Assets (and their logins/networks/locations)
-                        $sql_assets = mysqli_query($mysqli, "SELECT * FROM service_assets 
-                          LEFT JOIN assets 
-                            ON service_assets.asset_id = assets.asset_id
-                          LEFT JOIN logins
-                            ON service_assets.asset_id = logins.login_asset_id
-                          LEFT JOIN networks
-                            ON assets.asset_network_id = networks.network_id
-                          LEFT JOIN locations
-                            ON assets.asset_location_id = locations.location_id
-                          WHERE service_id = '$service_id'"
+                        $sql_assets = mysqli_query(
+                            $mysqli,
+                            "SELECT * FROM service_assets 
+                        LEFT JOIN assets ON service_assets.asset_id = assets.asset_id
+                        LEFT JOIN logins ON service_assets.asset_id = logins.login_asset_id
+                        LEFT JOIN networks ON assets.asset_network_id = networks.network_id
+                        LEFT JOIN locations ON assets.asset_location_id = locations.location_id
+                        WHERE service_id = '$service_id'"
                         );
 
                         // Associated logins
-                        $sql_logins = mysqli_query($mysqli, "SELECT * FROM service_logins
-                          LEFT JOIN logins
-                            ON service_logins.login_id = logins.login_id
-                          WHERE service_id = '$service_id'"
+                        $sql_logins = mysqli_query(
+                            $mysqli,
+                            "SELECT * FROM service_logins
+                            LEFT JOIN logins ON service_logins.login_id = logins.login_id
+                            WHERE service_id = '$service_id'"
                         );
 
                         // Associated Domains
-                        $sql_domains = mysqli_query($mysqli, "SELECT * FROM service_domains
-                          LEFT JOIN domains
-                            ON service_domains.domain_id = domains.domain_id
-                          WHERE service_id = '$service_id'"
+                        $sql_domains = mysqli_query(
+                            $mysqli,
+                            "SELECT * FROM service_domains
+                            LEFT JOIN domains ON service_domains.domain_id = domains.domain_id
+                            WHERE service_id = '$service_id'"
                         );
                         // Associated Certificates
-                        $sql_certificates = mysqli_query($mysqli, "SELECT * FROM service_certificates
-                          LEFT JOIN certificates
-                            ON service_certificates.certificate_id = certificates.certificate_id
-                          WHERE service_id = '$service_id'"
+                        $sql_certificates = mysqli_query(
+                            $mysqli,
+                            "SELECT * FROM service_certificates
+                            LEFT JOIN certificates ON service_certificates.certificate_id = certificates.certificate_id
+                            WHERE service_id = '$service_id'"
                         );
 
                         // Associated URLs ---- REMOVED for now
@@ -145,24 +148,27 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                         //WHERE service_id = '$service_id'");
 
                         // Associated Vendors
-                        $sql_vendors = mysqli_query($mysqli, "SELECT * FROM service_vendors
-                          LEFT JOIN vendors
-                            ON service_vendors.vendor_id = vendors.vendor_id
-                          WHERE service_id = '$service_id'"
+                        $sql_vendors = mysqli_query(
+                            $mysqli,
+                            "SELECT * FROM service_vendors
+                            LEFT JOIN vendors ON service_vendors.vendor_id = vendors.vendor_id
+                            WHERE service_id = '$service_id'"
                         );
 
                         // Associated Contacts
-                        $sql_contacts = mysqli_query($mysqli, "SELECT * FROM service_contacts
-                          LEFT JOIN contacts
-                            ON service_contacts.contact_id = contacts.contact_id
-                          WHERE service_id = '$service_id'"
+                        $sql_contacts = mysqli_query(
+                            $mysqli,
+                            "SELECT * FROM service_contacts
+                            LEFT JOIN contacts ON service_contacts.contact_id = contacts.contact_id
+                            WHERE service_id = '$service_id'"
                         );
 
                         // Associated Documents
-                        $sql_docs = mysqli_query($mysqli, "SELECT * FROM service_documents
-                          LEFT JOIN documents
-                            ON service_documents.document_id = documents.document_id
-                          WHERE service_id = '$service_id'"
+                        $sql_docs = mysqli_query(
+                            $mysqli,
+                            "SELECT * FROM service_documents
+                            LEFT JOIN documents ON service_documents.document_id = documents.document_id
+                            WHERE service_id = '$service_id'"
                         );
 
                         require("client_service_edit_modal.php");
diff --git a/client_shared_items.php b/client_shared_items.php
index 0e38436e..22da8f11 100644
--- a/client_shared_items.php
+++ b/client_shared_items.php
@@ -1,131 +1,132 @@
-<?php require_once("inc_all_client.php"); ?>
-
 <?php
+require_once("inc_all_client.php");
 
 if (isset($_GET['q'])) {
-  $q = strip_tags(mysqli_real_escape_string($mysqli,$_GET['q']));
-  //Phone Numbers
-  $phone_query = preg_replace("/[^0-9]/", '',$q);
-  if (empty($phone_query)) {
-    $phone_query = $q;
-  }
-}else{
-  $q = "";
-  $phone_query = "";
+    $q = strip_tags(mysqli_real_escape_string($mysqli, $_GET['q']));
+    //Phone Numbers
+    $phone_query = preg_replace("/[^0-9]/", '', $q);
+    if (empty($phone_query)) {
+        $phone_query = $q;
+    }
+} else {
+    $q = "";
+    $phone_query = "";
 }
 
 // Sort
 $sb = "item_created_at";
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM shared_items 
-  WHERE item_client_id = $client_id  
-  AND item_active = '1'
-  AND item_views != item_view_limit
-  AND item_expire_at > NOW()  
-  AND (item_note LIKE '%$q%') ORDER BY $sb $o LIMIT $record_from, $record_to");
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM shared_items 
+    WHERE item_client_id = $client_id  
+    AND item_active = '1'
+    AND item_views != item_view_limit
+    AND item_expire_at > NOW()  
+    AND (item_note LIKE '%$q%') ORDER BY $sb $o LIMIT $record_from, $record_to"
+);
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
-  <div class="card card-dark">
+<div class="card card-dark">
     <div class="card-header py-3">
-      <h3 class="card-title"><i class="fa fa-fw fa-share"></i> Shared Items (Links)</h3>
+        <h3 class="card-title"><i class="fa fa-fw fa-share"></i> Shared Items (Links)</h3>
     </div>
     <div class="card-body">
-      <form autocomplete="off">
-        <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <div class="row">
+        <form autocomplete="off">
+            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+            <div class="row">
 
-          <div class="col-md-4">
-            <div class="input-group mb-3 mb-md-0">
-              <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Shared Items">
-              <div class="input-group-append">
-                <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-              </div>
-            </div>
-          </div>
-
-        </div>
-      </form>
-      <hr>
-      <div class="table-responsive">
-        <table class="table table-striped table-borderless table-hover">
-          <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-          <tr>
-            <th>Item Name</th>
-            <th>Item Type</th>
-            <th>Share Note</th>
-            <th>Views</th>
-            <th>Expires</th>
-            <th class="text-center">Action</th>
-          </tr>
-          </thead>
-          <tbody>
-          <?php
-
-          while ($row = mysqli_fetch_array($sql)) {
-            $item_id = $row['item_id'];
-            $item_active = htmlentities($row['item_active']);
-            $item_key = htmlentities($row['item_key']);
-            $item_type = htmlentities($row['item_type']);
-            $item_related_id = $row['item_related_id'];
-            $item_note = htmlentities($row['item_note']);
-            $item_views = htmlentities($row['item_views']);
-            $item_view_limit = htmlentities($row['item_view_limit']);
-            $item_created_at = $row['item_created_at'];
-            $item_expire_at = $row['item_expire_at'];
-
-            if ($item_type == 'Login') {
-              $share_item_sql = mysqli_query($mysqli, "SELECT login_name FROM logins WHERE login_id = '$item_related_id' AND login_client_id = '$client_id'");
-              $share_item = mysqli_fetch_array($share_item_sql);
-              $item_name = htmlentities($share_item['login_name']);
-            }
-            elseif ($item_type == 'Document') {
-              $share_item_sql = mysqli_query($mysqli, "SELECT document_name FROM documents WHERE document_id = '$item_related_id' AND document_client_id = '$client_id'");
-              $share_item = mysqli_fetch_array($share_item_sql);
-              $item_name = htmlentities($share_item['document_name']);
-            }
-            elseif ($item_type == 'File') {
-              $share_item_sql = mysqli_query($mysqli, "SELECT file_name FROM files WHERE file_id = '$item_related_id' AND file_client_id = '$client_id'");
-              $share_item = mysqli_fetch_array($share_item_sql);
-              $item_name = htmlentities($share_item['file_name']);
-            }
-
-
-            ?>
-            <tr>
-              <td><?php echo $item_name; ?></td>
-              <td><?php echo $item_type ?></td>
-              <td><?php echo $item_note ?></td>
-              <td><?php echo "$item_views / $item_view_limit" ?></td>
-              <td><?php echo $item_expire_at ?></td>
-              <td>
-                <?php if ($session_user_role == 3) { ?>
-                  <div class="dropdown dropleft text-center">
-                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                      <i class="fas fa-ellipsis-h"></i>
-                    </button>
-                    <div class="dropdown-menu">
-                      <a class="dropdown-item text-danger" href="post.php?deactivate_shared_item=<?php echo $item_id; ?>">Deactivate</a>
+                <div class="col-md-4">
+                    <div class="input-group mb-3 mb-md-0">
+                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Shared Items">
+                        <div class="input-group-append">
+                            <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                        </div>
                     </div>
-                  </div>
-                <?php } ?>
-              </td>
-            </tr>
+                </div>
 
-            <?php
-          }
-          ?>
+            </div>
+        </form>
+        <hr>
+        <div class="table-responsive">
+            <table class="table table-striped table-borderless table-hover">
+                <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                <tr>
+                    <th>Item Name</th>
+                    <th>Item Type</th>
+                    <th>Share Note</th>
+                    <th>Views</th>
+                    <th>Expires</th>
+                    <th class="text-center">Action</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
 
-          </tbody>
-        </table>
-      </div>
-      <?php include("pagination.php"); ?>
+                while ($row = mysqli_fetch_array($sql)) {
+                    $item_id = $row['item_id'];
+                    $item_active = htmlentities($row['item_active']);
+                    $item_key = htmlentities($row['item_key']);
+                    $item_type = htmlentities($row['item_type']);
+                    $item_related_id = $row['item_related_id'];
+                    $item_note = htmlentities($row['item_note']);
+                    $item_views = htmlentities($row['item_views']);
+                    $item_view_limit = htmlentities($row['item_view_limit']);
+                    $item_created_at = $row['item_created_at'];
+                    $item_expire_at = $row['item_expire_at'];
+
+                    if ($item_type == 'Login') {
+                        $share_item_sql = mysqli_query($mysqli, "SELECT login_name FROM logins WHERE login_id = '$item_related_id' AND login_client_id = '$client_id'");
+                        $share_item = mysqli_fetch_array($share_item_sql);
+                        $item_name = htmlentities($share_item['login_name']);
+                    } elseif ($item_type == 'Document') {
+                        $share_item_sql = mysqli_query($mysqli, "SELECT document_name FROM documents WHERE document_id = '$item_related_id' AND document_client_id = '$client_id'");
+                        $share_item = mysqli_fetch_array($share_item_sql);
+                        $item_name = htmlentities($share_item['document_name']);
+                    } elseif ($item_type == 'File') {
+                        $share_item_sql = mysqli_query($mysqli, "SELECT file_name FROM files WHERE file_id = '$item_related_id' AND file_client_id = '$client_id'");
+                        $share_item = mysqli_fetch_array($share_item_sql);
+                        $item_name = htmlentities($share_item['file_name']);
+                    }
+
+
+                    ?>
+                    <tr>
+                        <td><?php echo $item_name; ?></td>
+                        <td><?php echo $item_type ?></td>
+                        <td><?php echo $item_note ?></td>
+                        <td><?php echo "$item_views / $item_view_limit" ?></td>
+                        <td><?php echo $item_expire_at ?></td>
+                        <td>
+                            <?php if ($session_user_role == 3) { ?>
+                                <div class="dropdown dropleft text-center">
+                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                        <i class="fas fa-ellipsis-h"></i>
+                                    </button>
+                                    <div class="dropdown-menu">
+                                        <a class="dropdown-item text-danger" href="post.php?deactivate_shared_item=<?php echo $item_id; ?>">Deactivate</a>
+                                    </div>
+                                </div>
+                            <?php } ?>
+                        </td>
+                    </tr>
+
+                    <?php
+                }
+                ?>
+
+                </tbody>
+            </table>
+        </div>
+        <?php require_once("pagination.php"); ?>
     </div>
-  </div>
+</div>
 
-  <?php include("footer.php"); ?>
+<?php
+require_once("footer.php");
diff --git a/client_software.php b/client_software.php
index 1dc03403..6e5b4f17 100644
--- a/client_software.php
+++ b/client_software.php
@@ -1,200 +1,198 @@
-<?php require_once("inc_all_client.php"); ?>
-
-<?php 
+<?php
+require_once("inc_all_client.php");
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
-  $sb = "software_name";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
+    $sb = "software_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM software 
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM software 
   LEFT JOIN logins ON login_software_id = software_id
   WHERE software_client_id = $client_id
   AND software_template = 0
   AND (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_key LIKE '%$q%') 
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
 <div class="card card-dark">
-  <div class="card-header py-2">
-    <h3 class="card-title mt-2"><i class="fa fa-fw fa-cube"></i> Licenses</h3>
-    <div class="card-tools">
-      <div class="btn-group">
-        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addSoftwareModal">
-          <i class="fas fa-fw fa-plus"></i> New License
-        </button>
-        <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
-        <div class="dropdown-menu">
-          <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addSoftwareFromTemplateModal">From Template</a>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="card-body">
-    <form autocomplete="off">
-      <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-      <div class="row">
-        
-        <div class="col-md-4">
-          <div class="input-group mb-3 mb-md-0">
-            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Licenses">
-            <div class="input-group-append">
-              <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-            </div>
-          </div>
-        </div>
-
-        <div class="col-md-8">
-          <div class="float-right">
-            <a href="post.php?export_client_software_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
-          </div>
-        </div>
-
-      </div>
-    </form>
-    <hr>
-    <div class="table-responsive">
-      <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-          <tr>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_name&o=<?php echo $disp; ?>">Software</a></th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_type&o=<?php echo $disp; ?>">Type</a></th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_license_type&o=<?php echo $disp; ?>">License Type</a></th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_seats&o=<?php echo $disp; ?>">Seats</a></th>
-            <th></th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-    
-          while ($row = mysqli_fetch_array($sql)) {
-            $software_id = $row['software_id'];
-            $software_name = htmlentities($row['software_name']);
-            $software_version = htmlentities($row['software_version']);
-            $software_type = htmlentities($row['software_type']);
-            $software_license_type = htmlentities($row['software_license_type']);
-            $software_key = htmlentities($row['software_key']);
-            $software_seats = htmlentities($row['software_seats']);
-            $software_purchase = $row['software_purchase'];
-            $software_expire = $row['software_expire'];
-            $software_notes = htmlentities($row['software_notes']);
-
-            // Get Login
-            $login_id = $row['login_id'];
-            $login_username = htmlentities(decryptLoginEntry($row['login_username']));
-            $login_password = htmlentities(decryptLoginEntry($row['login_password']));
-
-            $seat_count = 0;
-
-            // Asset Licenses
-            $asset_licenses_sql = mysqli_query($mysqli,"SELECT asset_id FROM software_assets WHERE software_id = $software_id");
-            $asset_licenses_array = array();
-            while ($row = mysqli_fetch_array($asset_licenses_sql)) {
-              $asset_licenses_array[] = $row['asset_id'];
-              $seat_count = $seat_count + 1;
-            }
-            $asset_licenses = implode(',',$asset_licenses_array);
-
-            // Contact Licenses
-            $contact_licenses_sql = mysqli_query($mysqli,"SELECT contact_id FROM software_contacts WHERE software_id = $software_id");
-            $contact_licenses_array = array();
-            while ($row = mysqli_fetch_array($contact_licenses_sql)) {
-              $contact_licenses_array[] = $row['contact_id'];
-              $seat_count = $seat_count + 1;
-            }
-            $contact_licenses = implode(',',$contact_licenses_array);
-
-            
-
-          ?>
-          <tr>
-            <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editSoftwareModal<?php echo $software_id; ?>"><?php echo "$software_name<br><span class='text-secondary'>$software_version</span>"; ?></a></td>
-            <td><?php echo $software_type; ?></td>
-            <td><?php echo $software_license_type; ?></td>
-            <td><?php echo "$seat_count / $software_seats"; ?></td>
-            <td>
-              <?php
-              if ($login_id > 0) {
-              ?>  
-              <button type="button" class="btn btn-dark btn-sm" data-toggle="modal" data-target="#viewPasswordModal<?php echo $login_id; ?>"><i class="fas fa-key"></i></button>
-
-              <div class="modal" id="viewPasswordModal<?php echo $login_id; ?>" tabindex="-1">
-                <div class="modal-dialog">
-                  <div class="modal-content bg-dark">
-                    <div class="modal-header">
-                      <h5 class="modal-title"><i class="fa fa-fw fa-key"></i> <?php echo $software_name; ?></h5>
-                      <button type="button" class="close text-white" data-dismiss="modal">
-                        <span>&times;</span>
-                      </button>
-                    </div>
-                    <div class="modal-body bg-white">
-                      <div class="form-group">
-                        <div class="input-group">
-                          <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-user"></i></span>
-                          </div>
-                          <input type="text" class="form-control" value="<?php echo $login_username; ?>" readonly>
-                        </div>
-                      </div>
-                      <div class="form-group">
-                        <div class="input-group">
-                          <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-lock"></i></span>
-                          </div>
-                          <input type="text" class="form-control" value="<?php echo $login_password; ?>" readonly>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-
-              <?php
-              }
-
-              ?>
-            </td>
-            <td>
-              <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" data-toggle="dropdown">
-                  <i class="fas fa-ellipsis-h"></i>
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-cube"></i> Licenses</h3>
+        <div class="card-tools">
+            <div class="btn-group">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addSoftwareModal">
+                    <i class="fas fa-fw fa-plus"></i> New License
                 </button>
+                <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editSoftwareModal<?php echo $software_id; ?>">Edit</a>
-                  <div class="dropdown-divider"></div>
-                  <a class="dropdown-item text-danger" href="post.php?archive_software=<?php echo $software_id; ?>">Archive and<br><small>Remove Licenses</small></a>
-                  <?php if ($session_user_role == 3) { ?>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item text-danger text-bold" href="post.php?delete_software=<?php echo $software_id; ?>">Delete and<br><small>Remove Licenses</small></a>
-                  <?php } ?>
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addSoftwareFromTemplateModal">From Template</a>
                 </div>
-              </div> 
-            </td>
-          </tr>
-
-          <?php
-
-          include("client_software_edit_modal.php");
-          }
-          
-          ?>
-
-        </tbody>
-      </table>      
+            </div>
+        </div>
+    </div>
+    <div class="card-body">
+        <form autocomplete="off">
+            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+            <div class="row">
+
+                <div class="col-md-4">
+                    <div class="input-group mb-3 mb-md-0">
+                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Licenses">
+                        <div class="input-group-append">
+                            <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col-md-8">
+                    <div class="float-right">
+                        <a href="post.php?export_client_software_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
+                    </div>
+                </div>
+
+            </div>
+        </form>
+        <hr>
+        <div class="table-responsive">
+            <table class="table table-striped table-borderless table-hover">
+                <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                <tr>
+                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_name&o=<?php echo $disp; ?>">Software</a></th>
+                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_type&o=<?php echo $disp; ?>">Type</a></th>
+                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_license_type&o=<?php echo $disp; ?>">License Type</a></th>
+                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_seats&o=<?php echo $disp; ?>">Seats</a></th>
+                    <th></th>
+                    <th class="text-center">Action</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
+
+                while ($row = mysqli_fetch_array($sql)) {
+                    $software_id = $row['software_id'];
+                    $software_name = htmlentities($row['software_name']);
+                    $software_version = htmlentities($row['software_version']);
+                    $software_type = htmlentities($row['software_type']);
+                    $software_license_type = htmlentities($row['software_license_type']);
+                    $software_key = htmlentities($row['software_key']);
+                    $software_seats = htmlentities($row['software_seats']);
+                    $software_purchase = $row['software_purchase'];
+                    $software_expire = $row['software_expire'];
+                    $software_notes = htmlentities($row['software_notes']);
+
+                    // Get Login
+                    $login_id = $row['login_id'];
+                    $login_username = htmlentities(decryptLoginEntry($row['login_username']));
+                    $login_password = htmlentities(decryptLoginEntry($row['login_password']));
+
+                    $seat_count = 0;
+
+                    // Asset Licenses
+                    $asset_licenses_sql = mysqli_query($mysqli, "SELECT asset_id FROM software_assets WHERE software_id = $software_id");
+                    $asset_licenses_array = array();
+                    while ($row = mysqli_fetch_array($asset_licenses_sql)) {
+                        $asset_licenses_array[] = $row['asset_id'];
+                        $seat_count = $seat_count + 1;
+                    }
+                    $asset_licenses = implode(',', $asset_licenses_array);
+
+                    // Contact Licenses
+                    $contact_licenses_sql = mysqli_query($mysqli, "SELECT contact_id FROM software_contacts WHERE software_id = $software_id");
+                    $contact_licenses_array = array();
+                    while ($row = mysqli_fetch_array($contact_licenses_sql)) {
+                        $contact_licenses_array[] = $row['contact_id'];
+                        $seat_count = $seat_count + 1;
+                    }
+                    $contact_licenses = implode(',', $contact_licenses_array);
+
+
+
+                    ?>
+                    <tr>
+                        <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editSoftwareModal<?php echo $software_id; ?>"><?php echo "$software_name<br><span class='text-secondary'>$software_version</span>"; ?></a></td>
+                        <td><?php echo $software_type; ?></td>
+                        <td><?php echo $software_license_type; ?></td>
+                        <td><?php echo "$seat_count / $software_seats"; ?></td>
+                        <td>
+                            <?php
+                            if ($login_id > 0) { ?>
+                                <button type="button" class="btn btn-dark btn-sm" data-toggle="modal" data-target="#viewPasswordModal<?php echo $login_id; ?>"><i class="fas fa-key"></i></button>
+
+                                <div class="modal" id="viewPasswordModal<?php echo $login_id; ?>" tabindex="-1">
+                                    <div class="modal-dialog">
+                                        <div class="modal-content bg-dark">
+                                            <div class="modal-header">
+                                                <h5 class="modal-title"><i class="fa fa-fw fa-key"></i> <?php echo $software_name; ?></h5>
+                                                <button type="button" class="close text-white" data-dismiss="modal">
+                                                    <span>&times;</span>
+                                                </button>
+                                            </div>
+                                            <div class="modal-body bg-white">
+                                                <div class="form-group">
+                                                    <div class="input-group">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text"><i class="fa fa-user"></i></span>
+                                                        </div>
+                                                        <input type="text" class="form-control" value="<?php echo $login_username; ?>" readonly>
+                                                    </div>
+                                                </div>
+                                                <div class="form-group">
+                                                    <div class="input-group">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text"><i class="fa fa-lock"></i></span>
+                                                        </div>
+                                                        <input type="text" class="form-control" value="<?php echo $login_password; ?>" readonly>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <?php
+                            }
+
+                            ?>
+                        </td>
+                        <td>
+                            <div class="dropdown dropleft text-center">
+                                <button class="btn btn-secondary btn-sm" data-toggle="dropdown">
+                                    <i class="fas fa-ellipsis-h"></i>
+                                </button>
+                                <div class="dropdown-menu">
+                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editSoftwareModal<?php echo $software_id; ?>">Edit</a>
+                                    <div class="dropdown-divider"></div>
+                                    <a class="dropdown-item text-danger" href="post.php?archive_software=<?php echo $software_id; ?>">Archive and<br><small>Remove Licenses</small></a>
+                                    <?php if ($session_user_role == 3) { ?>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger text-bold" href="post.php?delete_software=<?php echo $software_id; ?>">Delete and<br><small>Remove Licenses</small></a>
+                                    <?php } ?>
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
+
+                    <?php
+
+                    require("client_software_edit_modal.php");
+                }
+
+                ?>
+
+                </tbody>
+            </table>
+        </div>
+        <?php require_once("pagination.php"); ?>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
 </div>
 
-<?php include("client_software_add_modal.php"); ?>
-<?php include("client_software_add_from_template_modal.php"); ?>
-
-<?php include("footer.php"); ?>
+<?php
+require_once("client_software_add_modal.php");
+require_once("client_software_add_from_template_modal.php");
+require_once("footer.php");
diff --git a/client_software_add_from_template_modal.php b/client_software_add_from_template_modal.php
index d68c265d..931c6f4a 100644
--- a/client_software_add_from_template_modal.php
+++ b/client_software_add_from_template_modal.php
@@ -20,7 +20,7 @@
                             <select class="form-control" name="software_template_id" required>
                                 <option value="">- Select Template -</option>
                                 <?php
-                                $sql_software_templates = mysqli_query($mysqli,"SELECT * FROM software WHERE software_template = 1 AND company_id = $session_company_id AND software_archived_at IS NULL ORDER BY software_name ASC");
+                                $sql_software_templates = mysqli_query($mysqli, "SELECT * FROM software WHERE software_template = 1 AND company_id = $session_company_id AND software_archived_at IS NULL ORDER BY software_name ASC");
                                 while($row = mysqli_fetch_array($sql_software_templates)){
                                     $software_template_id = $row['software_id'];
                                     $software_template_name = htmlentities($row['software_name']);
diff --git a/client_software_add_modal.php b/client_software_add_modal.php
index 0d14d818..4bff65cd 100644
--- a/client_software_add_modal.php
+++ b/client_software_add_modal.php
@@ -136,7 +136,7 @@
                             <ul class="list-group">
 
                                 <?php
-                                $sql = mysqli_query($mysqli,"SELECT * FROM assets LEFT JOIN contacts ON asset_contact_id = contact_id WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
+                                $sql = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN contacts ON asset_contact_id = contact_id WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
 
                                 while ($row = mysqli_fetch_array($sql)) {
                                     $asset_id = $row['asset_id'];
@@ -167,7 +167,7 @@
                             <ul class="list-group">
 
                                 <?php
-                                $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
+                                $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
 
                                 while ($row = mysqli_fetch_array($sql)) {
                                     $contact_id = $row['contact_id'];
diff --git a/client_software_edit_modal.php b/client_software_edit_modal.php
index f0fd19d7..21465bab 100644
--- a/client_software_edit_modal.php
+++ b/client_software_edit_modal.php
@@ -136,7 +136,7 @@
                             <ul class="list-group">
 
                                 <?php
-                                $sql_assets_select = mysqli_query($mysqli,"SELECT * FROM assets LEFT JOIN contacts ON asset_contact_id = contact_id WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
+                                $sql_assets_select = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN contacts ON asset_contact_id = contact_id WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
 
                                 while ($row = mysqli_fetch_array($sql_assets_select)) {
                                     $asset_id_select = $row['asset_id'];
@@ -147,7 +147,7 @@
                                     ?>
                                     <li class="list-group-item">
                                         <div class="form-check">
-                                            <input type="checkbox" class="form-check-input" name="assets[]" value="<?php echo $asset_id_select; ?>" <?php if (in_array($asset_id_select,$asset_licenses_array)) { echo "checked"; } ?>>
+                                            <input type="checkbox" class="form-check-input" name="assets[]" value="<?php echo $asset_id_select; ?>" <?php if (in_array($asset_id_select, $asset_licenses_array)) { echo "checked"; } ?>>
                                             <label class="form-check-label ml-2"><?php echo "$asset_name_select - $contact_name_select"; ?></label>
                                         </div>
                                     </li>
@@ -167,7 +167,7 @@
                             <ul class="list-group">
 
                                 <?php
-                                $sql_contacts_select = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
+                                $sql_contacts_select = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
 
                                 while ($row = mysqli_fetch_array($sql_contacts_select)) {
                                     $contact_id_select = $row['contact_id'];
@@ -177,7 +177,7 @@
                                     ?>
                                     <li class="list-group-item">
                                         <div class="form-check">
-                                            <input type="checkbox" class="form-check-input" name="contacts[]" value="<?php echo $contact_id_select; ?>" <?php if (in_array("$contact_id_select",$contact_licenses_array)) { echo "checked"; } ?>>
+                                            <input type="checkbox" class="form-check-input" name="contacts[]" value="<?php echo $contact_id_select; ?>" <?php if (in_array("$contact_id_select", $contact_licenses_array)) { echo "checked"; } ?>>
                                             <label class="form-check-label ml-2"><?php echo "$contact_name_select - $contact_email_select"; ?></label>
                                         </div>
                                     </li>
diff --git a/client_software_templates.php b/client_software_templates.php
index 4e67c371..8e4ae421 100644
--- a/client_software_templates.php
+++ b/client_software_templates.php
@@ -1,23 +1,22 @@
-<?php require_once("inc_all_client.php"); ?>
-
-<?php 
+<?php
+require_once("inc_all_client.php");
 
 if(!empty($_GET['sb'])){
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
+  $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
   $sb = "software_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM software 
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM software 
   LEFT JOIN logins ON login_software_id = software_id
   WHERE software_template = 1 
   AND (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_key LIKE '%$q%') 
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
@@ -36,7 +35,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
     <form autocomplete="off">
       <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
       <div class="row">
-        
+
         <div class="col-md-4">
           <div class="input-group mb-3 mb-md-0">
             <input type="search" class="form-control" name="q" value="<?php if(isset($q)){ echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Licenses">
@@ -65,8 +64,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
         </thead>
         <tbody>
           <?php
-    
-          while($row = mysqli_fetch_array($sql)){    
+
+          while($row = mysqli_fetch_array($sql)){
             $software_id = $row['software_id'];
             $software_name = htmlentities($row['software_name']);
             $software_version = htmlentities($row['software_version']);
@@ -96,24 +95,24 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                     <a class="dropdown-item text-danger" href="post.php?delete_software=<?php echo $software_id; ?>">Delete</a>
                   <?php } ?>
                 </div>
-              </div> 
+              </div>
             </td>
           </tr>
 
           <?php
 
-          include("client_software_template_edit_modal.php");
+          require("client_software_template_edit_modal.php");
           }
-          
+
           ?>
 
         </tbody>
-      </table>      
+      </table>
     </div>
-    <?php include("pagination.php"); ?>
+    <?php require_once("pagination.php"); ?>
   </div>
 </div>
 
-<?php include("client_software_template_add_modal.php"); ?>
-
-<?php include("footer.php"); ?>
+<?php
+require_once("client_software_template_add_modal.php");
+require_once("footer.php");
diff --git a/client_tickets.php b/client_tickets.php
index 37ff82d2..68befbdf 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -1,203 +1,203 @@
-<?php require_once("inc_all_client.php"); ?>
-
 <?php
+require_once("inc_all_client.php");
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
-  $sb = "ticket_number";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
+    $sb = "ticket_number";
 }
 
 // Reverse default sort
 if (!isset($_GET['o'])) {
-  $o = "DESC";
-  $disp = "ASC";
+    $o = "DESC";
+    $disp = "ASC";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM tickets 
-  LEFT JOIN contacts ON ticket_contact_id = contact_id
-  LEFT JOIN users ON ticket_assigned_to = user_id
-  LEFT JOIN assets ON ticket_asset_id = asset_id
-  LEFT JOIN locations ON ticket_location_id = location_id
-  WHERE ticket_client_id = $client_id
-  AND (CONCAT(ticket_prefix,ticket_number) LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_status LIKE '%$q%' OR ticket_priority LIKE '%$q%' OR user_name LIKE '%$q%')
-  ORDER BY $sb $o LIMIT $record_from, $record_to");
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM tickets 
+    LEFT JOIN contacts ON ticket_contact_id = contact_id
+    LEFT JOIN users ON ticket_assigned_to = user_id
+    LEFT JOIN assets ON ticket_asset_id = asset_id
+    LEFT JOIN locations ON ticket_location_id = location_id
+    WHERE ticket_client_id = $client_id
+    AND (CONCAT(ticket_prefix,ticket_number) LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_status LIKE '%$q%' OR ticket_priority LIKE '%$q%' OR user_name LIKE '%$q%')
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
+);
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
 <div class="card card-dark">
-  <div class="card-header py-2">
-    <h3 class="card-title mt-2"><i class="fa fa-fw fa-life-ring"></i> Tickets</h3>
-    <button type="button" class="btn btn-dark dropdown-toggle ml-1" data-toggle="dropdown"></button>
-    <div class="dropdown-menu">
-      <a class="dropdown-item text-dark" href="client_scheduled_tickets.php?client_id=<?php echo $client_id; ?>">Scheduled Tickets</a>
-    </div>
-    <div class="card-tools">
-      <div class="btn-group">
-        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketModal"><i class="fas fa-fw fa-plus"></i> New Ticket</button>
-        <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-life-ring"></i> Tickets</h3>
+        <button type="button" class="btn btn-dark dropdown-toggle ml-1" data-toggle="dropdown"></button>
         <div class="dropdown-menu">
-          <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addScheduledTicketModal">Scheduled</a>
+            <a class="dropdown-item text-dark" href="client_scheduled_tickets.php?client_id=<?php echo $client_id; ?>">Scheduled Tickets</a>
         </div>
-      </div>
-    </div>
-  </div>
-  <div class="card-body">
-    <form autocomplete="off">
-      <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-      <div class="row">
-
-        <div class="col-md-4">
-          <div class="input-group mb-3 mb-md-0">
-            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Tickets">
-            <div class="input-group-append">
-              <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-            </div>
-          </div>
-        </div>
-
-        <div class="col-md-8">
-          <div class="float-right">
-            <a href="post.php?export_client_tickets_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
-          </div>
-        </div>
-
-      </div>
-    </form>
-    <hr>
-    <div class="table-responsive">
-      <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-          <tr>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_number&o=<?php echo $disp; ?>">Number</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_subject&o=<?php echo $disp; ?>">Subject</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_name&o=<?php echo $disp; ?>">Contact</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_priority&o=<?php echo $disp; ?>">Priority</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_status&o=<?php echo $disp; ?>">Status</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=user_name&o=<?php echo $disp; ?>">Assigned</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_updated_at&o=<?php echo $disp; ?>">Last Response</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_created_at&o=<?php echo $disp; ?>">Created</a></th>
-
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-
-          while ($row = mysqli_fetch_array($sql)) {
-            $ticket_id = $row['ticket_id'];
-            $ticket_prefix = htmlentities($row['ticket_prefix']);
-            $ticket_number = htmlentities($row['ticket_number']);
-            $ticket_subject = htmlentities($row['ticket_subject']);
-            $ticket_details = $row['ticket_details'];
-            $ticket_priority = htmlentities($row['ticket_priority']);
-            $ticket_status = htmlentities($row['ticket_status']);
-            $ticket_created_at = $row['ticket_created_at'];
-            $ticket_updated_at = $row['ticket_updated_at'];
-              if (empty($ticket_updated_at)) {
-                  if ($ticket_status == "Closed") {
-                      $ticket_updated_at_display = "<p>Never</p>";
-                  }
-                  else{
-                      $ticket_updated_at_display = "<p class='text-danger'>Never</p>";
-                  }
-              } else {
-                  $ticket_updated_at_display = $ticket_updated_at;
-              }
-            $ticket_closed_at = $row['ticket_closed_at'];
-
-            if ($ticket_status == "Open") {
-              $ticket_status_display = "<span class='p-2 badge badge-primary'>$ticket_status</span>";
-            }elseif ($ticket_status == "Working") {
-              $ticket_status_display = "<span class='p-2 badge badge-success'>$ticket_status</span>";
-            }else{
-              $ticket_status_display = "<span class='p-2 badge badge-secondary'>$ticket_status</span>";
-            }
-
-            if ($ticket_priority == "High") {
-              $ticket_priority_display = "<span class='p-2 badge badge-danger'>$ticket_priority</span>";
-            }elseif ($ticket_priority == "Medium") {
-              $ticket_priority_display = "<span class='p-2 badge badge-warning'>$ticket_priority</span>";
-            }elseif ($ticket_priority == "Low") {
-              $ticket_priority_display = "<span class='p-2 badge badge-info'>$ticket_priority</span>";
-            }else{
-              $ticket_priority_display = "-";
-            }
-              $ticket_assigned_to = $row['ticket_assigned_to'];
-              if (empty($ticket_assigned_to)) {
-                  if ($ticket_status == "Closed") {
-                      $ticket_assigned_to_display = "<p>Not Assigned</p>";
-                  }
-                  else{
-                      $ticket_assigned_to_display = "<p class='text-danger'>Not Assigned</p>";
-                  }
-              } else {
-                  $ticket_assigned_to_display = htmlentities($row['user_name']);
-              }
-            $contact_id = $row['contact_id'];
-            $contact_name = htmlentities($row['contact_name']);
-            if (empty($contact_name)) {
-              $contact_display = "-";
-            }else{
-              $contact_display = "$contact_name<br><small class='text-secondary'>$contact_email</small>";
-            }
-            $contact_title = htmlentities($row['contact_title']);
-            $contact_email = htmlentities($row['contact_email']);
-            $contact_phone = formatPhoneNumber($row['contact_phone']);
-            $contact_extension = htmlentities($row['contact_extension']);
-            $contact_mobile = formatPhoneNumber($row['contact_mobile']);
-
-          ?>
-
-          <tr>
-            <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span></a></td>
-            <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
-            <td><?php echo $contact_display; ?></td>
-            <td><?php echo $ticket_priority_display; ?></td>
-            <td><?php echo $ticket_status_display; ?></td>
-            <td><?php echo $ticket_assigned_to_display; ?></td>
-            <td><?php echo $ticket_updated_at_display; ?></td>
-            <td><?php echo $ticket_created_at; ?></td>
-            <td>
-              <?php if ($ticket_status !== "Closed") { ?>
-                <div class="dropdown dropleft text-center">
-                  <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                    <i class="fas fa-ellipsis-h"></i>
-                  </button>
-                  <div class="dropdown-menu">
-                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketModal<?php echo $ticket_id; ?>">Edit</a>
-                    <?php if ($session_user_role == 3) { ?>
-                      <div class="dropdown-divider"></div>
-                      <a class="dropdown-item text-danger" href="post.php?delete_ticket=<?php echo $ticket_id; ?>">Delete</a>
-                    <?php } ?>
-                  </div>
+        <div class="card-tools">
+            <div class="btn-group">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketModal"><i class="fas fa-fw fa-plus"></i> New Ticket</button>
+                <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
+                <div class="dropdown-menu">
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addScheduledTicketModal">Scheduled</a>
                 </div>
-              <?php } ?>
-            </td>
-          </tr>
-
-          <?php
-
-          include("ticket_edit_modal.php");
-          }
-
-          ?>
-
-        </tbody>
-      </table>
+            </div>
+        </div>
+    </div>
+    <div class="card-body">
+        <form autocomplete="off">
+            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+            <div class="row">
+
+                <div class="col-md-4">
+                    <div class="input-group mb-3 mb-md-0">
+                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Tickets">
+                        <div class="input-group-append">
+                            <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col-md-8">
+                    <div class="float-right">
+                        <a href="post.php?export_client_tickets_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
+                    </div>
+                </div>
+
+            </div>
+        </form>
+        <hr>
+        <div class="table-responsive">
+            <table class="table table-striped table-borderless table-hover">
+                <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                <tr>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_number&o=<?php echo $disp; ?>">Number</a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_subject&o=<?php echo $disp; ?>">Subject</a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_name&o=<?php echo $disp; ?>">Contact</a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_priority&o=<?php echo $disp; ?>">Priority</a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_status&o=<?php echo $disp; ?>">Status</a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=user_name&o=<?php echo $disp; ?>">Assigned</a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_updated_at&o=<?php echo $disp; ?>">Last Response</a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_created_at&o=<?php echo $disp; ?>">Created</a></th>
+
+                    <th class="text-center">Action</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
+
+                while ($row = mysqli_fetch_array($sql)) {
+                    $ticket_id = $row['ticket_id'];
+                    $ticket_prefix = htmlentities($row['ticket_prefix']);
+                    $ticket_number = htmlentities($row['ticket_number']);
+                    $ticket_subject = htmlentities($row['ticket_subject']);
+                    $ticket_details = $row['ticket_details'];
+                    $ticket_priority = htmlentities($row['ticket_priority']);
+                    $ticket_status = htmlentities($row['ticket_status']);
+                    $ticket_created_at = $row['ticket_created_at'];
+                    $ticket_updated_at = $row['ticket_updated_at'];
+                    if (empty($ticket_updated_at)) {
+                        if ($ticket_status == "Closed") {
+                            $ticket_updated_at_display = "<p>Never</p>";
+                        }
+                        else{
+                            $ticket_updated_at_display = "<p class='text-danger'>Never</p>";
+                        }
+                    } else {
+                        $ticket_updated_at_display = $ticket_updated_at;
+                    }
+                    $ticket_closed_at = $row['ticket_closed_at'];
+
+                    if ($ticket_status == "Open") {
+                        $ticket_status_display = "<span class='p-2 badge badge-primary'>$ticket_status</span>";
+                    } elseif ($ticket_status == "Working") {
+                        $ticket_status_display = "<span class='p-2 badge badge-success'>$ticket_status</span>";
+                    } else{
+                        $ticket_status_display = "<span class='p-2 badge badge-secondary'>$ticket_status</span>";
+                    }
+
+                    if ($ticket_priority == "High") {
+                        $ticket_priority_display = "<span class='p-2 badge badge-danger'>$ticket_priority</span>";
+                    } elseif ($ticket_priority == "Medium") {
+                        $ticket_priority_display = "<span class='p-2 badge badge-warning'>$ticket_priority</span>";
+                    } elseif ($ticket_priority == "Low") {
+                        $ticket_priority_display = "<span class='p-2 badge badge-info'>$ticket_priority</span>";
+                    } else{
+                        $ticket_priority_display = "-";
+                    }
+                    $ticket_assigned_to = $row['ticket_assigned_to'];
+                    if (empty($ticket_assigned_to)) {
+                        if ($ticket_status == "Closed") {
+                            $ticket_assigned_to_display = "<p>Not Assigned</p>";
+                        }
+                        else {
+                            $ticket_assigned_to_display = "<p class='text-danger'>Not Assigned</p>";
+                        }
+                    } else {
+                        $ticket_assigned_to_display = htmlentities($row['user_name']);
+                    }
+                    $contact_id = $row['contact_id'];
+                    $contact_name = htmlentities($row['contact_name']);
+                    if (empty($contact_name)) {
+                        $contact_display = "-";
+                    } else {
+                        $contact_display = "$contact_name<br><small class='text-secondary'>$contact_email</small>";
+                    }
+                    $contact_title = htmlentities($row['contact_title']);
+                    $contact_email = htmlentities($row['contact_email']);
+                    $contact_phone = formatPhoneNumber($row['contact_phone']);
+                    $contact_extension = htmlentities($row['contact_extension']);
+                    $contact_mobile = formatPhoneNumber($row['contact_mobile']);
+
+                    ?>
+
+                    <tr>
+                        <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span></a></td>
+                        <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
+                        <td><?php echo $contact_display; ?></td>
+                        <td><?php echo $ticket_priority_display; ?></td>
+                        <td><?php echo $ticket_status_display; ?></td>
+                        <td><?php echo $ticket_assigned_to_display; ?></td>
+                        <td><?php echo $ticket_updated_at_display; ?></td>
+                        <td><?php echo $ticket_created_at; ?></td>
+                        <td>
+                            <?php if ($ticket_status !== "Closed") { ?>
+                                <div class="dropdown dropleft text-center">
+                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                        <i class="fas fa-ellipsis-h"></i>
+                                    </button>
+                                    <div class="dropdown-menu">
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketModal<?php echo $ticket_id; ?>">Edit</a>
+                                        <?php if ($session_user_role == 3) { ?>
+                                            <div class="dropdown-divider"></div>
+                                            <a class="dropdown-item text-danger" href="post.php?delete_ticket=<?php echo $ticket_id; ?>">Delete</a>
+                                        <?php } ?>
+                                    </div>
+                                </div>
+                            <?php } ?>
+                        </td>
+                    </tr>
+
+                    <?php
+
+                    require("ticket_edit_modal.php");
+                }
+
+                ?>
+
+                </tbody>
+            </table>
+        </div>
+        <?php require_once("pagination.php"); ?>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
 </div>
 
 <?php
-include("ticket_add_modal.php");
-include("scheduled_ticket_add_modal.php");
-?>
-
-<?php include("footer.php"); ?>
+require_once("ticket_add_modal.php");
+require_once("scheduled_ticket_add_modal.php");
+require_once("footer.php");
diff --git a/client_trips.php b/client_trips.php
index dc48a703..c458d95a 100644
--- a/client_trips.php
+++ b/client_trips.php
@@ -3,7 +3,7 @@
 require_once("inc_all_client.php");
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "trip_date";
 }
@@ -16,17 +16,17 @@ if (!isset($_GET['o'])) {
 
 //Date From and Date To Filter
 if (isset($_GET['dtf'])) {
-    $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf']));
-    $dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt']));
+    $dtf = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtf']));
+    $dtt = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtt']));
 } else {
     $dtf = "0000-00-00";
     $dtt = "9999-00-00";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM trips
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM trips
   LEFT JOIN users ON trip_user_id = user_id
   WHERE (trip_purpose LIKE '%$q%' OR trip_source LIKE '%$q%' OR trip_destination LIKE '%$q%' OR user_name LIKE '%$q%')
   AND DATE(trip_date) BETWEEN '$dtf' AND '$dtt'
@@ -34,7 +34,7 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM trips
   AND trip_client_id = $client_id
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
diff --git a/client_vendor_templates.php b/client_vendor_templates.php
index 2b7f1ee6..1a64a862 100644
--- a/client_vendor_templates.php
+++ b/client_vendor_templates.php
@@ -1,180 +1,170 @@
-<?php require_once("inc_all_client.php"); ?>
-
 <?php
+require_once("inc_all_client.php");
 
 if (isset($_GET['q'])) {
-  $q = strip_tags(mysqli_real_escape_string($mysqli,$_GET['q']));
-  //Phone Numbers
-  $phone_query = preg_replace("/[^0-9]/", '',$q);
-  if (empty($phone_query)) {
-    $phone_query = $q;
-  }
-}else{
-  $q = "";
-  $phone_query = "";
+    $q = strip_tags(mysqli_real_escape_string($mysqli, $_GET['q']));
+    //Phone Numbers
+    $phone_query = preg_replace("/[^0-9]/", '', $q);
+    if (empty($phone_query)) {
+        $phone_query = $q;
+    }
+} else {
+    $q = "";
+    $phone_query = "";
 }
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
-  $sb = "vendor_name";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
+    $sb = "vendor_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM vendors 
-  WHERE vendor_template = 1 
-  AND (vendor_name LIKE '%$q%' OR vendor_description LIKE '%$q%' OR vendor_account_number LIKE '%$q%' OR vendor_website LIKE '%$q%' OR vendor_contact_name LIKE '%$q%' OR vendor_email LIKE '%$q%' OR vendor_phone LIKE '%$phone_query%') ORDER BY $sb $o LIMIT $record_from, $record_to");
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM vendors 
+    WHERE vendor_template = 1 
+    AND (vendor_name LIKE '%$q%' OR vendor_description LIKE '%$q%' OR vendor_account_number LIKE '%$q%' OR vendor_website LIKE '%$q%' OR vendor_contact_name LIKE '%$q%' OR vendor_email LIKE '%$q%' OR vendor_phone LIKE '%$phone_query%') ORDER BY $sb $o LIMIT $record_from, $record_to"
+);
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
 <div class="card card-dark">
-  <div class="card-header py-2">
-    <h3 class="card-title mt-2">
-      <i class="fa fa-fw fa-building"></i> Vendor Templates
-    </h3>
-    <button type="button" class="btn btn-dark dropdown-toggle ml-1" data-toggle="dropdown"></button>
-    <div class="dropdown-menu">
-      <a class="dropdown-item text-dark" href="client_vendors.php?client_id=<?php echo $client_id; ?>">Vendors</a>
-    </div>
-    <div class="card-tools">
-        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addVendorTemplateModal">
-          <i class="fas fa-fw fa-plus"></i> New Template
-        </button>
-    </div>
-  </div>
-  <div class="card-body">
-    <form autocomplete="off">
-      <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-      <div class="row">
-        
-        <div class="col-md-4">
-          <div class="input-group mb-3 mb-md-0">
-            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Vendors Templates">
-            <div class="input-group-append">
-              <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-            </div>
-          </div>
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2">
+            <i class="fa fa-fw fa-building"></i> Vendor Templates
+        </h3>
+        <button type="button" class="btn btn-dark dropdown-toggle ml-1" data-toggle="dropdown"></button>
+        <div class="dropdown-menu">
+            <a class="dropdown-item text-dark" href="client_vendors.php?client_id=<?php echo $client_id; ?>">Vendors</a>
+        </div>
+        <div class="card-tools">
+            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addVendorTemplateModal">
+                <i class="fas fa-fw fa-plus"></i> New Template
+            </button>
         </div>
-
-      </div>
-    </form>
-    <hr>
-    <div class="table-responsive">
-      <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-          <tr>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_name&o=<?php echo $disp; ?>">Vendor</a></th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_description&o=<?php echo $disp; ?>">Description</a></th>
-            <th>Contact</th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $vendor_id = $row['vendor_id'];
-            $vendor_name = htmlentities($row['vendor_name']);
-            $vendor_description = htmlentities($row['vendor_description']);
-            if (empty($vendor_description)) {
-              $vendor_description_display = "-";
-            }else{
-              $vendor_description_display = $vendor_description;
-            }
-            $vendor_account_number = htmlentities($row['vendor_account_number']);
-            $vendor_contact_name = htmlentities($row['vendor_contact_name']);
-            if (empty($vendor_contact_name)) {
-              $vendor_contact_name_display = "-";
-            }else{
-              $vendor_contact_name_display = $vendor_contact_name;
-            }
-            $vendor_phone = formatPhoneNumber($row['vendor_phone']);
-            $vendor_extension = htmlentities($row['vendor_extension']);
-            $vendor_email = htmlentities($row['vendor_email']);
-            $vendor_website = htmlentities($row['vendor_website']);
-            $vendor_hours = htmlentities($row['vendor_hours']);
-            $vendor_sla = htmlentities($row['vendor_sla']);
-            $vendor_code = htmlentities($row['vendor_code']);
-            $vendor_notes = htmlentities($row['vendor_notes']);
-            $vendor_template = intval($row['vendor_template']);
-              
-          ?>
-          <tr>
-            <th>
-              <i class="fa fa-fw fa-building text-secondary"></i> 
-              <a class="text-dark" href="#" data-toggle="modal" data-target="#editVendorTemplateModal<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></a>
-              <?php
-              if (!empty($vendor_account_number)) {
-              ?>
-              <br>
-              <small class="text-secondary"><?php echo $vendor_account_number; ?></small>
-              <?php
-              }
-              ?>
-            </th>
-            <td><?php echo $vendor_description_display; ?></td>
-            <td>
-              <?php
-              if (!empty($vendor_contact_name)) {
-              ?>
-              <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><?php echo $vendor_contact_name_display; ?>
-              <br>
-              <?php
-              }else{
-                echo $vendor_contact_name_display;
-              }
-              ?>
-              <?php
-              if (!empty($vendor_phone)) {
-              ?>
-              <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $vendor_phone; ?>
-              <br>
-              <?php
-              }
-              ?>
-              <?php
-              if (!empty($vendor_email)) {
-              ?>
-              <i class="fa fa-fw fa-envelope text-secondary mr-2 mb-2"></i><?php echo $vendor_email; ?>
-              <br>
-              <?php
-              }
-              ?>
-            </td>
-            <td>
-              <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                  <i class="fas fa-ellipsis-h"></i>
-                </button>
-                <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editVendorTemplateModal<?php echo $vendor_id; ?>">Edit</a>
-                  <?php if ($session_user_role == 3) { ?>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item text-danger" href="post.php?delete_vendor=<?php echo $vendor_id; ?>">Delete</a>
-                  <?php } ?>
-                </div>
-              </div>
-            </td>
-          </tr>
-
-          <?php
-          
-          include("vendor_template_edit_modal.php");
-          }
-          
-          ?>
-
-        </tbody>
-      </table>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
+    <div class="card-body">
+        <form autocomplete="off">
+            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+            <div class="row">
+
+                <div class="col-md-4">
+                    <div class="input-group mb-3 mb-md-0">
+                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Vendors Templates">
+                        <div class="input-group-append">
+                            <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </form>
+        <hr>
+        <div class="table-responsive">
+            <table class="table table-striped table-borderless table-hover">
+                <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                <tr>
+                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_name&o=<?php echo $disp; ?>">Vendor</a></th>
+                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_description&o=<?php echo $disp; ?>">Description</a></th>
+                    <th>Contact</th>
+                    <th class="text-center">Action</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
+
+                while ($row = mysqli_fetch_array($sql)) {
+                    $vendor_id = $row['vendor_id'];
+                    $vendor_name = htmlentities($row['vendor_name']);
+                    $vendor_description = htmlentities($row['vendor_description']);
+                    if (empty($vendor_description)) {
+                        $vendor_description_display = "-";
+                    } else {
+                        $vendor_description_display = $vendor_description;
+                    }
+                    $vendor_account_number = htmlentities($row['vendor_account_number']);
+                    $vendor_contact_name = htmlentities($row['vendor_contact_name']);
+                    if (empty($vendor_contact_name)) {
+                        $vendor_contact_name_display = "-";
+                    } else {
+                        $vendor_contact_name_display = $vendor_contact_name;
+                    }
+                    $vendor_phone = formatPhoneNumber($row['vendor_phone']);
+                    $vendor_extension = htmlentities($row['vendor_extension']);
+                    $vendor_email = htmlentities($row['vendor_email']);
+                    $vendor_website = htmlentities($row['vendor_website']);
+                    $vendor_hours = htmlentities($row['vendor_hours']);
+                    $vendor_sla = htmlentities($row['vendor_sla']);
+                    $vendor_code = htmlentities($row['vendor_code']);
+                    $vendor_notes = htmlentities($row['vendor_notes']);
+                    $vendor_template = intval($row['vendor_template']);
+
+                    ?>
+                    <tr>
+                        <th>
+                            <i class="fa fa-fw fa-building text-secondary"></i>
+                            <a class="text-dark" href="#" data-toggle="modal" data-target="#editVendorTemplateModal<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></a>
+                            <?php
+                            if (!empty($vendor_account_number)) { ?>
+                                <br>
+                                <small class="text-secondary"><?php echo $vendor_account_number; ?></small>
+                            <?php } ?>
+                        </th>
+                        <td><?php echo $vendor_description_display; ?></td>
+                        <td>
+                            <?php
+                            if (!empty($vendor_contact_name)) { ?>
+                                <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><?php echo $vendor_contact_name_display; ?>
+                                <br>
+                            <?php } else {
+                                echo $vendor_contact_name_display;
+                            }
+
+                            if (!empty($vendor_phone)) { ?>
+                                <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $vendor_phone; ?>
+                                <br>
+                            <?php }
+
+                            if (!empty($vendor_email)) { ?>
+                                <i class="fa fa-fw fa-envelope text-secondary mr-2 mb-2"></i><?php echo $vendor_email; ?>
+                                <br>
+                            <?php } ?>
+                        </td>
+                        <td>
+                            <div class="dropdown dropleft text-center">
+                                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                    <i class="fas fa-ellipsis-h"></i>
+                                </button>
+                                <div class="dropdown-menu">
+                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editVendorTemplateModal<?php echo $vendor_id; ?>">Edit</a>
+                                    <?php if ($session_user_role == 3) { ?>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger" href="post.php?delete_vendor=<?php echo $vendor_id; ?>">Delete</a>
+                                    <?php } ?>
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
+
+                    <?php
+
+                    require("vendor_template_edit_modal.php");
+                }
+
+                ?>
+
+                </tbody>
+            </table>
+        </div>
+        <?php require_once("pagination.php"); ?>
+    </div>
 </div>
 
-<?php include("vendor_template_add_modal.php"); ?>
-
-<?php include("footer.php"); ?>
+<?php
+require_once("vendor_template_add_modal.php");
+require_once("footer.php");
diff --git a/client_vendors.php b/client_vendors.php
index 1df431d9..6f729730 100644
--- a/client_vendors.php
+++ b/client_vendors.php
@@ -3,9 +3,9 @@
 require_once("inc_all_client.php");
 
 if (isset($_GET['q'])) {
-    $q = strip_tags(mysqli_real_escape_string($mysqli,$_GET['q']));
+    $q = strip_tags(mysqli_real_escape_string($mysqli, $_GET['q']));
     //Phone Numbers
-    $phone_query = preg_replace("/[^0-9]/", '',$q);
+    $phone_query = preg_replace("/[^0-9]/", '', $q);
     if (empty($phone_query)) {
         $phone_query = $q;
     }
@@ -15,20 +15,20 @@ if (isset($_GET['q'])) {
 }
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "vendor_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM vendors 
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM vendors 
   WHERE vendor_client_id = $client_id
   AND vendor_template = 0
   AND (vendor_name LIKE '%$q%' OR vendor_description LIKE '%$q%' OR vendor_account_number LIKE '%$q%' OR vendor_website LIKE '%$q%' OR vendor_contact_name LIKE '%$q%' OR vendor_email LIKE '%$q%' OR vendor_phone LIKE '%$phone_query%') ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
diff --git a/clients.php b/clients.php
index 6287e9fc..98d4f040 100644
--- a/clients.php
+++ b/clients.php
@@ -15,9 +15,9 @@ if (isset($_GET['p'])) {
 
 //Custom Query Filter
 if (isset($_GET['query'])) {
-    $query = strip_tags(mysqli_real_escape_string($mysqli,$_GET['query']));
+    $query = strip_tags(mysqli_real_escape_string($mysqli, $_GET['query']));
     //Phone Numbers
-    $phone_query = preg_replace("/[^0-9]/", '',$query);
+    $phone_query = preg_replace("/[^0-9]/", '', $query);
     if (empty($phone_query)) {
         $phone_query = $query;
     }
@@ -28,7 +28,7 @@ if (isset($_GET['query'])) {
 
 //Column Filter
 if (!empty($_GET['sortby'])) {
-    $sortby = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sortby']));
+    $sortby = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sortby']));
 } else {
     $sortby = "client_accessed_at";
 }
@@ -55,41 +55,41 @@ if (empty($_GET['canned_date'])) {
 
 //Date Filter
 if ($_GET['canned_date'] == "custom" && !empty($_GET['date_from'])) {
-    $date_from = strip_tags(mysqli_real_escape_string($mysqli,$_GET['date_from']));
-    $date_to = strip_tags(mysqli_real_escape_string($mysqli,$_GET['date_to']));
+    $date_from = strip_tags(mysqli_real_escape_string($mysqli, $_GET['date_from']));
+    $date_to = strip_tags(mysqli_real_escape_string($mysqli, $_GET['date_to']));
 } elseif ($_GET['canned_date'] == "today") {
     $date_from = date('Y-m-d');
     $date_to = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "yesterday") {
-    $date_from = date('Y-m-d',strtotime("yesterday"));
-    $date_to = date('Y-m-d',strtotime("yesterday"));
+    $date_from = date('Y-m-d', strtotime("yesterday"));
+    $date_to = date('Y-m-d', strtotime("yesterday"));
 } elseif ($_GET['canned_date'] == "thisweek") {
-    $date_from = date('Y-m-d',strtotime("monday this week"));
+    $date_from = date('Y-m-d', strtotime("monday this week"));
     $date_to = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastweek") {
-    $date_from = date('Y-m-d',strtotime("monday last week"));
-    $date_to = date('Y-m-d',strtotime("sunday last week"));
+    $date_from = date('Y-m-d', strtotime("monday last week"));
+    $date_to = date('Y-m-d', strtotime("sunday last week"));
 } elseif ($_GET['canned_date'] == "thismonth") {
     $date_from = date('Y-m-01');
     $date_to = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastmonth") {
-    $date_from = date('Y-m-d',strtotime("first day of last month"));
-    $date_to = date('Y-m-d',strtotime("last day of last month"));
+    $date_from = date('Y-m-d', strtotime("first day of last month"));
+    $date_to = date('Y-m-d', strtotime("last day of last month"));
 } elseif ($_GET['canned_date'] == "thisyear") {
     $date_from = date('Y-01-01');
     $date_to = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastyear") {
-    $date_from = date('Y-m-d',strtotime("first day of january last year"));
-    $date_to = date('Y-m-d',strtotime("last day of december last year"));
+    $date_from = date('Y-m-d', strtotime("first day of january last year"));
+    $date_to = date('Y-m-d', strtotime("last day of december last year"));
 } else {
     $date_from = "0000-00-00";
     $date_to = "9999-00-00";
 }
 
 //Rebuild URL
-$url_query_strings_sortby = http_build_query(array_merge($_GET,array('sortby' => $sortby, 'order' => $order)));
+$url_query_strings_sortby = http_build_query(array_merge($_GET, array('sortby' => $sortby, 'order' => $order)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM clients 
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM clients 
   LEFT JOIN contacts ON clients.primary_contact = contacts.contact_id AND contact_archived_at IS NULL
   LEFT JOIN locations ON clients.primary_location = locations.location_id AND location_archived_at IS NULL
   WHERE (client_name LIKE '%$query%' OR client_type LIKE '%$query%' OR client_referral LIKE '%$query%' OR contact_email LIKE '%$query%' OR contact_name LIKE '%$query%' OR contact_phone LIKE '%$phone_query%' 
@@ -100,7 +100,7 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM clients
   ORDER BY $sortby $order LIMIT $record_from, $record_to
 ");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
@@ -202,7 +202,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                     $client_net_terms = htmlentities($row['client_net_terms']);
                     $client_referral = htmlentities($row['client_referral']);
                     $client_notes = htmlentities($row['client_notes']);
-                    $client_created_at = date('Y-m-d',strtotime($row['client_created_at']));
+                    $client_created_at = date('Y-m-d', strtotime($row['client_created_at']));
                     $client_updated_at = $row['client_updated_at'];
                     $client_archive_at = $row['client_archived_at'];
 
@@ -210,7 +210,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
                     $client_tag_name_display_array = array();
                     $client_tag_id_array = array();
-                    $sql_client_tags = mysqli_query($mysqli,"SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_tags.client_id = $client_id");
+                    $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_tags.client_id = $client_id");
                     while ($row = mysqli_fetch_array($sql_client_tags)) {
 
                         $client_tag_id = $row['tag_id'];
@@ -231,12 +231,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                     $client_tags_display = implode('', $client_tag_name_display_array);
 
                     //Add up all the payments for the invoice and get the total amount paid to the invoice
-                    $sql_invoice_amounts = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled' ");
+                    $sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled' ");
                     $row = mysqli_fetch_array($sql_invoice_amounts);
 
                     $invoice_amounts = $row['invoice_amounts'];
 
-                    $sql_amount_paid = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id");
+                    $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id");
                     $row = mysqli_fetch_array($sql_amount_paid);
 
                     $amount_paid = $row['amount_paid'];
@@ -250,13 +250,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                     }
 
                     //Get Monthly Recurring Total
-                    $sql_recurring_monthly_total = mysqli_query($mysqli,"SELECT SUM(recurring_amount) AS recurring_monthly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'month' AND recurring_client_id = $client_id AND company_id = $session_company_id");
+                    $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_monthly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'month' AND recurring_client_id = $client_id AND company_id = $session_company_id");
                     $row = mysqli_fetch_array($sql_recurring_monthly_total);
 
                     $recurring_monthly_total = $row['recurring_monthly_total'];
 
                     //Get Yearly Recurring Total
-                    $sql_recurring_yearly_total = mysqli_query($mysqli,"SELECT SUM(recurring_amount) AS recurring_yearly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'year' AND recurring_client_id = $client_id AND company_id = $session_company_id");
+                    $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_yearly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'year' AND recurring_client_id = $client_id AND company_id = $session_company_id");
                     $row = mysqli_fetch_array($sql_recurring_yearly_total);
 
                     $recurring_yearly_total = $row['recurring_yearly_total'] / 12;
diff --git a/companies.php b/companies.php
index ac8e1ff2..f3fdcffa 100644
--- a/companies.php
+++ b/companies.php
@@ -2,20 +2,20 @@
 require_once("inc_all_settings.php");
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "company_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM companies, settings
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM companies, settings
   WHERE companies.company_id = settings.company_id
   AND (company_name LIKE '%$q%')
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
diff --git a/cron.php b/cron.php
index 4fe78c9e..124d0eb5 100644
--- a/cron.php
+++ b/cron.php
@@ -3,7 +3,7 @@
 require_once("config.php");
 require_once("functions.php");
 
-$sql_companies = mysqli_query($mysqli,"SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id");
+$sql_companies = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id");
 
 while($row = mysqli_fetch_array($sql_companies)){
     $company_id = $row['company_id'];
@@ -50,7 +50,7 @@ while($row = mysqli_fetch_array($sql_companies)){
     if ($config_enable_cron == 1) {
 
         //Logging
-        mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Cron', log_action = 'Started', log_description = 'Cron started for $company_name', company_id = $company_id");
+        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Started', log_description = 'Cron started for $company_name', company_id = $company_id");
 
 
         // REFRESH DOMAIN WHOIS DATA (1 a day)
@@ -70,7 +70,7 @@ while($row = mysqli_fetch_array($sql_companies)){
             $whois = mysqli_real_escape_string($mysqli, $records['whois']);
 
             // Update the domain
-            mysqli_query($mysqli,"UPDATE domains SET domain_name = '$domain_name',  domain_expire = '$expire', domain_ip = '$a', domain_name_servers = '$ns', domain_mail_servers = '$mx', domain_txt = '$txt', domain_raw_whois = '$whois' WHERE domain_id = $domain_id");
+            mysqli_query($mysqli, "UPDATE domains SET domain_name = '$domain_name',  domain_expire = '$expire', domain_ip = '$a', domain_name_servers = '$ns', domain_mail_servers = '$mx', domain_txt = '$txt', domain_raw_whois = '$whois' WHERE domain_id = $domain_id");
         }
 
         // GET NOTIFICATIONS
@@ -82,7 +82,9 @@ while($row = mysqli_fetch_array($sql_companies)){
         foreach($domainAlertArray as $day){
 
             //Get Domains Expiring
-            $sql = mysqli_query($mysqli,"SELECT * FROM domains
+            $sql = mysqli_query(
+                $mysqli,
+                "SELECT * FROM domains
         LEFT JOIN clients ON domain_client_id = client_id 
         WHERE domain_expire = CURDATE() + INTERVAL $day DAY
         AND domains.company_id = $company_id"
@@ -90,12 +92,12 @@ while($row = mysqli_fetch_array($sql_companies)){
 
             while($row = mysqli_fetch_array($sql)){
                 $domain_id = $row['domain_id'];
-                $domain_name = mysqli_real_escape_string($mysqli,$row['domain_name']);
+                $domain_name = mysqli_real_escape_string($mysqli, $row['domain_name']);
                 $domain_expire = $row['domain_expire'];
                 $client_id = $row['client_id'];
-                $client_name = mysqli_real_escape_string($mysqli,$row['client_name']);
+                $client_name = mysqli_real_escape_string($mysqli, $row['client_name']);
 
-                mysqli_query($mysqli,"INSERT INTO notifications SET notification_type = 'Domain', notification = 'Domain $domain_name for $client_name will expire in $day Days on $domain_expire', notification_timestamp = NOW(), notification_client_id = $client_id, company_id = $company_id");
+                mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Domain', notification = 'Domain $domain_name for $client_name will expire in $day Days on $domain_expire', notification_timestamp = NOW(), notification_client_id = $client_id, company_id = $company_id");
 
             }
 
@@ -108,7 +110,9 @@ while($row = mysqli_fetch_array($sql_companies)){
         foreach($certificateAlertArray as $day){
 
             //Get Certs Expiring
-            $sql = mysqli_query($mysqli,"SELECT * FROM certificates
+            $sql = mysqli_query(
+                $mysqli,
+                "SELECT * FROM certificates
                 LEFT JOIN clients ON certificate_client_id = client_id 
                 WHERE certificate_expire = CURDATE() + INTERVAL $day DAY
                 AND certificates.company_id = $company_id"
@@ -116,13 +120,13 @@ while($row = mysqli_fetch_array($sql_companies)){
 
             while($row = mysqli_fetch_array($sql)){
                 $certificate_id = $row['certificate_id'];
-                $certificate_name = mysqli_real_escape_string($mysqli,$row['certificate_name']);
+                $certificate_name = mysqli_real_escape_string($mysqli, $row['certificate_name']);
                 $certificate_domain = $row['certificate_domain'];
                 $certificate_expire = $row['certificate_expire'];
                 $client_id = $row['client_id'];
-                $client_name = mysqli_real_escape_string($mysqli,$row['client_name']);
+                $client_name = mysqli_real_escape_string($mysqli, $row['client_name']);
 
-                mysqli_query($mysqli,"INSERT INTO notifications SET notification_type = 'Certificate', notification = 'Certificate $certificate_name for $client_name will expire in $day Days on $certificate_expire', notification_timestamp = NOW(), notification_client_id = $client_id, company_id = $company_id");
+                mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Certificate', notification = 'Certificate $certificate_name for $client_name will expire in $day Days on $certificate_expire', notification_timestamp = NOW(), notification_client_id = $client_id, company_id = $company_id");
 
             }
 
@@ -135,7 +139,9 @@ while($row = mysqli_fetch_array($sql_companies)){
         foreach($warranty_alert_array as $day){
 
             //Get Asset Warranty Expiring
-            $sql = mysqli_query($mysqli,"SELECT * FROM assets 
+            $sql = mysqli_query(
+                $mysqli,
+                "SELECT * FROM assets 
                 LEFT JOIN clients ON asset_client_id = client_id
                 WHERE asset_warranty_expire = CURDATE() + INTERVAL $day DAY
                 AND assets.company_id = $company_id"
@@ -143,12 +149,12 @@ while($row = mysqli_fetch_array($sql_companies)){
 
             while($row = mysqli_fetch_array($sql)){
                 $asset_id = $row['asset_id'];
-                $asset_name = mysqli_real_escape_string($mysqli,$row['asset_name']);
+                $asset_name = mysqli_real_escape_string($mysqli, $row['asset_name']);
                 $asset_warranty_expire = $row['asset_warranty_expire'];
                 $client_id = $row['client_id'];
-                $client_name = mysqli_real_escape_string($mysqli,$row['client_name']);
+                $client_name = mysqli_real_escape_string($mysqli, $row['client_name']);
 
-                mysqli_query($mysqli,"INSERT INTO notifications SET notification_type = 'Asset', notification = 'Asset $asset_name warranty for $client_name will expire in $day Days on $asset_warranty_expire', notification_timestamp = NOW(), notification_client_id = $client_id, company_id = $company_id");
+                mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Asset', notification = 'Asset $asset_name warranty for $client_name will expire in $day Days on $asset_warranty_expire', notification_timestamp = NOW(), notification_client_id = $client_id, company_id = $company_id");
 
             }
 
@@ -166,8 +172,8 @@ while($row = mysqli_fetch_array($sql_companies)){
         if(mysqli_num_rows($sql_scheduled_tickets) > 0){
             while($row = mysqli_fetch_array($sql_scheduled_tickets)){
                 $schedule_id = $row['scheduled_ticket_id'];
-                $subject = mysqli_real_escape_string($mysqli,$row['scheduled_ticket_subject']);
-                $details = mysqli_real_escape_string($mysqli,$row['scheduled_ticket_details']);
+                $subject = mysqli_real_escape_string($mysqli, $row['scheduled_ticket_subject']);
+                $details = mysqli_real_escape_string($mysqli, $row['scheduled_ticket_details']);
                 $priority = $row['scheduled_ticket_priority'];
                 $frequency = strtolower($row['scheduled_ticket_frequency']);
                 $created_id = $row['scheduled_ticket_created_by'];
@@ -179,20 +185,20 @@ while($row = mysqli_fetch_array($sql_companies)){
                 //Get the next Ticket Number and add 1 for the new ticket number
                 $ticket_number = $config_ticket_next_number;
                 $new_config_ticket_next_number = $config_ticket_next_number + 1;
-                mysqli_query($mysqli,"UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = '$company_id'");
+                mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = '$company_id'");
 
                 // Raise the ticket
-                mysqli_query($mysqli,"INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 'Open', ticket_created_at = NOW(), ticket_created_by = $created_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id, company_id = $company_id");
+                mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 'Open', ticket_created_at = NOW(), ticket_created_by = $created_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id, company_id = $company_id");
                 $id = mysqli_insert_id($mysqli);
 
                 // Logging
-                mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket', log_action = 'Create', log_description = 'System created scheduled $frequency ticket - $subject', log_created_at = NOW(), log_client_id = $client_id, company_id = $company_id, log_user_id = $created_id");
+                mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket', log_action = 'Create', log_description = 'System created scheduled $frequency ticket - $subject', log_created_at = NOW(), log_client_id = $client_id, company_id = $company_id, log_user_id = $created_id");
 
                 // E-mail client
                 if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1) {
 
                     // Get contact/ticket/company details
-                    $sql = mysqli_query($mysqli,"SELECT contact_name, contact_email, ticket_prefix, ticket_number, ticket_subject, company_phone FROM tickets 
+                    $sql = mysqli_query($mysqli, "SELECT contact_name, contact_email, ticket_prefix, ticket_number, ticket_subject, company_phone FROM tickets 
                       LEFT JOIN clients ON ticket_client_id = client_id 
                       LEFT JOIN contacts ON ticket_contact_id = contact_id
                       LEFT JOIN companies ON tickets.company_id = companies.company_id
@@ -212,14 +218,23 @@ while($row = mysqli_fetch_array($sql_companies)){
                         $subject = "Ticket created - [$ticket_prefix$ticket_number] - $ticket_subject (scheduled)";
                         $body    = "<i style='color: #808080'>#--itflow--#</i><br><br>Hello, $contact_name<br><br>A ticket regarding \"$ticket_subject\" has been automatically created for you.<br><br>--------------------------------<br>$details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: Open<br>Portal: https://$config_base_url/portal/ticket.php?id=$id<br><br>~<br>$company_name<br>Support Department<br>$config_ticket_from_email<br>$company_phone";
 
-                        $mail = sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_password, $config_smtp_encryption, $config_smtp_port,
-                            $config_ticket_from_email, $config_ticket_from_name,
-                            $contact_email, $contact_name,
-                            $subject, $body);
+                        $mail = sendSingleEmail(
+                            $config_smtp_host,
+                            $config_smtp_username,
+                            $config_smtp_password,
+                            $config_smtp_encryption,
+                            $config_smtp_port,
+                            $config_ticket_from_email,
+                            $config_ticket_from_name,
+                            $contact_email,
+                            $contact_name,
+                            $subject,
+                            $body
+                        );
 
                         if ($mail !== true) {
-                            mysqli_query($mysqli,"INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $contact_email', notification_timestamp = NOW(), company_id = $company_id");
-                            mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Mail', log_action = 'Error', log_description = 'Failed to send email to $contact_email regarding $subject. $mail',  company_id = $company_id");
+                            mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $contact_email', notification_timestamp = NOW(), company_id = $company_id");
+                            mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Mail', log_action = 'Error', log_description = 'Failed to send email to $contact_email regarding $subject. $mail',  company_id = $company_id");
                         }
 
                     }
@@ -273,7 +288,9 @@ while($row = mysqli_fetch_array($sql_companies)){
 
         foreach($invoiceAlertArray as $day){
 
-            $sql = mysqli_query($mysqli,"SELECT * FROM invoices
+            $sql = mysqli_query(
+                $mysqli,
+                "SELECT * FROM invoices
                 LEFT JOIN clients ON invoice_client_id = client_id
                 LEFT JOIN contacts ON contact_id = primary_contact
                 WHERE invoice_status NOT LIKE 'Draft'
@@ -295,29 +312,38 @@ while($row = mysqli_fetch_array($sql_companies)){
                 $invoice_amount = $row['invoice_amount'];
                 $invoice_currency_code = $row['invoice_currency_code'];
                 $client_id = $row['client_id'];
-                $client_name = mysqli_real_escape_string($mysqli,$row['client_name']);
+                $client_name = mysqli_real_escape_string($mysqli, $row['client_name']);
                 $contact_name = $row['contact_name'];
                 $contact_email = $row['contact_email'];
 
-                mysqli_query($mysqli,"INSERT INTO notifications SET notification_type = 'Invoice Overdue', notification = 'Invoice $invoice_prefix$invoice_number for $client_name in the amount of $invoice_amount is overdue by $day days', notification_timestamp = NOW(), notification_client_id = $client_id, company_id = $company_id");
+                mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Invoice Overdue', notification = 'Invoice $invoice_prefix$invoice_number for $client_name in the amount of $invoice_amount is overdue by $day days', notification_timestamp = NOW(), notification_client_id = $client_id, company_id = $company_id");
 
                 $subject = "Overdue Invoice $invoice_prefix$invoice_number";
                 $body    = "Hello $contact_name,<br><br>According to our records, we have not received payment for invoice $invoice_prefix$invoice_number. Please submit your payment as soon as possible. If you have any questions please contact us at $company_phone.
             <br><br>
             Please view the details of the invoice below.<br><br>Invoice: $invoice_prefix$invoice_number<br>Issue Date: $invoice_date<br>Total: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "<br>Due Date: $invoice_due<br><br><br>To view your invoice click <a href='https://$config_base_url/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key'>here</a><br><br><br>~<br>$company_name<br>Billing Department<br>$config_invoice_from_email<br>$company_phone";
 
-                $mail = sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_password, $config_smtp_encryption, $config_smtp_port,
-                    $config_invoice_from_email, $config_invoice_from_name,
-                    $contact_email, $contact_name,
-                    $subject, $body);
+                $mail = sendSingleEmail(
+                    $config_smtp_host,
+                    $config_smtp_username,
+                    $config_smtp_password,
+                    $config_smtp_encryption,
+                    $config_smtp_port,
+                    $config_invoice_from_email,
+                    $config_invoice_from_name,
+                    $contact_email,
+                    $contact_name,
+                    $subject,
+                    $body
+                );
 
                 if ($mail === true) {
-                    mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Cron Emailed Overdue Invoice', history_created_at = NOW(), history_invoice_id = $invoice_id, company_id = $company_id");
+                    mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Cron Emailed Overdue Invoice', history_created_at = NOW(), history_invoice_id = $invoice_id, company_id = $company_id");
                 } else {
-                    mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Cron Failed to send Overdue Invoice', history_created_at = NOW(), history_invoice_id = $invoice_id, company_id = $company_id");
+                    mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Cron Failed to send Overdue Invoice', history_created_at = NOW(), history_invoice_id = $invoice_id, company_id = $company_id");
 
-                    mysqli_query($mysqli,"INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $contact_email', notification_timestamp = NOW(), company_id = $company_id");
-                    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Mail', log_action = 'Error', log_description = 'Failed to send email to $contact_email regarding $subject. $mail', company_id = $company_id");
+                    mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $contact_email', notification_timestamp = NOW(), company_id = $company_id");
+                    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Mail', log_action = 'Error', log_description = 'Failed to send email to $contact_email regarding $subject. $mail', company_id = $company_id");
                 }
 
             }
@@ -327,7 +353,7 @@ while($row = mysqli_fetch_array($sql_companies)){
         //Send Recurring Invoices that match todays date and are active
 
         //Loop through all recurring that match today's date and is active
-        $sql_recurring = mysqli_query($mysqli,"SELECT * FROM recurring LEFT JOIN clients ON client_id = recurring_client_id WHERE recurring_next_date = CURDATE() AND recurring_status = 1 AND recurring.company_id = $company_id");
+        $sql_recurring = mysqli_query($mysqli, "SELECT * FROM recurring LEFT JOIN clients ON client_id = recurring_client_id WHERE recurring_next_date = CURDATE() AND recurring_status = 1 AND recurring.company_id = $company_id");
 
         while($row = mysqli_fetch_array($sql_recurring)){
             $recurring_id = $row['recurring_id'];
@@ -338,36 +364,36 @@ while($row = mysqli_fetch_array($sql_companies)){
             $recurring_next_date = $row['recurring_next_date'];
             $recurring_amount = $row['recurring_amount'];
             $recurring_currency_code = $row['recurring_currency_code'];
-            $recurring_note = mysqli_real_escape_string($mysqli,$row['recurring_note']); //Escape SQL
+            $recurring_note = mysqli_real_escape_string($mysqli, $row['recurring_note']); //Escape SQL
             $category_id = $row['recurring_category_id'];
             $client_id = $row['recurring_client_id'];
-            $client_name = mysqli_real_escape_string($mysqli,$row['client_name']); //Escape SQL just in case a name is like Safran's etc
+            $client_name = mysqli_real_escape_string($mysqli, $row['client_name']); //Escape SQL just in case a name is like Safran's etc
             $client_net_terms = $row['client_net_terms'];
 
 
             //Get the last Invoice Number and add 1 for the new invoice number
-            $sql_invoice_number = mysqli_query($mysqli,"SELECT * FROM settings WHERE company_id = $company_id");
+            $sql_invoice_number = mysqli_query($mysqli, "SELECT * FROM settings WHERE company_id = $company_id");
             $row = mysqli_fetch_array($sql_invoice_number);
             $config_invoice_next_number = $row['config_invoice_next_number'];
 
             $new_invoice_number = $config_invoice_next_number;
             $new_config_invoice_next_number = $config_invoice_next_number + 1;
-            mysqli_query($mysqli,"UPDATE settings SET config_invoice_next_number = $new_config_invoice_next_number WHERE company_id = $company_id");
+            mysqli_query($mysqli, "UPDATE settings SET config_invoice_next_number = $new_config_invoice_next_number WHERE company_id = $company_id");
 
             //Generate a unique URL key for clients to access
             $url_key = randomString(156);
 
-            mysqli_query($mysqli,"INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', invoice_number = $new_invoice_number, invoice_scope = '$recurring_scope', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_amount = '$recurring_amount', invoice_currency_code = '$recurring_currency_code', invoice_note = '$recurring_note', invoice_category_id = $category_id, invoice_status = 'Sent', invoice_url_key = '$url_key', invoice_created_at = NOW(), invoice_client_id = $client_id, company_id = $company_id");
+            mysqli_query($mysqli, "INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', invoice_number = $new_invoice_number, invoice_scope = '$recurring_scope', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_amount = '$recurring_amount', invoice_currency_code = '$recurring_currency_code', invoice_note = '$recurring_note', invoice_category_id = $category_id, invoice_status = 'Sent', invoice_url_key = '$url_key', invoice_created_at = NOW(), invoice_client_id = $client_id, company_id = $company_id");
 
             $new_invoice_id = mysqli_insert_id($mysqli);
 
             //Copy Items from original recurring invoice to new invoice
-            $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_id = $recurring_id ORDER BY item_id ASC");
+            $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_recurring_id = $recurring_id ORDER BY item_id ASC");
 
             while($row = mysqli_fetch_array($sql_invoice_items)){
                 $item_id = $row['item_id'];
-                $item_name = mysqli_real_escape_string($mysqli,$row['item_name']); //SQL Escape incase of ,
-                $item_description = mysqli_real_escape_string($mysqli,$row['item_description']); //SQL Escape incase of ,
+                $item_name = mysqli_real_escape_string($mysqli, $row['item_name']); //SQL Escape incase of ,
+                $item_description = mysqli_real_escape_string($mysqli, $row['item_description']); //SQL Escape incase of ,
                 $item_quantity = $row['item_quantity'];
                 $item_price = $row['item_price'];
                 $item_subtotal = $row['item_subtotal'];
@@ -376,20 +402,22 @@ while($row = mysqli_fetch_array($sql_companies)){
                 $tax_id = $row['item_tax_id'];
 
                 //Insert Items into New Invoice
-                mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$item_name', item_description = '$item_description', item_quantity = '$item_quantity', item_price = '$item_price', item_subtotal = '$item_subtotal', item_tax = '$item_tax', item_total = '$item_total', item_created_at = NOW(), item_tax_id = $tax_id, item_invoice_id = $new_invoice_id, company_id = $company_id");
+                mysqli_query($mysqli, "INSERT INTO invoice_items SET item_name = '$item_name', item_description = '$item_description', item_quantity = '$item_quantity', item_price = '$item_price', item_subtotal = '$item_subtotal', item_tax = '$item_tax', item_total = '$item_total', item_created_at = NOW(), item_tax_id = $tax_id, item_invoice_id = $new_invoice_id, company_id = $company_id");
 
             }
 
-            mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Invoice Generated from Recurring!', history_created_at = NOW(), history_invoice_id = $new_invoice_id, company_id = $company_id");
+            mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Invoice Generated from Recurring!', history_created_at = NOW(), history_invoice_id = $new_invoice_id, company_id = $company_id");
 
-            mysqli_query($mysqli,"INSERT INTO notifications SET notification_type = 'Recurring Sent', notification = 'Recurring Invoice $config_invoice_prefix$new_invoice_number for $client_name Sent', notification_timestamp = NOW(), notification_client_id = $client_id, company_id = $company_id");
+            mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Recurring Sent', notification = 'Recurring Invoice $config_invoice_prefix$new_invoice_number for $client_name Sent', notification_timestamp = NOW(), notification_client_id = $client_id, company_id = $company_id");
 
             //Update recurring dates
 
-            mysqli_query($mysqli,"UPDATE recurring SET recurring_last_sent = CURDATE(), recurring_next_date = DATE_ADD(CURDATE(), INTERVAL 1 $recurring_frequency), recurring_updated_at = NOW() WHERE recurring_id = $recurring_id");
+            mysqli_query($mysqli, "UPDATE recurring SET recurring_last_sent = CURDATE(), recurring_next_date = DATE_ADD(CURDATE(), INTERVAL 1 $recurring_frequency), recurring_updated_at = NOW() WHERE recurring_id = $recurring_id");
 
             if($config_recurring_auto_send_invoice == 1){
-                $sql = mysqli_query($mysqli,"SELECT * FROM invoices
+                $sql = mysqli_query(
+                    $mysqli,
+                    "SELECT * FROM invoices
                   LEFT JOIN clients ON invoice_client_id = client_id
                   LEFT JOIN contacts ON contact_id = primary_contact
                   WHERE invoice_id = $new_invoice_id
@@ -412,20 +440,29 @@ while($row = mysqli_fetch_array($sql_companies)){
                 $subject = "Invoice $invoice_prefix$invoice_number";
                 $body    = "Hello $contact_name,<br><br>Please view the details of the invoice below.<br><br>Invoice: $invoice_prefix$invoice_number<br>Issue Date: $invoice_date<br>Total: " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_currency_code) . "<br>Due Date: $invoice_due<br><br><br>To view your invoice click <a href='https://$config_base_url/guest_view_invoice.php?invoice_id=$new_invoice_id&url_key=$invoice_url_key'>here</a><br><br><br>~<br>$company_name<br>Billing Department<br>$config_invoice_from_email<br>$company_phone";
 
-                $mail = sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_password, $config_smtp_encryption, $config_smtp_port,
-                    $config_invoice_from_email, $config_invoice_from_name,
-                    $contact_email, $contact_name,
-                    $subject, $body);
+                $mail = sendSingleEmail(
+                    $config_smtp_host,
+                    $config_smtp_username,
+                    $config_smtp_password,
+                    $config_smtp_encryption,
+                    $config_smtp_port,
+                    $config_invoice_from_email,
+                    $config_invoice_from_name,
+                    $contact_email,
+                    $contact_name,
+                    $subject,
+                    $body
+                );
 
                 if ($mail === true) {
-                    mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Cron Emailed Invoice!', history_created_at = NOW(), history_invoice_id = $new_invoice_id, company_id = $company_id");
-                    mysqli_query($mysqli,"UPDATE invoices SET invoice_status = 'Sent', invoice_updated_at = NOW(), invoice_client_id = $client_id WHERE invoice_id = $new_invoice_id");
+                    mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Cron Emailed Invoice!', history_created_at = NOW(), history_invoice_id = $new_invoice_id, company_id = $company_id");
+                    mysqli_query($mysqli, "UPDATE invoices SET invoice_status = 'Sent', invoice_updated_at = NOW(), invoice_client_id = $client_id WHERE invoice_id = $new_invoice_id");
 
                 } else {
-                    mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Draft', history_description = 'Cron Failed to send Invoice!', history_created_at = NOW(), history_invoice_id = $new_invoice_id, company_id = $company_id");
+                    mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Draft', history_description = 'Cron Failed to send Invoice!', history_created_at = NOW(), history_invoice_id = $new_invoice_id, company_id = $company_id");
 
-                    mysqli_query($mysqli,"INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $contact_email', notification_timestamp = NOW(), company_id = $company_id");
-                    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Mail', log_action = 'Error', log_description = 'Failed to send email to $contact_email regarding $subject. $mail', company_id = $company_id");
+                    mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $contact_email', notification_timestamp = NOW(), company_id = $company_id");
+                    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Mail', log_action = 'Error', log_description = 'Failed to send email to $contact_email regarding $subject. $mail', company_id = $company_id");
                 }
 
             } //End if Autosend is on
@@ -436,163 +473,163 @@ while($row = mysqli_fetch_array($sql_companies)){
             $current_version = exec("git rev-parse HEAD");
 
             // Client Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('client_id') AS num FROM clients"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('client_id') AS num FROM clients"));
             $client_count = $row['num'];
 
             // Ticket Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('recurring_id') AS num FROM tickets"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS num FROM tickets"));
             $ticket_count = $row['num'];
 
             // Calendar Event Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('event_id') AS num FROM events"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('event_id') AS num FROM events"));
             $calendar_event_count = $row['num'];
 
             // Quote Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('quote_id') AS num FROM quotes"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('quote_id') AS num FROM quotes"));
             $quote_count = $row['num'];
 
             // Invoice Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices"));
             $invoice_count = $row['num'];
 
             // Revenue Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('revenue_id') AS num FROM revenues"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('revenue_id') AS num FROM revenues"));
             $revenue_count = $row['num'];
 
             // Recurring Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('recurring_id') AS num FROM recurring"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS num FROM recurring"));
             $recurring_count = $row['num'];
 
             // Account Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('account_id') AS num FROM accounts"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('account_id') AS num FROM accounts"));
             $account_count = $row['num'];
 
             // Tax Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('tax_id') AS num FROM taxes"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('tax_id') AS num FROM taxes"));
             $tax_count = $row['num'];
 
             // Product Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('product_id') AS num FROM products"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('product_id') AS num FROM products"));
             $product_count = $row['num'];
 
             // Payment Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('payment_id') AS num FROM payments WHERE payment_invoice_id > 0"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('payment_id') AS num FROM payments WHERE payment_invoice_id > 0"));
             $payment_count = $row['num'];
 
             // Company Vendor Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_template = 0 AND vendor_client_id = 0"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_template = 0 AND vendor_client_id = 0"));
             $company_vendor_count = $row['num'];
 
             // Expense Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('expense_id') AS num FROM expenses WHERE expense_vendor_id > 0"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('expense_id') AS num FROM expenses WHERE expense_vendor_id > 0"));
             $expense_count = $row['num'];
 
             // Trip Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('trip_id') AS num FROM trips"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('trip_id') AS num FROM trips"));
             $trip_count = $row['num'];
 
             // Transfer Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('transfer_id') AS num FROM transfers"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('transfer_id') AS num FROM transfers"));
             $transfer_count = $row['num'];
 
             // Contact Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('contact_id') AS num FROM contacts"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts"));
             $contact_count = $row['num'];
 
             // Location Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('location_id') AS num FROM locations"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('location_id') AS num FROM locations"));
             $location_count = $row['num'];
 
             // Asset Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('asset_id') AS num FROM assets"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets"));
             $asset_count = $row['num'];
 
             // Software Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('software_id') AS num FROM software WHERE software_template = 0"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_template = 0"));
             $software_count = $row['num'];
 
             // Software Template Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('software_id') AS num FROM software WHERE software_template = 1"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_template = 1"));
             $software_template_count = $row['num'];
 
             // Password Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('login_id') AS num FROM logins"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('login_id') AS num FROM logins"));
             $password_count = $row['num'];
 
             // Network Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('network_id') AS num FROM networks"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('network_id') AS num FROM networks"));
             $network_count = $row['num'];
 
             // Certificate Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('certificate_id') AS num FROM certificates"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('certificate_id') AS num FROM certificates"));
             $certificate_count = $row['num'];
 
             // Domain Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('domain_id') AS num FROM domains"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('domain_id') AS num FROM domains"));
             $domain_count = $row['num'];
 
             // Service Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('service_id') AS num FROM services"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('service_id') AS num FROM services"));
             $service_count = $row['num'];
 
             // Client Vendor Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_template = 0 AND vendor_client_id > 0"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_template = 0 AND vendor_client_id > 0"));
             $client_vendor_count = $row['num'];
 
             // Vendor Template Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_template = 1"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_template = 1"));
             $vendor_template_count = $row['num'];
 
             // File Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('file_id') AS num FROM files"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files"));
             $file_count = $row['num'];
 
             // Document Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('document_id') AS num FROM documents WHERE document_template = 0"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_template = 0"));
             $document_count = $row['num'];
 
             // Document Template Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('document_id') AS num FROM documents WHERE document_template = 1"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_template = 1"));
             $document_template_count = $row['num'];
 
             // Shared Item Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('item_id') AS num FROM shared_items"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('item_id') AS num FROM shared_items"));
             $shared_item_count = $row['num'];
 
             // Company Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('company_id') AS num FROM companies"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('company_id') AS num FROM companies"));
             $company_count = $row['num'];
 
             // User Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('user_id') AS num FROM users"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('user_id') AS num FROM users"));
             $user_count = $row['num'];
 
             // Category Expense Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('category_id') AS num FROM categories WHERE category_type = 'Expense'"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('category_id') AS num FROM categories WHERE category_type = 'Expense'"));
             $category_expense_count = $row['num'];
 
             // Category Income Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('category_id') AS num FROM categories WHERE category_type = 'Income'"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('category_id') AS num FROM categories WHERE category_type = 'Income'"));
             $category_income_count = $row['num'];
 
             // Category Referral Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('category_id') AS num FROM categories WHERE category_type = 'Referral'"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('category_id') AS num FROM categories WHERE category_type = 'Referral'"));
             $category_referral_count = $row['num'];
 
             // Category Payment Method Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('category_id') AS num FROM categories WHERE category_type = 'Payment Method'"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('category_id') AS num FROM categories WHERE category_type = 'Payment Method'"));
             $category_payment_method_count = $row['num'];
 
             // Tag Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('tag_id') AS num FROM tags"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('tag_id') AS num FROM tags"));
             $tag_count = $row['num'];
 
             // API Key Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('api_key_id') AS num FROM api_keys"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('api_key_id') AS num FROM api_keys"));
             $api_key_count = $row['num'];
 
             // Log Count
-            $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('log_id') AS num FROM logs"));
+            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('log_id') AS num FROM logs"));
             $log_count = $row['num'];
 
             $postdata = http_build_query(
@@ -668,14 +705,14 @@ while($row = mysqli_fetch_array($sql_companies)){
             $result = file_get_contents('https://telemetry.itflow.org', false, $context);
 
             // Logging
-            mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Cron', log_action = 'Telemetry', log_description = 'Cron sent telemetry results to ITFlow Developers', company_id = $company_id");
+            mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Telemetry', log_description = 'Cron sent telemetry results to ITFlow Developers', company_id = $company_id");
 
         }
 
         //Send Alert to inform Cron was run
-        mysqli_query($mysqli,"INSERT INTO notifications SET notification_type = 'Cron', notification = 'Cron.php successfully executed', notification_timestamp = NOW(), company_id = $company_id");
+        mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Cron', notification = 'Cron.php successfully executed', notification_timestamp = NOW(), company_id = $company_id");
         //Logging
-        mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Cron', log_action = 'Ended', log_description = 'Cron executed successfully for $company_name', company_id = $company_id");
+        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Ended', log_description = 'Cron executed successfully for $company_name', company_id = $company_id");
     } //End Cron Check
 
 } //End Company Loop through
diff --git a/cron_ticket_email_parser.php b/cron_ticket_email_parser.php
index 67881aa2..ea5143a7 100644
--- a/cron_ticket_email_parser.php
+++ b/cron_ticket_email_parser.php
@@ -88,10 +88,19 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $comp
         $email_subject = "Ticket created - [$config_ticket_prefix$ticket_number] - $subject";
         $email_body    = "<i style='color: #808080'>#--itflow--#</i><br><br>Hello, $contact_name<br><br>Thank you for your email. A ticket regarding \"$subject\" has been automatically created for you.<br><br>Ticket: $config_ticket_prefix$ticket_number<br>Subject: $subject<br>Status: Open<br>https://$config_base_url/portal/ticket.php?id=$id<br><br>~<br>$company_name<br>Support Department<br>$config_ticket_from_email<br>$company_phone";
 
-        $mail = sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_password, $config_smtp_encryption, $config_smtp_port,
-            $config_ticket_from_email, $config_ticket_from_name,
-            $contact_email, $contact_name,
-            $email_subject, $email_body);
+        $mail = sendSingleEmail(
+            $config_smtp_host,
+            $config_smtp_username,
+            $config_smtp_password,
+            $config_smtp_encryption,
+            $config_smtp_port,
+            $config_ticket_from_email,
+            $config_ticket_from_name,
+            $contact_email,
+            $contact_name,
+            $email_subject,
+            $email_body
+        );
 
         if ($mail !== true) {
             mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $contact_email', notification_timestamp = NOW(), company_id = $company_id");
@@ -203,7 +212,7 @@ if (array_search("{{$imap_mailbox}}$imap_folder", $list) === false) {
 }
 
 // Search for unread ("UNSEEN") emails
-$emails = imap_search($imap,'UNSEEN');
+$emails = imap_search($imap, 'UNSEEN');
 
 if ($emails) {
 
diff --git a/dashboard_financial.php b/dashboard_financial.php
index 55fc47ff..830f1619 100644
--- a/dashboard_financial.php
+++ b/dashboard_financial.php
@@ -58,17 +58,21 @@ $profit = $total_income - $total_expenses;
 
 $sql_accounts = mysqli_query($mysqli, "SELECT * FROM accounts WHERE company_id = $session_company_id");
 
-$sql_latest_invoice_payments = mysqli_query($mysqli, "SELECT * FROM payments, invoices, clients 
+$sql_latest_invoice_payments = mysqli_query(
+    $mysqli,
+    "SELECT * FROM payments, invoices, clients 
     WHERE payment_invoice_id = invoice_id 
     AND invoice_client_id = client_id
-  AND clients.company_id = $session_company_id
+    AND clients.company_id = $session_company_id
     ORDER BY payment_id DESC LIMIT 5"
 );
 
-$sql_latest_expenses = mysqli_query($mysqli, "SELECT * FROM expenses, vendors, categories 
+$sql_latest_expenses = mysqli_query(
+    $mysqli,
+    "SELECT * FROM expenses, vendors, categories 
     WHERE expense_vendor_id = vendor_id 
     AND expense_category_id = category_id
-  AND expenses.company_id = $session_company_id
+    AND expenses.company_id = $session_company_id
     ORDER BY expense_id DESC LIMIT 5"
 );
 
@@ -194,7 +198,7 @@ $vendors_added = $row['vendors_added'];
         <!-- small box -->
         <a class="small-box bg-secondary" href="trips.php?dtf=<?php echo $year; ?>-01-01&dtt=<?php echo $year; ?>-12-31">
             <div class="inner">
-                <h3><?php echo number_format($total_miles,2); ?></h3>
+                <h3><?php echo number_format($total_miles, 2); ?></h3>
                 <p>Miles Traveled</p>
             </div>
             <div class="icon">
diff --git a/dashboard_technical.php b/dashboard_technical.php
index 62d2a085..442f7f92 100644
--- a/dashboard_technical.php
+++ b/dashboard_technical.php
@@ -9,7 +9,9 @@ if (isset($_GET['year'])) {
 }
 
 // GET unique years from expenses, payments and revenues
-$sql_payment_years = mysqli_query($mysqli, "SELECT YEAR(expense_date) AS all_years FROM expenses
+$sql_payment_years = mysqli_query(
+    $mysqli,
+    "SELECT YEAR(expense_date) AS all_years FROM expenses
     WHERE company_id = $session_company_id
     UNION DISTINCT SELECT YEAR(payment_date) FROM payments WHERE company_id = $session_company_id
     UNION DISTINCT SELECT YEAR(revenue_date) FROM revenues WHERE company_id = $session_company_id
@@ -17,28 +19,36 @@ $sql_payment_years = mysqli_query($mysqli, "SELECT YEAR(expense_date) AS all_yea
 );
 
 // Get Total Clients added
-$sql_clients = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('client_id') AS clients_added FROM clients
+$sql_clients = mysqli_fetch_assoc(mysqli_query(
+    $mysqli,
+    "SELECT COUNT('client_id') AS clients_added FROM clients
     WHERE YEAR(client_created_at) = $year
     AND company_id = $session_company_id"
 ));
 $clients_added = $sql_clients['clients_added'];
 
 // Get Total contacts added
-$sql_contacts = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS contacts_added FROM contacts
+$sql_contacts = mysqli_fetch_assoc(mysqli_query(
+    $mysqli,
+    "SELECT COUNT('contact_id') AS contacts_added FROM contacts
     WHERE YEAR(contact_created_at) = $year
     AND company_id = $session_company_id"
 ));
 $contacts_added = $sql_contacts['contacts_added'];
 
 // Get Total assets added
-$sql_assets = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS assets_added FROM assets
+$sql_assets = mysqli_fetch_assoc(mysqli_query(
+    $mysqli,
+    "SELECT COUNT('asset_id') AS assets_added FROM assets
     WHERE YEAR(asset_created_at) = $year
     AND company_id = $session_company_id"
 ));
 $assets_added = $sql_assets['assets_added'];
 
 // Ticket count
-$sql_tickets = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS active_tickets
+$sql_tickets = mysqli_fetch_assoc(mysqli_query(
+    $mysqli,
+    "SELECT COUNT('ticket_id') AS active_tickets
     FROM tickets
     WHERE ticket_status != 'Closed'
     AND company_id = $session_company_id"
@@ -46,7 +56,9 @@ $sql_tickets = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id
 $active_tickets = $sql_tickets['active_tickets'];
 
 // Expiring domains (but not ones that have already expired)
-$sql_domains_expiring = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('domain_id') as expiring_domains
+$sql_domains_expiring = mysqli_fetch_assoc(mysqli_query(
+    $mysqli,
+    "SELECT COUNT('domain_id') as expiring_domains
     FROM domains
     WHERE domain_expire != '0000-00-00'
     AND domain_expire > CURRENT_DATE
@@ -57,7 +69,9 @@ $sql_domains_expiring = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('
 $expiring_domains = $sql_domains_expiring['expiring_domains'];
 
 // Expiring Certificates (but not ones that have already expired)
-$sql_certs_expiring = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('certificate_id') as expiring_certs
+$sql_certs_expiring = mysqli_fetch_assoc(mysqli_query(
+    $mysqli,
+    "SELECT COUNT('certificate_id') as expiring_certs
     FROM certificates
     WHERE certificate_expire != '0000-00-00'
     AND certificate_expire > CURRENT_DATE
diff --git a/expense_add_modal.php b/expense_add_modal.php
index 36c280d7..3a022fa2 100644
--- a/expense_add_modal.php
+++ b/expense_add_modal.php
@@ -43,28 +43,28 @@
                                     <option value="">- Account -</option>
                                     <?php
 
-                                    $sql = mysqli_query($mysqli,"SELECT * FROM accounts WHERE account_archived_at IS NULL AND company_id = $session_company_id ORDER BY account_name ASC");
+                                    $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL AND company_id = $session_company_id ORDER BY account_name ASC");
                                     while ($row = mysqli_fetch_array($sql)) {
                                         $account_id = $row['account_id'];
                                         $account_name = htmlentities($row['account_name']);
                                         $opening_balance = floatval($row['opening_balance']);
 
-                                        $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
+                                        $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
                                         $row = mysqli_fetch_array($sql_payments);
                                         $total_payments = $row['total_payments'];
 
-                                        $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
+                                        $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
                                         $row = mysqli_fetch_array($sql_revenues);
                                         $total_revenues = $row['total_revenues'];
 
-                                        $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
+                                        $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
                                         $row = mysqli_fetch_array($sql_expenses);
                                         $total_expenses = $row['total_expenses'];
 
                                         $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
 
                                         ?>
-                                        <option <?php if ($config_default_expense_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><div class="float-left"><?php echo $account_name; ?></div><div class="float-right"> [$<?php echo number_format($balance,2); ?>]</div></option>
+                                        <option <?php if ($config_default_expense_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><div class="float-left"><?php echo $account_name; ?></div><div class="float-right"> [$<?php echo number_format($balance, 2); ?>]</div></option>
 
                                         <?php
                                     }
@@ -83,7 +83,7 @@
                                     <option value="">- Vendor -</option>
                                     <?php
 
-                                    $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = 0 AND vendor_template = 0 AND vendor_archived_at IS NULL AND company_id = $session_company_id ORDER BY vendor_name ASC");
+                                    $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = 0 AND vendor_template = 0 AND vendor_archived_at IS NULL AND company_id = $session_company_id ORDER BY vendor_name ASC");
                                     while ($row = mysqli_fetch_array($sql)) {
                                         $vendor_id = $row['vendor_id'];
                                         $vendor_name = htmlentities($row['vendor_name']);
@@ -118,7 +118,7 @@
                                     <option value="">- Category -</option>
                                     <?php
 
-                                    $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC");
+                                    $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Expense' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC");
                                     while ($row = mysqli_fetch_array($sql)) {
                                         $category_id = $row['category_id'];
                                         $category_name = htmlentities($row['category_name']);
diff --git a/expense_copy_modal.php b/expense_copy_modal.php
index c8cc2f84..4f354fe2 100644
--- a/expense_copy_modal.php
+++ b/expense_copy_modal.php
@@ -44,27 +44,27 @@
                                 <select class="form-control select2" name="account" required>
                                     <?php
 
-                                    $sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts WHERE company_id = $session_company_id ORDER BY account_name ASC");
+                                    $sql_accounts = mysqli_query($mysqli, "SELECT * FROM accounts WHERE company_id = $session_company_id ORDER BY account_name ASC");
                                     while ($row = mysqli_fetch_array($sql_accounts)) {
                                         $account_id_select = $row['account_id'];
                                         $account_name_select = htmlentities($row['account_name']);
                                         $opening_balance = floatval($row['opening_balance']);
 
-                                        $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id_select");
+                                        $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id_select");
                                         $row = mysqli_fetch_array($sql_payments);
                                         $total_payments = $row['total_payments'];
 
-                                        $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id_select");
+                                        $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id_select");
                                         $row = mysqli_fetch_array($sql_revenues);
                                         $total_revenues = $row['total_revenues'];
 
-                                        $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id_select");
+                                        $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id_select");
                                         $row = mysqli_fetch_array($sql_expenses);
                                         $total_expenses = $row['total_expenses'];
 
                                         $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
                                         ?>
-                                        <option <?php if ($expense_account_id == $account_id_select) { ?> selected <?php } ?> value="<?php echo $account_id_select; ?>"><?php echo $account_name_select; ?> [$<?php echo number_format($balance,2); ?>]</option>
+                                        <option <?php if ($expense_account_id == $account_id_select) { ?> selected <?php } ?> value="<?php echo $account_id_select; ?>"><?php echo $account_name_select; ?> [$<?php echo number_format($balance, 2); ?>]</option>
                                         <?php
                                     }
 
@@ -82,7 +82,7 @@
                                 <select class="form-control select2" name="vendor" required>
                                     <?php
 
-                                    $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = 0 AND vendor_template = 0 AND company_id = $session_company_id ORDER BY vendor_name ASC");
+                                    $sql_vendors = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = 0 AND vendor_template = 0 AND company_id = $session_company_id ORDER BY vendor_name ASC");
                                     while ($row = mysqli_fetch_array($sql_vendors)) {
                                         $vendor_id_select = $row['vendor_id'];
                                         $vendor_name_select = htmlentities($row['vendor_name']);
@@ -114,7 +114,7 @@
                                 <select class="form-control select2" name="category" required>
                                     <?php
 
-                                    $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense' AND company_id = $session_company_id ORDER BY category_name ASC");
+                                    $sql_categories = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Expense' AND company_id = $session_company_id ORDER BY category_name ASC");
                                     while ($row = mysqli_fetch_array($sql_categories)) {
                                         $category_id_select = $row['category_id'];
                                         $category_name_select = htmlentities($row['category_name']);
diff --git a/expense_edit_modal.php b/expense_edit_modal.php
index 70a81a9b..7b98335e 100644
--- a/expense_edit_modal.php
+++ b/expense_edit_modal.php
@@ -46,28 +46,28 @@
                                 <select class="form-control select2" name="account" required>
                                     <?php
 
-                                    $sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts WHERE (account_archived_at > '$expense_created_at' OR account_archived_at IS NULL) AND company_id = $session_company_id ORDER BY account_name ASC");
+                                    $sql_accounts = mysqli_query($mysqli, "SELECT * FROM accounts WHERE (account_archived_at > '$expense_created_at' OR account_archived_at IS NULL) AND company_id = $session_company_id ORDER BY account_name ASC");
                                     while ($row = mysqli_fetch_array($sql_accounts)) {
                                         $account_id_select = $row['account_id'];
                                         $account_name_select = htmlentities($row['account_name']);
                                         $opening_balance = floatval($row['opening_balance']);
 
-                                        $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id_select");
+                                        $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id_select");
                                         $row = mysqli_fetch_array($sql_payments);
                                         $total_payments = $row['total_payments'];
 
-                                        $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id_select");
+                                        $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id_select");
                                         $row = mysqli_fetch_array($sql_revenues);
                                         $total_revenues = $row['total_revenues'];
 
-                                        $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id_select");
+                                        $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id_select");
                                         $row = mysqli_fetch_array($sql_expenses);
                                         $total_expenses = $row['total_expenses'];
 
                                         $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
 
                                         ?>
-                                        <option <?php if ($expense_account_id == $account_id_select) { ?> selected <?php } ?> value="<?php echo $account_id_select; ?>"><?php echo $account_name_select; ?> [$<?php echo number_format($balance,2); ?>]</option>
+                                        <option <?php if ($expense_account_id == $account_id_select) { ?> selected <?php } ?> value="<?php echo $account_id_select; ?>"><?php echo $account_name_select; ?> [$<?php echo number_format($balance, 2); ?>]</option>
                                         <?php
                                     }
 
@@ -85,7 +85,7 @@
                                 <select class="form-control select2" name="vendor" required>
                                     <?php
 
-                                    $sql_select = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = 0 AND vendor_template = 0 AND (vendor_archived_at > '$expense_created_at' OR vendor_archived_at IS NULL) AND company_id = $session_company_id ORDER BY vendor_name ASC");
+                                    $sql_select = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = 0 AND vendor_template = 0 AND (vendor_archived_at > '$expense_created_at' OR vendor_archived_at IS NULL) AND company_id = $session_company_id ORDER BY vendor_name ASC");
                                     while ($row = mysqli_fetch_array($sql_select)) {
                                         $vendor_id_select = $row['vendor_id'];
                                         $vendor_name_select = htmlentities($row['vendor_name']);
@@ -120,7 +120,7 @@
                                 <select class="form-control select2" name="category" required>
                                     <?php
 
-                                    $sql_select = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense' AND (category_archived_at > '$expense_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC");
+                                    $sql_select = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Expense' AND (category_archived_at > '$expense_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC");
                                     while ($row = mysqli_fetch_array($sql_select)) {
                                         $category_id_select = $row['category_id'];
                                         $category_name_select = htmlentities($row['category_name']);
diff --git a/expenses.php b/expenses.php
index 3da2935d..89aa47da 100644
--- a/expenses.php
+++ b/expenses.php
@@ -5,7 +5,7 @@ require_once("inc_all.php");
 //$o = "DESC";
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "expense_date";
 }
@@ -24,41 +24,41 @@ if (empty($_GET['canned_date'])) {
 
 //Date Filter
 if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
-    $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf']));
-    $dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt']));
+    $dtf = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtf']));
+    $dtt = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtt']));
 } elseif ($_GET['canned_date'] == "today") {
     $dtf = date('Y-m-d');
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "yesterday") {
-    $dtf = date('Y-m-d',strtotime("yesterday"));
-    $dtt = date('Y-m-d',strtotime("yesterday"));
+    $dtf = date('Y-m-d', strtotime("yesterday"));
+    $dtt = date('Y-m-d', strtotime("yesterday"));
 } elseif ($_GET['canned_date'] == "thisweek") {
-    $dtf = date('Y-m-d',strtotime("monday this week"));
+    $dtf = date('Y-m-d', strtotime("monday this week"));
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastweek") {
-    $dtf = date('Y-m-d',strtotime("monday last week"));
-    $dtt = date('Y-m-d',strtotime("sunday last week"));
+    $dtf = date('Y-m-d', strtotime("monday last week"));
+    $dtt = date('Y-m-d', strtotime("sunday last week"));
 } elseif ($_GET['canned_date'] == "thismonth") {
     $dtf = date('Y-m-01');
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastmonth") {
-    $dtf = date('Y-m-d',strtotime("first day of last month"));
-    $dtt = date('Y-m-d',strtotime("last day of last month"));
+    $dtf = date('Y-m-d', strtotime("first day of last month"));
+    $dtt = date('Y-m-d', strtotime("last day of last month"));
 } elseif ($_GET['canned_date'] == "thisyear") {
     $dtf = date('Y-01-01');
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastyear") {
-    $dtf = date('Y-m-d',strtotime("first day of january last year"));
-    $dtt = date('Y-m-d',strtotime("last day of december last year"));
+    $dtf = date('Y-m-d', strtotime("first day of january last year"));
+    $dtt = date('Y-m-d', strtotime("last day of december last year"));
 } else {
     $dtf = "0000-00-00";
     $dtt = "9999-00-00";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM expenses
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM expenses
   LEFT JOIN categories ON expense_category_id = category_id
   LEFT JOIN vendors ON expense_vendor_id = vendor_id
   LEFT JOIN accounts ON expense_account_id = account_id
@@ -68,7 +68,7 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM expenses
   AND (vendor_name LIKE '%$q%' OR category_name LIKE '%$q%' OR account_name LIKE '%$q%' OR expense_description LIKE '%$q%' OR expense_amount LIKE '%$q%')
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
@@ -176,7 +176,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                             <td><?php echo $receipt_attached; ?> <a class="text-dark" href="#" data-toggle="modal" data-target="#editExpenseModal<?php echo $expense_id; ?>"><?php echo $expense_date; ?></a></td>
                             <td><?php echo $vendor_name; ?></td>
                             <td><?php echo $category_name; ?></td>
-                            <td><?php echo truncate($expense_description,50); ?></td>
+                            <td><?php echo truncate($expense_description, 50); ?></td>
                             <td class="text-right"><?php echo numfmt_format_currency($currency_format, $expense_amount, $expense_currency_code); ?></td>
                             <td><?php echo $account_name; ?></td>
                             <td>
diff --git a/functions.php b/functions.php
index 5c40b7e2..c9f1f28e 100644
--- a/functions.php
+++ b/functions.php
@@ -50,7 +50,7 @@ function initials($str) {
         $ret = '';
         foreach (explode(' ', $str) as $word)
             $ret .= strtoupper($word[0]);
-        $ret = substr($ret,0, 2);
+        $ret = substr($ret, 0, 2);
         return $ret;
     }
 }
@@ -139,7 +139,7 @@ function getDevice() {
     if (preg_match('/(up.browser|up.link|mmp|symbian|smartphone|midp|wap|phone|android|iemobile)/i', strtolower($_SERVER['HTTP_USER_AGENT']))) {
         $mobile_browser++;
     }
-    if ((strpos(strtolower($_SERVER['HTTP_ACCEPT']),'application/vnd.wap.xhtml+xml') > 0) || ((isset($_SERVER['HTTP_X_WAP_PROFILE']) || isset($_SERVER['HTTP_PROFILE'])))) {
+    if ((strpos(strtolower($_SERVER['HTTP_ACCEPT']), 'application/vnd.wap.xhtml+xml') > 0) || ((isset($_SERVER['HTTP_X_WAP_PROFILE']) || isset($_SERVER['HTTP_PROFILE'])))) {
         $mobile_browser++;
     }
     $mobile_ua = strtolower(substr(getUserAgent(), 0, 4));
@@ -153,10 +153,10 @@ function getDevice() {
         'sie-','siem','smal','smar','sony','sph-','symb','t-mo','teli','tim-',
         'tosh','tsm-','upg1','upsi','vk-v','voda','wap-','wapa','wapi','wapp',
         'wapr','webc','winw','winw','xda ','xda-');
-    if (in_array($mobile_ua,$mobile_agents)) {
+    if (in_array($mobile_ua, $mobile_agents)) {
         $mobile_browser++;
     }
-    if (strpos(strtolower(getUserAgent()),'opera mini') > 0) {
+    if (strpos(strtolower(getUserAgent()), 'opera mini') > 0) {
         $mobile_browser++;
         //Check for tablets on Opera Mini alternative headers
         $stock_ua = strtolower(isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA'])?$_SERVER['HTTP_X_OPERAMINI_PHONE_UA']:(isset($_SERVER['HTTP_DEVICE_STOCK_UA'])?$_SERVER['HTTP_DEVICE_STOCK_UA']:''));
@@ -183,13 +183,13 @@ function truncate($text, $chars) {
         return $text;
     }
     $text = $text." ";
-    $text = substr($text,0,$chars);
-    $text = substr($text,0,strrpos($text,' '));
+    $text = substr($text, 0, $chars);
+    $text = substr($text, 0, strrpos($text, ' '));
     return $text."...";
 }
 
 function formatPhoneNumber($phoneNumber) {
-    $phoneNumber = preg_replace('/[^0-9]/','',$phoneNumber);
+    $phoneNumber = preg_replace('/[^0-9]/', '', $phoneNumber);
 
     if (strlen($phoneNumber) > 10) {
         $countryCode = substr($phoneNumber, 0, strlen($phoneNumber)-10);
@@ -358,8 +358,8 @@ function getDomainExpirationDate($name) {
 
     $ch = curl_init();
     curl_setopt($ch, CURLOPT_URL, "http://lookup.itflow.org:8080/$name");
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);
-    $response = json_decode(curl_exec($ch),1);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    $response = json_decode(curl_exec($ch), 1);
 
     if ($response) {
         if (is_array($response['expiration_date'])) {
diff --git a/get_credential.php b/get_credential.php
index 86e423a2..b8a25497 100644
--- a/get_credential.php
+++ b/get_credential.php
@@ -30,8 +30,8 @@ require_once("config.php");
 require_once("functions.php");
 
 // IP & User Agent for logging
-$ip = strip_tags(mysqli_real_escape_string($mysqli,getIP()));
-$user_agent = strip_tags(mysqli_real_escape_string($mysqli,$_SERVER['HTTP_USER_AGENT']));
+$ip = strip_tags(mysqli_real_escape_string($mysqli, getIP()));
+$user_agent = strip_tags(mysqli_real_escape_string($mysqli, $_SERVER['HTTP_USER_AGENT']));
 
 // Define wording for the user
 DEFINE("WORDING_ROLECHECK_FAILED", "ITFlow - You are not permitted to use this application!");
diff --git a/get_settings.php b/get_settings.php
index d7e0b437..ee13fa91 100644
--- a/get_settings.php
+++ b/get_settings.php
@@ -1,7 +1,7 @@
 <?php
 
 // Query Settings
-$sql_settings = mysqli_query($mysqli,"SELECT * FROM settings WHERE company_id = $session_company_id");
+$sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE company_id = $session_company_id");
 $row = mysqli_fetch_array($sql_settings);
 
 // Database version
diff --git a/global_search.php b/global_search.php
index 5b0f1292..564aa7b7 100644
--- a/global_search.php
+++ b/global_search.php
@@ -4,22 +4,22 @@ require_once("inc_all.php");
 
 if (isset($_GET['query'])) {
 
-    $query = trim(strip_tags(mysqli_real_escape_string($mysqli,$_GET['query'])));
+    $query = trim(strip_tags(mysqli_real_escape_string($mysqli, $_GET['query'])));
 
-    $phone_query = preg_replace("/[^0-9]/", '',$query);
+    $phone_query = preg_replace("/[^0-9]/", '', $query);
     if (empty($phone_query)) {
         $phone_query = $query;
     }
 
     $ticket_num_query = str_replace("$config_ticket_prefix", "", "$query");
 
-    $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN locations ON clients.primary_location = locations.location_id WHERE client_name LIKE '%$query%' AND clients.company_id = $session_company_id ORDER BY client_id DESC LIMIT 5");
-    $sql_contacts = mysqli_query($mysqli,"SELECT * FROM contacts LEFT JOIN clients ON client_id = contact_client_id WHERE (contact_name LIKE '%$query%' OR contact_title LIKE '%$query%' OR contact_email LIKE '%$query%' OR contact_phone LIKE '%$phone_query%' OR contact_mobile LIKE '%$phone_query%') AND contacts.company_id = $session_company_id ORDER BY contact_id DESC LIMIT 5");
-    $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE (vendor_name LIKE '%$query%' OR vendor_phone LIKE '%$phone_query%') AND company_id = $session_company_id ORDER BY vendor_id DESC LIMIT 5");
-    $sql_products = mysqli_query($mysqli,"SELECT * FROM products WHERE product_name LIKE '%$query%' AND company_id = $session_company_id ORDER BY product_id DESC LIMIT 5");
+    $sql_clients = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN locations ON clients.primary_location = locations.location_id WHERE client_name LIKE '%$query%' AND clients.company_id = $session_company_id ORDER BY client_id DESC LIMIT 5");
+    $sql_contacts = mysqli_query($mysqli, "SELECT * FROM contacts LEFT JOIN clients ON client_id = contact_client_id WHERE (contact_name LIKE '%$query%' OR contact_title LIKE '%$query%' OR contact_email LIKE '%$query%' OR contact_phone LIKE '%$phone_query%' OR contact_mobile LIKE '%$phone_query%') AND contacts.company_id = $session_company_id ORDER BY contact_id DESC LIMIT 5");
+    $sql_vendors = mysqli_query($mysqli, "SELECT * FROM vendors WHERE (vendor_name LIKE '%$query%' OR vendor_phone LIKE '%$phone_query%') AND company_id = $session_company_id ORDER BY vendor_id DESC LIMIT 5");
+    $sql_products = mysqli_query($mysqli, "SELECT * FROM products WHERE product_name LIKE '%$query%' AND company_id = $session_company_id ORDER BY product_id DESC LIMIT 5");
     $sql_documents = mysqli_query($mysqli, "SELECT * FROM documents LEFT JOIN clients on document_client_id = clients.client_id WHERE MATCH(document_content_raw) AGAINST ('$query') AND documents.company_id = $session_company_id ORDER BY document_id DESC LIMIT 5");
     $sql_tickets = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN clients on tickets.ticket_client_id = clients.client_id WHERE (ticket_subject LIKE '%$query%' OR ticket_number = '$ticket_num_query') AND tickets.company_id = $session_company_id ORDER BY ticket_id DESC LIMIT 5");
-    $sql_logins = mysqli_query($mysqli,"SELECT * FROM logins WHERE login_name LIKE '%$query%' AND company_id = $session_company_id ORDER BY login_id DESC LIMIT 5");
+    $sql_logins = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_name LIKE '%$query%' AND company_id = $session_company_id ORDER BY login_id DESC LIMIT 5");
 
     $q = htmlentities($_GET['query']);
     ?>
diff --git a/guest_download_file.php b/guest_download_file.php
index cf1ff992..596555d5 100644
--- a/guest_download_file.php
+++ b/guest_download_file.php
@@ -3,12 +3,12 @@
 require_once("config.php");
 require_once("functions.php");
 
-$ip = trim(strip_tags(mysqli_real_escape_string($mysqli,getIP())));
-$user_agent = strip_tags(mysqli_real_escape_string($mysqli,$_SERVER['HTTP_USER_AGENT']));
+$ip = trim(strip_tags(mysqli_real_escape_string($mysqli, getIP())));
+$user_agent = strip_tags(mysqli_real_escape_string($mysqli, $_SERVER['HTTP_USER_AGENT']));
 
 if (isset($_GET['id']) && isset($_GET['key'])) {
     $item_id = intval($_GET['id']);
-    $item_key = trim(strip_tags(mysqli_real_escape_string($mysqli,$_GET['key'])));
+    $item_key = trim(strip_tags(mysqli_real_escape_string($mysqli, $_GET['key'])));
 
     $sql = mysqli_query($mysqli, "SELECT * FROM shared_items WHERE item_id = '$item_id' AND item_key = '$item_key' AND item_expire_at > NOW() LIMIT 1");
     $row = mysqli_fetch_array($sql);
@@ -62,6 +62,6 @@ if (isset($_GET['id']) && isset($_GET['key'])) {
     mysqli_query($mysqli, "UPDATE shared_items SET item_views = '$new_item_views' WHERE item_id = '$item_id'");
 
     // Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Sharing', log_action = 'View', log_description = 'Downloaded shared file $file_name via link', log_client_id = '$client_id', log_created_at = NOW(), log_ip = '$ip', log_user_agent = '$user_agent', company_id = '1'");
+    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Sharing', log_action = 'View', log_description = 'Downloaded shared file $file_name via link', log_client_id = '$client_id', log_created_at = NOW(), log_ip = '$ip', log_user_agent = '$user_agent', company_id = '1'");
 
 }
diff --git a/guest_pay_invoice_stripe.php b/guest_pay_invoice_stripe.php
index b3d2e8bc..8230ca76 100644
--- a/guest_pay_invoice_stripe.php
+++ b/guest_pay_invoice_stripe.php
@@ -275,10 +275,18 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent
         $subject = "Payment Received - Invoice $invoice_prefix$invoice_number";
         $body    = "Hello $contact_name,<br><br>We have received your payment in the amount of " . $pi_currency . $pi_amount_paid . " for invoice <a href='https://$config_base_url/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key'>$invoice_prefix$invoice_number</a>. Please keep this email as a receipt for your records.<br><br>Amount: " . numfmt_format_currency($currency_format, $pi_amount_paid, $invoice_currency_code) . "<br>Balance: " . numfmt_format_currency($currency_format, '0', $invoice_currency_code) . "<br><br>Thank you for your business!<br><br><br>~<br>$company_name<br>Billing Department<br>$config_invoice_from_email<br>$company_phone";
 
-        $mail = sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_password, $config_smtp_encryption, $config_smtp_port,
-            $config_invoice_from_email, $config_invoice_from_name,
-            $contact_email, $contact_name,
-            $subject, $body
+        $mail = sendSingleEmail(
+            $config_smtp_host,
+            $config_smtp_username,
+            $config_smtp_password,
+            $config_smtp_encryption,
+            $config_smtp_port,
+            $config_invoice_from_email,
+            $config_invoice_from_name,
+            $contact_email,
+            $contact_name,
+            $subject,
+            $body
         );
 
         // Email Logging
diff --git a/guest_post.php b/guest_post.php
index 002ed06c..a8c5ad62 100644
--- a/guest_post.php
+++ b/guest_post.php
@@ -9,15 +9,15 @@ if (isset($_GET['accept_quote'], $_GET['company_id'], $_GET['url_key'])) {
 
     $quote_id = intval($_GET['accept_quote']);
     $company_id = intval($_GET['company_id']);
-    $url_key = mysqli_real_escape_string($mysqli,$_GET['url_key']);
+    $url_key = mysqli_real_escape_string($mysqli, $_GET['url_key']);
 
-    $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id AND quote_url_key = '$url_key' AND company_id = $company_id");
+    $sql = mysqli_query($mysqli, "SELECT * FROM quotes WHERE quote_id = $quote_id AND quote_url_key = '$url_key' AND company_id = $company_id");
 
     if (mysqli_num_rows($sql) == 1) {
 
-        mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Accepted' WHERE quote_id = $quote_id");
+        mysqli_query($mysqli, "UPDATE quotes SET quote_status = 'Accepted' WHERE quote_id = $quote_id");
 
-        mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Accepted', history_description = 'Client accepted Quote!', history_created_at = NOW(), history_quote_id = $quote_id, company_id = $company_id");
+        mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Accepted', history_description = 'Client accepted Quote!', history_created_at = NOW(), history_quote_id = $quote_id, company_id = $company_id");
 
         $_SESSION['alert_message'] = "Quote Accepted";
 
@@ -32,15 +32,15 @@ if (isset($_GET['decline_quote'], $_GET['company_id'], $_GET['url_key'])) {
 
     $quote_id = intval($_GET['decline_quote']);
     $company_id = intval($_GET['company_id']);
-    $url_key = mysqli_real_escape_string($mysqli,$_GET['url_key']);
+    $url_key = mysqli_real_escape_string($mysqli, $_GET['url_key']);
 
-    $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id AND quote_url_key = '$url_key' AND quote_url_key = '$url_key' AND company_id = $company_id");
+    $sql = mysqli_query($mysqli, "SELECT * FROM quotes WHERE quote_id = $quote_id AND quote_url_key = '$url_key' AND quote_url_key = '$url_key' AND company_id = $company_id");
 
     if (mysqli_num_rows($sql) == 1) {
 
-        mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Declined' WHERE quote_id = $quote_id");
+        mysqli_query($mysqli, "UPDATE quotes SET quote_status = 'Declined' WHERE quote_id = $quote_id");
 
-        mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Declined', history_description = 'Client declined Quote!', history_created_at = NOW(), history_quote_id = $quote_id, company_id = $company_id");
+        mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Declined', history_description = 'Client declined Quote!', history_created_at = NOW(), history_quote_id = $quote_id, company_id = $company_id");
 
         $_SESSION['alert_type'] = "danger";
         $_SESSION['alert_message'] = "Quote Declined";
diff --git a/guest_view_item.php b/guest_view_item.php
index efd24195..f259fb4b 100644
--- a/guest_view_item.php
+++ b/guest_view_item.php
@@ -18,7 +18,7 @@ if (!isset($_GET['id']) || !isset($_GET['key'])) {
 }
 
 $item_id = intval($_GET['id']);
-$item_key = trim(strip_tags(mysqli_real_escape_string($mysqli,$_GET['key'])));
+$item_key = trim(strip_tags(mysqli_real_escape_string($mysqli, $_GET['key'])));
 
 $sql = mysqli_query($mysqli, "SELECT * FROM shared_items WHERE item_id = '$item_id' AND item_key = '$item_key' AND item_expire_at > NOW() LIMIT 1");
 $row = mysqli_fetch_array($sql);
@@ -77,7 +77,7 @@ if ($item_type == "Document") {
 
     // Logging
     $name = mysqli_real_escape_string($mysqli, $doc_title);
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Sharing', log_action = 'View', log_description = 'Viewed shared $item_type $name via link', log_client_id = '$client_id', log_created_at = NOW(), log_ip = '$ip', log_user_agent = '$user_agent', company_id = '1'");
+    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Sharing', log_action = 'View', log_description = 'Viewed shared $item_type $name via link', log_client_id = '$client_id', log_created_at = NOW(), log_ip = '$ip', log_user_agent = '$user_agent', company_id = '1'");
 
 } elseif ($item_type == "File") {
     $file_sql = mysqli_query($mysqli, "SELECT * FROM files WHERE file_id = '$item_related_id' AND file_client_id = '$client_id' LIMIT 1");
@@ -142,7 +142,7 @@ if ($item_type == "Document") {
 
     // Logging
     $name = mysqli_real_escape_string($mysqli, $login_name);
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Sharing', log_action = 'View', log_description = 'Viewed shared $item_type $name via link', log_client_id = '$client_id', log_created_at = NOW(), log_ip = '$ip', log_user_agent = '$user_agent', company_id = '1'");
+    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Sharing', log_action = 'View', log_description = 'Viewed shared $item_type $name via link', log_client_id = '$client_id', log_created_at = NOW(), log_ip = '$ip', log_user_agent = '$user_agent', company_id = '1'");
 
 }
 
diff --git a/guest_view_quote.php b/guest_view_quote.php
index 8d1e87dc..ac3b05f9 100644
--- a/guest_view_quote.php
+++ b/guest_view_quote.php
@@ -79,15 +79,15 @@ $currency_format = numfmt_create($company_locale, NumberFormatter::CURRENCY);
 
 //Update status to Viewed only if invoice_status = "Sent"
 if ($quote_status == 'Sent') {
-    mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Viewed' WHERE quote_id = $quote_id");
+    mysqli_query($mysqli, "UPDATE quotes SET quote_status = 'Viewed' WHERE quote_id = $quote_id");
 }
 
 //Mark viewed in history
-mysqli_query($mysqli,"INSERT INTO history SET history_status = '$quote_status', history_description = 'Quote viewed - $ip - $os - $browser', history_created_at = NOW(), history_quote_id = $quote_id, company_id = $company_id");
+mysqli_query($mysqli, "INSERT INTO history SET history_status = '$quote_status', history_description = 'Quote viewed - $ip - $os - $browser', history_created_at = NOW(), history_quote_id = $quote_id, company_id = $company_id");
 
 if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Viewed") {
     $client_name_escaped = mysqli_escape_string($mysqli, $row['client_name']);
-    mysqli_query($mysqli,"INSERT INTO notifications SET notification_type = 'Quote Viewed', notification = 'Quote $quote_prefix$quote_number has been viewed by $client_name_escaped - $ip - $os - $browser', notification_timestamp = NOW(), notification_client_id = $client_id, company_id = $company_id");
+    mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Quote Viewed', notification = 'Quote $quote_prefix$quote_number has been viewed by $client_name_escaped - $ip - $os - $browser', notification_timestamp = NOW(), notification_client_id = $client_id, company_id = $company_id");
 }
 
 ?>
@@ -159,7 +159,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
                 </div>
             </div>
 
-            <?php $sql_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_quote_id = $quote_id ORDER BY item_id ASC"); ?>
+            <?php $sql_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_quote_id = $quote_id ORDER BY item_id ASC"); ?>
 
             <div class="row mb-4">
                 <div class="col-md-12">
@@ -390,7 +390,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
                             $total_tax = 0;
                             $sub_total = 0;
 
-                            $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_quote_id = $quote_id ORDER BY item_id ASC");
+                            $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_quote_id = $quote_id ORDER BY item_id ASC");
 
                             while ($row = mysqli_fetch_array($sql_invoice_items)) {
                             $item_name = $row['item_name'];
diff --git a/inc_all_client.php b/inc_all_client.php
index 153a0857..a65f0e04 100644
--- a/inc_all_client.php
+++ b/inc_all_client.php
@@ -9,9 +9,9 @@ require_once("top_nav.php");
 if (isset($_GET['client_id'])) {
   $client_id = intval($_GET['client_id']);
 
-  $sql = mysqli_query($mysqli,"UPDATE clients SET client_accessed_at = NOW() WHERE client_id = $client_id AND company_id = $session_company_id");
+  $sql = mysqli_query($mysqli, "UPDATE clients SET client_accessed_at = NOW() WHERE client_id = $client_id AND company_id = $session_company_id");
 
-  $sql = mysqli_query($mysqli,"SELECT * FROM clients
+  $sql = mysqli_query($mysqli, "SELECT * FROM clients
     LEFT JOIN locations ON primary_location = location_id AND location_archived_at IS NULL
     LEFT JOIN contacts ON primary_contact = contact_id AND contact_archived_at IS NULL
     WHERE client_id = $client_id 
@@ -56,7 +56,7 @@ if (isset($_GET['client_id'])) {
 
     $client_tag_name_display_array = array();
     $client_tag_id_array = array();
-    $sql_client_tags = mysqli_query($mysqli,"SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_tags.client_id = $client_id");
+    $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_tags.client_id = $client_id");
     while ($row = mysqli_fetch_array($sql_client_tags)) {
 
       $client_tag_id = $row['tag_id'];
@@ -73,12 +73,12 @@ if (isset($_GET['client_id'])) {
     $client_tags_display = "<i class='fa fa-fw fa-tag text-secondary ml-1 mr-2 mb-2'></i> " . implode('', $client_tag_name_display_array);
 
     //Add up all the payments for the invoice and get the total amount paid to the invoice
-    $sql_invoice_amounts = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled'");
+    $sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled'");
     $row = mysqli_fetch_array($sql_invoice_amounts);
 
     $invoice_amounts = $row['invoice_amounts'];
 
-    $sql_amount_paid = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id");
+    $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id");
     $row = mysqli_fetch_array($sql_amount_paid);
 
     $amount_paid = $row['amount_paid'];
@@ -86,13 +86,13 @@ if (isset($_GET['client_id'])) {
     $balance = $invoice_amounts - $amount_paid;
 
     //Get Monthly Recurring Total
-    $sql_recurring_monthly_total = mysqli_query($mysqli,"SELECT SUM(recurring_amount) AS recurring_monthly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'month' AND recurring_client_id = $client_id AND company_id = $session_company_id");
+    $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_monthly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'month' AND recurring_client_id = $client_id AND company_id = $session_company_id");
     $row = mysqli_fetch_array($sql_recurring_monthly_total);
 
     $recurring_monthly_total = $row['recurring_monthly_total'];
 
     //Get Yearly Recurring Total
-    $sql_recurring_yearly_total = mysqli_query($mysqli,"SELECT SUM(recurring_amount) AS recurring_yearly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'year' AND recurring_client_id = $client_id AND company_id = $session_company_id");
+    $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_yearly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'year' AND recurring_client_id = $client_id AND company_id = $session_company_id");
     $row = mysqli_fetch_array($sql_recurring_yearly_total);
 
     $recurring_yearly_total = $row['recurring_yearly_total'] / 12;
@@ -101,91 +101,93 @@ if (isset($_GET['client_id'])) {
 
     //Badge Counts
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id"));
     $num_contacts = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('location_id') AS num FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('location_id') AS num FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id"));
     $num_locations = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('asset_id') AS num FROM assets WHERE asset_archived_at IS NULL AND asset_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_archived_at IS NULL AND asset_client_id = $client_id"));
     $num_assets = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_status != 'Closed' AND ticket_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_status != 'Closed' AND ticket_client_id = $client_id"));
     $num_active_tickets = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_status = 'Closed' AND ticket_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_status = 'Closed' AND ticket_client_id = $client_id"));
     $num_closed_tickets = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('service_id') AS num FROM services WHERE service_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('service_id') AS num FROM services WHERE service_client_id = $client_id"));
     $num_services = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id AND vendor_template = 0"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id AND vendor_template = 0"));
     $num_vendors = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('login_id') AS num FROM logins WHERE login_archived_at IS NULL AND login_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('login_id') AS num FROM logins WHERE login_archived_at IS NULL AND login_client_id = $client_id"));
     $num_logins = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('network_id') AS num FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('network_id') AS num FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id"));
     $num_networks = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('domain_id') AS num FROM domains WHERE domain_archived_at IS NULL AND domain_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('domain_id') AS num FROM domains WHERE domain_archived_at IS NULL AND domain_client_id = $client_id"));
     $num_domains = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('certificate_id') AS num FROM certificates WHERE certificate_archived_at IS NULL AND certificate_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('certificate_id') AS num FROM certificates WHERE certificate_archived_at IS NULL AND certificate_client_id = $client_id"));
     $num_certificates = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('software_id') AS num FROM software WHERE software_archived_at IS NULL AND software_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_archived_at IS NULL AND software_client_id = $client_id"));
     $num_software = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE (invoice_status = 'Sent' OR invoice_status = 'Viewed' OR invoice_status = 'Partial') AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE (invoice_status = 'Sent' OR invoice_status = 'Viewed' OR invoice_status = 'Partial') AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
     $num_invoices_open = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Draft' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Draft' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
     $num_invoices_draft = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
     $num_invoices_sent = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Viewed' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Viewed' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
     $num_invoices_viewed = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Partial' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Partial' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
     $num_invoices_partial = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Paid' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Paid' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
     $num_invoices_paid = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
     $num_invoices = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('quote_id') AS num FROM quotes WHERE quote_archived_at IS NULL AND quote_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('quote_id') AS num FROM quotes WHERE quote_archived_at IS NULL AND quote_client_id = $client_id"));
     $num_quotes = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('recurring_id') AS num FROM recurring WHERE recurring_archived_at IS NULL AND recurring_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS num FROM recurring WHERE recurring_archived_at IS NULL AND recurring_client_id = $client_id"));
     $num_recurring = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('payment_id') AS num FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('payment_id') AS num FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id"));
     $num_payments = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('file_id') AS num FROM files WHERE file_archived_at IS NULL AND file_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files WHERE file_archived_at IS NULL AND file_client_id = $client_id"));
     $num_files = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('document_id') AS num FROM documents WHERE document_archived_at IS NULL AND document_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_archived_at IS NULL AND document_client_id = $client_id"));
     $num_documents = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('event_id') AS num FROM events WHERE event_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('event_id') AS num FROM events WHERE event_client_id = $client_id"));
     $num_events = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('trip_id') AS num FROM trips WHERE trip_archived_at IS NULL AND trip_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('trip_id') AS num FROM trips WHERE trip_archived_at IS NULL AND trip_client_id = $client_id"));
     $num_trips = $row['num'];
 
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('item_id') AS num FROM shared_items WHERE item_client_id = $client_id"));
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('item_id') AS num FROM shared_items WHERE item_client_id = $client_id"));
     $num_shared_links = $row['num'];
 
     // Expiring Items
 
     // Count Domains Expiring within 30 Days
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('domain_id') AS num FROM domains
+    $row = mysqli_fetch_assoc(mysqli_query(
+        $mysqli,
+        "SELECT COUNT('domain_id') AS num FROM domains
       WHERE domain_client_id = $client_id
       AND domain_expire != '0000-00-00'
       AND domain_expire < CURRENT_DATE + INTERVAL 30 DAY
@@ -195,7 +197,9 @@ if (isset($_GET['client_id'])) {
     $num_domains_expiring = $row['num'];
 
     // Count Certificates Expiring within 30 Days
-    $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('certificate_id') AS num FROM certificates
+    $row = mysqli_fetch_assoc(mysqli_query(
+        $mysqli,
+        "SELECT COUNT('certificate_id') AS num FROM certificates
       WHERE certificate_client_id = $client_id
       AND certificate_expire != '0000-00-00'
       AND certificate_expire < CURRENT_DATE + INTERVAL 30 DAY
@@ -205,7 +209,9 @@ if (isset($_GET['client_id'])) {
     $num_certs_expiring = $row['num'];
 
     // Get Asset Warranties Expiring
-    $sql_asset_warranties_expiring = mysqli_query($mysqli,"SELECT * FROM assets
+    $sql_asset_warranties_expiring = mysqli_query(
+        $mysqli,
+        "SELECT * FROM assets
       WHERE asset_client_id = $client_id
       AND asset_warranty_expire != '0000-00-00'
       AND asset_archived_at IS NULL  
@@ -214,7 +220,9 @@ if (isset($_GET['client_id'])) {
     );
 
     // Get Assets Retiring
-    $sql_asset_retire = mysqli_query($mysqli,"SELECT * FROM assets
+    $sql_asset_retire = mysqli_query(
+        $mysqli,
+        "SELECT * FROM assets
       WHERE asset_client_id = $client_id
       AND asset_install_date != '0000-00-00'
       AND asset_archived_at IS NULL 
@@ -223,7 +231,9 @@ if (isset($_GET['client_id'])) {
     );
 
     // Get Stale Tickets
-    $sql_tickets_stale = mysqli_query($mysqli,"SELECT * FROM tickets
+    $sql_tickets_stale = mysqli_query(
+        $mysqli,
+        "SELECT * FROM tickets
       WHERE ticket_client_id = $client_id
       AND ticket_created_at < CURRENT_DATE - INTERVAL 14 DAY
       AND ticket_status != 'Closed'
diff --git a/invoice_add_modal.php b/invoice_add_modal.php
index 2ebda3c1..2068981d 100644
--- a/invoice_add_modal.php
+++ b/invoice_add_modal.php
@@ -24,7 +24,7 @@
                                     <option value="">- Client -</option>
                                     <?php
 
-                                    $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
+                                    $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
                                     while ($row = mysqli_fetch_array($sql)) {
                                         $client_id = $row['client_id'];
                                         $client_name = htmlentities($row['client_name']);
@@ -60,7 +60,7 @@
                                 <option value="">- Category -</option>
                                 <?php
 
-                                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC");
+                                $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC");
                                 while ($row = mysqli_fetch_array($sql)) {
                                     $category_id = $row['category_id'];
                                     $category_name = htmlentities($row['category_name']);
diff --git a/invoice_edit_modal.php b/invoice_edit_modal.php
index 0d73c4c8..e56ca9be 100644
--- a/invoice_edit_modal.php
+++ b/invoice_edit_modal.php
@@ -42,7 +42,7 @@
                 <option value="">- Category -</option>
                 <?php 
                 
-                $sql_income_category = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$invoice_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC"); 
+                $sql_income_category = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$invoice_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC"); 
                 while ($row = mysqli_fetch_array($sql_income_category)) {
                   $category_id_select= $row['category_id'];
                   $category_name_select = htmlentities($row['category_name']);
diff --git a/invoice_payment_add_modal.php b/invoice_payment_add_modal.php
index 92ca263c..3e18438b 100644
--- a/invoice_payment_add_modal.php
+++ b/invoice_payment_add_modal.php
@@ -54,28 +54,28 @@
                 <option value="">- Account -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM accounts WHERE account_archived_at IS NULL AND company_id = $session_company_id ORDER BY account_name ASC"); 
+                $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL AND company_id = $session_company_id ORDER BY account_name ASC"); 
                 while ($row = mysqli_fetch_array($sql)) {
                   $account_id = $row['account_id'];
                   $account_name = htmlentities($row['account_name']);
                   $opening_balance = $row['opening_balance'];
                   
-                  $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
+                  $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
                   $row = mysqli_fetch_array($sql_payments);
                   $total_payments = $row['total_payments'];
                   
-                  $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
+                  $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
                   $row = mysqli_fetch_array($sql_revenues);
                   $total_revenues = $row['total_revenues'];
 
-                  $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
+                  $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
                   $row = mysqli_fetch_array($sql_expenses);
                   $total_expenses = $row['total_expenses'];
 
                   $account_balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
                   
                 ?>
-                  <option <?php if ($config_default_payment_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($account_balance,2); ?>]</option>
+                  <option <?php if ($config_default_payment_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($account_balance, 2); ?>]</option>
                 
                 <?php
                 }
@@ -94,7 +94,7 @@
                 <option value="">- Method of Payment -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC"); 
+                $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Payment Method' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC"); 
                 while ($row = mysqli_fetch_array($sql)) {
                   $category_name = htmlentities($row['category_name']);
                 ?>
diff --git a/invoices.php b/invoices.php
index f145d92c..5742b4ce 100644
--- a/invoices.php
+++ b/invoices.php
@@ -85,39 +85,39 @@ if (isset($_GET['status']) && ($_GET['status']) == 'Draft') {
 
 //Date Filter
 if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
-    $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf']));
-    $dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt']));
+    $dtf = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtf']));
+    $dtt = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtt']));
 } elseif ($_GET['canned_date'] == "today") {
     $dtf = date('Y-m-d');
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "yesterday") {
-    $dtf = date('Y-m-d',strtotime("yesterday"));
-    $dtt = date('Y-m-d',strtotime("yesterday"));
+    $dtf = date('Y-m-d', strtotime("yesterday"));
+    $dtt = date('Y-m-d', strtotime("yesterday"));
 } elseif ($_GET['canned_date'] == "thisweek") {
-    $dtf = date('Y-m-d',strtotime("monday this week"));
+    $dtf = date('Y-m-d', strtotime("monday this week"));
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastweek") {
-    $dtf = date('Y-m-d',strtotime("monday last week"));
-    $dtt = date('Y-m-d',strtotime("sunday last week"));
+    $dtf = date('Y-m-d', strtotime("monday last week"));
+    $dtt = date('Y-m-d', strtotime("sunday last week"));
 } elseif ($_GET['canned_date'] == "thismonth") {
     $dtf = date('Y-m-01');
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastmonth") {
-    $dtf = date('Y-m-d',strtotime("first day of last month"));
-    $dtt = date('Y-m-d',strtotime("last day of last month"));
+    $dtf = date('Y-m-d', strtotime("first day of last month"));
+    $dtt = date('Y-m-d', strtotime("last day of last month"));
 } elseif ($_GET['canned_date'] == "thisyear") {
     $dtf = date('Y-01-01');
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastyear") {
-    $dtf = date('Y-m-d',strtotime("first day of january last year"));
-    $dtt = date('Y-m-d',strtotime("last day of december last year"));
+    $dtf = date('Y-m-d', strtotime("first day of january last year"));
+    $dtt = date('Y-m-d', strtotime("last day of december last year"));
 } else {
     $dtf = "0000-00-00";
     $dtt = "9999-00-00";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
 $sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM invoices
     LEFT JOIN clients ON invoice_client_id = client_id
diff --git a/item_edit_modal.php b/item_edit_modal.php
index fabb4ea3..edeb03c4 100644
--- a/item_edit_modal.php
+++ b/item_edit_modal.php
@@ -77,7 +77,7 @@
                 <option value="0">None</option>
                 <?php 
                 
-                $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE (tax_archived_at > '$item_created_at' OR tax_archived_at IS NULL) AND company_id = $session_company_id ORDER BY tax_name ASC"); 
+                $taxes_sql = mysqli_query($mysqli, "SELECT * FROM taxes WHERE (tax_archived_at > '$item_created_at' OR tax_archived_at IS NULL) AND company_id = $session_company_id ORDER BY tax_name ASC"); 
                 while ($row = mysqli_fetch_array($taxes_sql)) {
                   $tax_id_select = $row['tax_id'];
                   $tax_name = htmlentities($row['tax_name']);
diff --git a/logs.php b/logs.php
index 965dd54d..94dc2271 100644
--- a/logs.php
+++ b/logs.php
@@ -3,7 +3,7 @@
 require_once("inc_all_settings.php");
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "log_id";
 }
@@ -22,41 +22,43 @@ if (empty($_GET['canned_date'])) {
 
 //Date Filter
 if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
-    $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf']));
-    $dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt']));
+    $dtf = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtf']));
+    $dtt = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtt']));
 } elseif ($_GET['canned_date'] == "today") {
     $dtf = date('Y-m-d');
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "yesterday") {
-    $dtf = date('Y-m-d',strtotime("yesterday"));
-    $dtt = date('Y-m-d',strtotime("yesterday"));
+    $dtf = date('Y-m-d', strtotime("yesterday"));
+    $dtt = date('Y-m-d', strtotime("yesterday"));
 } elseif ($_GET['canned_date'] == "thisweek") {
-    $dtf = date('Y-m-d',strtotime("monday this week"));
+    $dtf = date('Y-m-d', strtotime("monday this week"));
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastweek") {
-    $dtf = date('Y-m-d',strtotime("monday last week"));
-    $dtt = date('Y-m-d',strtotime("sunday last week"));
+    $dtf = date('Y-m-d', strtotime("monday last week"));
+    $dtt = date('Y-m-d', strtotime("sunday last week"));
 } elseif ($_GET['canned_date'] == "thismonth") {
     $dtf = date('Y-m-01');
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastmonth") {
-    $dtf = date('Y-m-d',strtotime("first day of last month"));
-    $dtt = date('Y-m-d',strtotime("last day of last month"));
+    $dtf = date('Y-m-d', strtotime("first day of last month"));
+    $dtt = date('Y-m-d', strtotime("last day of last month"));
 } elseif ($_GET['canned_date'] == "thisyear") {
     $dtf = date('Y-01-01');
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastyear") {
-    $dtf = date('Y-m-d',strtotime("first day of january last year"));
-    $dtt = date('Y-m-d',strtotime("last day of december last year"));
+    $dtf = date('Y-m-d', strtotime("first day of january last year"));
+    $dtt = date('Y-m-d', strtotime("last day of december last year"));
 } else {
     $dtf = "0000-00-00";
     $dtt = "9999-00-00";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM logs
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM logs
   LEFT JOIN users ON log_user_id = user_id
   LEFT JOIN clients ON log_client_id = client_id
   WHERE (log_type LIKE '%$q%' OR log_action LIKE '%$q%' OR log_description LIKE '%$q%' OR log_ip LIKE '%$q%' OR log_user_agent LIKE '%$q%' OR user_name LIKE '%$q%' OR client_name LIKE '%$q%')
diff --git a/notifications_dismissed.php b/notifications_dismissed.php
index 14f13747..8044b6ff 100644
--- a/notifications_dismissed.php
+++ b/notifications_dismissed.php
@@ -3,7 +3,7 @@ require_once("inc_all.php");
 
 //Column Filter
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "notification_timestamp";
 }
@@ -16,8 +16,8 @@ if (!isset($_GET['o'])) {
 
 //Date From and Date To Filter
 if (!empty($_GET['dtf'])) {
-    $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf']));
-    $dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt']));
+    $dtf = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtf']));
+    $dtt = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtt']));
 } else {
     $dtf = "0000-00-00";
     $dtt = "9999-00-00";
@@ -25,9 +25,9 @@ if (!empty($_GET['dtf'])) {
 
 //Rebuild URL
 
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM notifications 
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM notifications 
   LEFT JOIN users ON notification_dismissed_by = user_id 
   LEFT JOIN clients ON notification_client_id = client_id
   WHERE (notification_type LIKE '%$q%' OR notification LIKE '%$q%' OR user_name LIKE '%$q%' OR client_name LIKE '%$q%') 
@@ -39,7 +39,7 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM notifications
   LIMIT $record_from, $record_to
 ");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
diff --git a/pagination.php b/pagination.php
index 0349e89f..e3a08f98 100644
--- a/pagination.php
+++ b/pagination.php
@@ -58,7 +58,7 @@ if ($total_found_rows > 10) {
                 } else {
                     $next_class = "disabled";
                 }
-                $url_query_strings = http_build_query(array_merge($_GET,array('p' => $i)));
+                $url_query_strings = http_build_query(array_merge($_GET, array('p' => $i)));
                 $prev_page = $p - 1;
                 $next_page  = $p + 1;
 
diff --git a/pagination_head.php b/pagination_head.php
index 881d1508..cd2b9fc8 100644
--- a/pagination_head.php
+++ b/pagination_head.php
@@ -9,32 +9,32 @@
 
 // Paging
 if (isset($_GET['p'])) {
-  $p = intval($_GET['p']);
-  $record_from = (($p)-1)*$_SESSION['records_per_page'];
-  $record_to = $_SESSION['records_per_page'];
-}else{
-  $record_from = 0;
-  $record_to = $_SESSION['records_per_page'];
-  $p = 1;
+    $p = intval($_GET['p']);
+    $record_from = (($p)-1)*$_SESSION['records_per_page'];
+    $record_to = $_SESSION['records_per_page'];
+} else {
+    $record_from = 0;
+    $record_to = $_SESSION['records_per_page'];
+    $p = 1;
 }
 
 // Order
 if (isset($_GET['o'])) {
-  if ($_GET['o'] == 'ASC') {
+    if ($_GET['o'] == 'ASC') {
+        $o = "ASC";
+        $disp = "DESC";
+    } else {
+        $o = "DESC";
+        $disp = "ASC";
+    }
+} else {
     $o = "ASC";
     $disp = "DESC";
-  }else{
-    $o = "DESC";
-    $disp = "ASC";
-  }
-}else{
-  $o = "ASC";
-  $disp = "DESC";
 }
 
 // Search
 if (isset($_GET['q'])) {
-  $q = strip_tags(mysqli_real_escape_string($mysqli,trim($_GET['q'])));
-}else{
-  $q = "";
-}
\ No newline at end of file
+    $q = strip_tags(mysqli_real_escape_string($mysqli, trim($_GET['q'])));
+} else {
+    $q = "";
+}
diff --git a/payments.php b/payments.php
index e9d6067b..360cebd0 100644
--- a/payments.php
+++ b/payments.php
@@ -1,186 +1,185 @@
-<?php include("inc_all.php");
+<?php
+require_once("inc_all.php");
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
-  $sb = "payment_date";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
+    $sb = "payment_date";
 }
 
 // Reverse default sort
 if (!isset($_GET['o'])) {
-  $o = "DESC";
-  $disp = "ASC";
+    $o = "DESC";
+    $disp = "ASC";
 }
 
 if (empty($_GET['canned_date'])) {
-  //Prevents lots of undefined variable errors.
-  // $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00
-  $_GET['canned_date'] = 'custom';
+    //Prevents lots of undefined variable errors.
+    // $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00
+    $_GET['canned_date'] = 'custom';
 }
 
 //Date Filter
 if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
-  $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf']));
-  $dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt']));
-}elseif ($_GET['canned_date'] == "today") {
-  $dtf = date('Y-m-d');
-  $dtt = date('Y-m-d');
-}elseif ($_GET['canned_date'] == "yesterday") {
-  $dtf = date('Y-m-d',strtotime("yesterday"));
-  $dtt = date('Y-m-d',strtotime("yesterday"));
-}elseif ($_GET['canned_date'] == "thisweek") {
-  $dtf = date('Y-m-d',strtotime("monday this week"));
-  $dtt = date('Y-m-d');
-}elseif ($_GET['canned_date'] == "lastweek") {
-  $dtf = date('Y-m-d',strtotime("monday last week"));
-  $dtt = date('Y-m-d',strtotime("sunday last week"));
-}elseif ($_GET['canned_date'] == "thismonth") {
-  $dtf = date('Y-m-01');
-  $dtt = date('Y-m-d');
-}elseif ($_GET['canned_date'] == "lastmonth") {
-  $dtf = date('Y-m-d',strtotime("first day of last month"));
-  $dtt = date('Y-m-d',strtotime("last day of last month"));
-}elseif ($_GET['canned_date'] == "thisyear") {
-  $dtf = date('Y-01-01');
-  $dtt = date('Y-m-d');
-}elseif ($_GET['canned_date'] == "lastyear") {
-  $dtf = date('Y-m-d',strtotime("first day of january last year"));
-  $dtt = date('Y-m-d',strtotime("last day of december last year"));  
-}else{
-  $dtf = "0000-00-00";
-  $dtt = "9999-00-00";
+    $dtf = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtf']));
+    $dtt = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtt']));
+} elseif ($_GET['canned_date'] == "today") {
+    $dtf = date('Y-m-d');
+    $dtt = date('Y-m-d');
+} elseif ($_GET['canned_date'] == "yesterday") {
+    $dtf = date('Y-m-d', strtotime("yesterday"));
+    $dtt = date('Y-m-d', strtotime("yesterday"));
+} elseif ($_GET['canned_date'] == "thisweek") {
+    $dtf = date('Y-m-d', strtotime("monday this week"));
+    $dtt = date('Y-m-d');
+} elseif ($_GET['canned_date'] == "lastweek") {
+    $dtf = date('Y-m-d', strtotime("monday last week"));
+    $dtt = date('Y-m-d', strtotime("sunday last week"));
+} elseif ($_GET['canned_date'] == "thismonth") {
+    $dtf = date('Y-m-01');
+    $dtt = date('Y-m-d');
+} elseif ($_GET['canned_date'] == "lastmonth") {
+    $dtf = date('Y-m-d', strtotime("first day of last month"));
+    $dtt = date('Y-m-d', strtotime("last day of last month"));
+} elseif ($_GET['canned_date'] == "thisyear") {
+    $dtf = date('Y-01-01');
+    $dtt = date('Y-m-d');
+} elseif ($_GET['canned_date'] == "lastyear") {
+    $dtf = date('Y-m-d', strtotime("first day of january last year"));
+    $dtt = date('Y-m-d', strtotime("last day of december last year"));
+} else {
+    $dtf = "0000-00-00";
+    $dtt = "9999-00-00";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM payments
-  LEFT JOIN invoices ON payment_invoice_id = invoice_id
-  LEFT JOIN clients ON invoice_client_id = client_id
-  LEFT JOIN accounts ON payment_account_id = account_id
-  WHERE payments.company_id = $session_company_id
-  AND DATE(payment_date) BETWEEN '$dtf' AND '$dtt'
-  AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR client_name LIKE '%$q%' OR account_name LIKE '%$q%' OR payment_method LIKE '%$q%' OR payment_reference LIKE '%$q%')
-  ORDER BY $sb $o LIMIT $record_from, $record_to"
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM payments
+    LEFT JOIN invoices ON payment_invoice_id = invoice_id
+    LEFT JOIN clients ON invoice_client_id = client_id
+    LEFT JOIN accounts ON payment_account_id = account_id
+    WHERE payments.company_id = $session_company_id
+    AND DATE(payment_date) BETWEEN '$dtf' AND '$dtt'
+    AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR client_name LIKE '%$q%' OR account_name LIKE '%$q%' OR payment_method LIKE '%$q%' OR payment_reference LIKE '%$q%')
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
 );
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
-<div class="card card-dark">
-  <div class="card-header py-3">
-    <h3 class="card-title"><i class="fa fa-fw fa-credit-card"></i> Payments</h3>
-  </div>
-
-  <div class="card-body">
-    <form class="mb-4" autocomplete="off">
-      <div class="row">
-        <div class="col-sm-4">
-          <div class="input-group">
-            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo strip_tags(htmlentities($q));} ?>" placeholder="Search Payments">
-            <div class="input-group-append">
-              <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
-              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
-            </div>
-          </div>
+    <div class="card card-dark">
+        <div class="card-header py-3">
+            <h3 class="card-title"><i class="fa fa-fw fa-credit-card"></i> Payments</h3>
         </div>
-      </div>
-      <div class="collapse mt-3 <?php if (!empty($_GET['dtf'])) { echo "show"; } ?>" id="advancedFilter">
-        <div class="row">
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Canned Date</label>
-              <select class="form-control select2" name="canned_date">
-                <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
-                <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-              </select>
+
+        <div class="card-body">
+            <form class="mb-4" autocomplete="off">
+                <div class="row">
+                    <div class="col-sm-4">
+                        <div class="input-group">
+                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo strip_tags(htmlentities($q));} ?>" placeholder="Search Payments">
+                            <div class="input-group-append">
+                                <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
+                                <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="collapse mt-3 <?php if (!empty($_GET['dtf'])) { echo "show"; } ?>" id="advancedFilter">
+                    <div class="row">
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label>Canned Date</label>
+                                <select class="form-control select2" name="canned_date">
+                                    <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
+                                    <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
+                                    <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
+                                    <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
+                                    <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
+                                    <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
+                                    <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
+                                    <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
+                                    <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label>Date From</label>
+                                <input type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo htmlentities($dtf); ?>">
+                            </div>
+                        </div>
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label>Date To</label>
+                                <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo htmlentities($dtt); ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </form>
+            <hr>
+            <div class="table-responsive">
+                <table class="table table-striped table-borderless table-hover">
+                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                    <tr>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_date&o=<?php echo $disp; ?>">Payment Date</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_date&o=<?php echo $disp; ?>">Invoice Date</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_number&o=<?php echo $disp; ?>">Invoice</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client</a></th>
+                        <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_amount&o=<?php echo $disp; ?>">Amount</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_method&o=<?php echo $disp; ?>">Payment Method</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_reference&o=<?php echo $disp; ?>">Reference</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=account_name&o=<?php echo $disp; ?>">Account</a></th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
+
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $invoice_id = $row['invoice_id'];
+                        $invoice_prefix = htmlentities($row['invoice_prefix']);
+                        $invoice_number = htmlentities($row['invoice_number']);
+                        $invoice_status = htmlentities($row['invoice_status']);
+                        $invoice_date = $row['invoice_date'];
+                        $payment_date = $row['payment_date'];
+                        $payment_method = htmlentities($row['payment_method']);
+                        $payment_amount = floatval($row['payment_amount']);
+                        $payment_currency_code = htmlentities($row['payment_currency_code']);
+                        $payment_reference = htmlentities($row['payment_reference']);
+                        if (empty($payment_reference)) {
+                            $payment_reference_display = "-";
+                        } else {
+                            $payment_reference_display = $payment_reference;
+                        }
+                        $client_id = $row['client_id'];
+                        $client_name = htmlentities($row['client_name']);
+                        $account_name = htmlentities($row['account_name']);
+
+                        ?>
+
+                        <tr>
+                            <td><?php echo $payment_date; ?></td>
+                            <td><?php echo $invoice_date; ?></td>
+                            <td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
+                            <td><a href="client_payments.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
+                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $payment_amount, $payment_currency_code); ?></td>
+                            <td><?php echo $payment_method; ?></td>
+                            <td><?php echo $payment_reference_display; ?></td>
+                            <td><?php echo $account_name; ?></td>
+                        </tr>
+
+                    <?php } ?>
+
+                    </tbody>
+                </table>
             </div>
-          </div>
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Date From</label>
-              <input type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo htmlentities($dtf); ?>">
-            </div>
-          </div>
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Date To</label>
-              <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo htmlentities($dtt); ?>">
-            </div>
-          </div>
-        </div>    
-      </div>
-    </form>
-    <hr>
-    <div class="table-responsive">
-      <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-          <tr>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_date&o=<?php echo $disp; ?>">Payment Date</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_date&o=<?php echo $disp; ?>">Invoice Date</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_number&o=<?php echo $disp; ?>">Invoice</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client</a></th>
-            <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_amount&o=<?php echo $disp; ?>">Amount</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_method&o=<?php echo $disp; ?>">Payment Method</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_reference&o=<?php echo $disp; ?>">Reference</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=account_name&o=<?php echo $disp; ?>">Account</a></th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $invoice_id = $row['invoice_id'];
-            $invoice_prefix = htmlentities($row['invoice_prefix']);
-            $invoice_number = htmlentities($row['invoice_number']);
-            $invoice_status = htmlentities($row['invoice_status']);
-            $invoice_date = $row['invoice_date'];
-            $payment_date = $row['payment_date'];
-            $payment_method = htmlentities($row['payment_method']);
-            $payment_amount = floatval($row['payment_amount']);
-            $payment_currency_code = htmlentities($row['payment_currency_code']);
-            $payment_reference = htmlentities($row['payment_reference']);
-            if (empty($payment_reference)) {
-              $payment_reference_display = "-";
-            }else{
-              $payment_reference_display = $payment_reference;
-            }
-            $client_id = $row['client_id'];
-            $client_name = htmlentities($row['client_name']);
-            $account_name = htmlentities($row['account_name']);
-
-          ?>
-
-          <tr>
-            <td><?php echo $payment_date; ?></td>
-            <td><?php echo $invoice_date; ?></td>
-            <td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
-            <td><a href="client_payments.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
-            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $payment_amount, $payment_currency_code); ?></td>
-            <td><?php echo $payment_method; ?></td>
-            <td><?php echo $payment_reference_display; ?></td>
-            <td><?php echo $account_name; ?></td>
-          </tr>
-
-          <?php
-
-          }
-
-          ?>
-
-        </tbody>
-      </table>
+            <?php require_once("pagination.php"); ?>
+        </div>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
-</div>
 
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php require_once("footer.php"); ?>
diff --git a/product_add_modal.php b/product_add_modal.php
index 13f0a5cf..90998021 100644
--- a/product_add_modal.php
+++ b/product_add_modal.php
@@ -1,106 +1,106 @@
 <div class="modal" id="addProductModal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-box"></i> New Product</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <div class="modal-body bg-white">
-          
-          <div class="form-group">
-            <label>Name <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fas fa-fw fa-box"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" placeholder="Product name" required autofocus>
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-box"></i> New Product</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Category <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-              </div>
-              <select class="form-control select2" name="category" required>
-                <option value="">- Select Category -</option>
-                <?php 
-                
-                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL AND company_id = $session_company_id"); 
-                while ($row = mysqli_fetch_array($sql)) {
-                  $category_id = $row['category_id'];
-                  $category_name = htmlentities($row['category_name']);
-                ?>
-                  <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-              <div class="input-group-append">
-                <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button>
-              </div>
-            </div>
-          </div>
-          
-          <div class="form-row">
-            <div class="col">
-              <div class="form-group">
-                <label>Price <strong class="text-danger">*</strong></label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
-                  </div>
-                  <input type="number" step="0.01" min="0" class="form-control" name="price" placeholder="Price" required>
-                </div>
-              </div>
-            </div>
-            
-            <div class="col">
-              <div class="form-group">
-                <label>Tax</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
-                  </div>
-                  <select class="form-control select2" name="tax">
-                    <option value="0">None</option>
-                    <?php 
-                    
-                    $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE tax_archived_at IS NULL AND company_id = $session_company_id ORDER BY tax_name ASC"); 
-                    while ($row = mysqli_fetch_array($taxes_sql)) {
-                      $tax_id = $row['tax_id'];
-                      $tax_name = htmlentities($row['tax_name']);
-                      $tax_percent = htmlentities($row['tax_percent']);
-                    ?>
-                      <option value="<?php echo $tax_id; ?>"><?php echo "$tax_name $tax_percent%"; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>        
-                </div>
-              </div>
-            </div>
-          </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <div class="modal-body bg-white">
 
-          <div class="form-group">
-            <label>Description</label>
-            <textarea class="form-control" rows="5" name="description" placeholder="Product description"></textarea>
-          </div>
-        
+                    <div class="form-group">
+                        <label>Name <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fas fa-fw fa-box"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="name" placeholder="Product name" required autofocus>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Category <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                            </div>
+                            <select class="form-control select2" name="category" required>
+                                <option value="">- Select Category -</option>
+                                <?php
+
+                                $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL AND company_id = $session_company_id");
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $category_id = $row['category_id'];
+                                    $category_name = htmlentities($row['category_name']);
+                                    ?>
+                                    <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+
+                                    <?php
+                                }
+                                ?>
+                            </select>
+                            <div class="input-group-append">
+                                <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-row">
+                        <div class="col">
+                            <div class="form-group">
+                                <label>Price <strong class="text-danger">*</strong></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
+                                    </div>
+                                    <input type="number" step="0.01" min="0" class="form-control" name="price" placeholder="Price" required>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="col">
+                            <div class="form-group">
+                                <label>Tax</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="tax">
+                                        <option value="0">None</option>
+                                        <?php
+
+                                        $taxes_sql = mysqli_query($mysqli, "SELECT * FROM taxes WHERE tax_archived_at IS NULL AND company_id = $session_company_id ORDER BY tax_name ASC");
+                                        while ($row = mysqli_fetch_array($taxes_sql)) {
+                                            $tax_id = $row['tax_id'];
+                                            $tax_name = htmlentities($row['tax_name']);
+                                            $tax_percent = htmlentities($row['tax_percent']);
+                                            ?>
+                                            <option value="<?php echo $tax_id; ?>"><?php echo "$tax_name $tax_percent%"; ?></option>
+
+                                            <?php
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Description</label>
+                        <textarea class="form-control" rows="5" name="description" placeholder="Product description"></textarea>
+                    </div>
+
+                </div>
+
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_product" class="btn btn-primary"><storng><i class="fas fa-check"></i> Create</storng></button>
+                </div>
+
+            </form>
         </div>
-        
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_product" class="btn btn-primary"><storng><i class="fas fa-check"></i> Create</storng></button>
-        </div>
-      
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/product_edit_modal.php b/product_edit_modal.php
index 8cc2c9d2..1ca9f0af 100644
--- a/product_edit_modal.php
+++ b/product_edit_modal.php
@@ -1,104 +1,104 @@
 <div class="modal" id="editProductModal<?php echo $product_id; ?>" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-box"></i> Editing product: <strong><?php echo $product_name; ?></strong></h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="product_id" value="<?php echo $product_id; ?>">
-        <div class="modal-body bg-white">
-          
-          <div class="form-group">
-            <label>Name <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fas fa-fw fa-box"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" value="<?php echo $product_name; ?>" required>
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-box"></i> Editing product: <strong><?php echo $product_name; ?></strong></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Category <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
-              </div>
-              <select class="form-control select2" name="category" required>
-                <?php 
-                
-                $sql_select = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$product_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id"); 
-                while ($row = mysqli_fetch_array($sql_select)) {
-                  $category_id_select = $row['category_id'];
-                  $category_name_select = htmlentities($row['category_name']);
-                ?>
-                <option <?php if ($category_id == $category_id_select) { echo "selected"; } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name_select; ?></option>
-                <?php
-                }
-                
-                ?>
-              </select>
-              <div class="input-group-append">
-                <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button>
-              </div>
-            </div>
-          </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="product_id" value="<?php echo $product_id; ?>">
+                <div class="modal-body bg-white">
 
-          <div class="form-row">
-            <div class="col">
-              <div class="form-group">
-                <label>Price <strong class="text-danger">*</strong></label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
-                  </div>
-                  <input type="number" step="0.01" min="0" class="form-control" name="price" value="<?php echo $product_price; ?>" required>
-                </div>
-              </div>
-            </div>
-            <div class="col">
-              <div class="form-group">
-                <label>Tax</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
-                  </div>
-                  <select class="form-control select2" name="tax">
-                    <option value="0">None</option>
-                    <?php 
-                    
-                    $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE (tax_archived_at > '$product_created_at' OR tax_archived_at IS NULL) AND company_id = $session_company_id ORDER BY tax_name ASC"); 
-                    while ($row = mysqli_fetch_array($taxes_sql)) {
-                      $tax_id_select = $row['tax_id'];
-                      $tax_name = htmlentities($row['tax_name']);
-                      $tax_percent = htmlentities($row['tax_percent']);
-                    ?>
-                      <option <?php if ($tax_id_select == $product_tax_id) { echo "selected"; } ?> value="<?php echo $tax_id_select; ?>"><?php echo "$tax_name $tax_percent%"; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-            </div>
-          </div>
+                    <div class="form-group">
+                        <label>Name <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fas fa-fw fa-box"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="name" value="<?php echo $product_name; ?>" required>
+                        </div>
+                    </div>
 
-          <div class="form-group">
-            <label>Description</label>
-            <textarea class="form-control" rows="5" name="description"><?php echo $product_description; ?></textarea>
-          </div>
-        
+                    <div class="form-group">
+                        <label>Category <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                            </div>
+                            <select class="form-control select2" name="category" required>
+                                <?php
+
+                                $sql_select = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$product_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id");
+                                while ($row = mysqli_fetch_array($sql_select)) {
+                                    $category_id_select = $row['category_id'];
+                                    $category_name_select = htmlentities($row['category_name']);
+                                    ?>
+                                    <option <?php if ($category_id == $category_id_select) { echo "selected"; } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name_select; ?></option>
+                                    <?php
+                                }
+
+                                ?>
+                            </select>
+                            <div class="input-group-append">
+                                <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-row">
+                        <div class="col">
+                            <div class="form-group">
+                                <label>Price <strong class="text-danger">*</strong></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
+                                    </div>
+                                    <input type="number" step="0.01" min="0" class="form-control" name="price" value="<?php echo $product_price; ?>" required>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col">
+                            <div class="form-group">
+                                <label>Tax</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="tax">
+                                        <option value="0">None</option>
+                                        <?php
+
+                                        $taxes_sql = mysqli_query($mysqli, "SELECT * FROM taxes WHERE (tax_archived_at > '$product_created_at' OR tax_archived_at IS NULL) AND company_id = $session_company_id ORDER BY tax_name ASC");
+                                        while ($row = mysqli_fetch_array($taxes_sql)) {
+                                            $tax_id_select = $row['tax_id'];
+                                            $tax_name = htmlentities($row['tax_name']);
+                                            $tax_percent = htmlentities($row['tax_percent']);
+                                            ?>
+                                            <option <?php if ($tax_id_select == $product_tax_id) { echo "selected"; } ?> value="<?php echo $tax_id_select; ?>"><?php echo "$tax_name $tax_percent%"; ?></option>
+
+                                            <?php
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Description</label>
+                        <textarea class="form-control" rows="5" name="description"><?php echo $product_description; ?></textarea>
+                    </div>
+
+                </div>
+
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="edit_product" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
+                </div>
+            </form>
         </div>
-        
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_product" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/products.php b/products.php
index 579dbdf4..d265e9be 100644
--- a/products.php
+++ b/products.php
@@ -1,116 +1,117 @@
-<?php include("inc_all.php");
+<?php
+require_once("inc_all.php");
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
-  $sb = "product_name";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
+    $sb = "product_name";
 }
 
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM products LEFT JOIN categories ON product_category_id = category_id 
-  WHERE products.company_id = $session_company_id 
-  AND (product_name LIKE '%$q%' OR product_description LIKE '%$q%' OR category_name LIKE '%$q%' OR product_price LIKE '%$q%') 
-  ORDER BY $sb $o LIMIT $record_from, $record_to");
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM products LEFT JOIN categories ON product_category_id = category_id 
+    WHERE products.company_id = $session_company_id 
+    AND (product_name LIKE '%$q%' OR product_description LIKE '%$q%' OR category_name LIKE '%$q%' OR product_price LIKE '%$q%') 
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
+);
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
-<div class="card card-dark">
-  <div class="card-header py-2">
-    <h3 class="card-title mt-2"><i class="fa fa-fw fa-box"></i> Products</h3>
-    <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addProductModal"><i class="fas fa-fw fa-plus"></i> New Product</button>
-    </div>
-  </div>
-
-  <div class="card-body">
-    <form class="mb-4" autocomplete="off">
-      <div class="row">
-        <div class="col-sm-4">
-          <div class="input-group">
-            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo strip_tags(htmlentities($q));} ?>" placeholder="Search Products">
-            <div class="input-group-append">
-              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+    <div class="card card-dark">
+        <div class="card-header py-2">
+            <h3 class="card-title mt-2"><i class="fa fa-fw fa-box"></i> Products</h3>
+            <div class="card-tools">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addProductModal"><i class="fas fa-fw fa-plus"></i> New Product</button>
             </div>
-          </div>
         </div>
-      </div>
-    </form>
-    <hr>
-    <div class="table-responsive">
-      <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-          <tr>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=product_name&o=<?php echo $disp; ?>">Name</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=category_name&o=<?php echo $disp; ?>">Category</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=product_description&o=<?php echo $disp; ?>">Description</a></th>
-            <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=product_price&o=<?php echo $disp; ?>">Price</a></th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $product_id = $row['product_id'];
-            $product_name = htmlentities($row['product_name']);
-            $product_description = htmlentities($row['product_description']);
-            if (empty($product_description)) {
-              $product_description_display = "-";
-            }else{
-              $product_description_display = "<div style='white-space:pre-line'>$product_description</div>";
-            }
-            $product_price = floatval($row['product_price']);
-            $product_currency_code = htmlentities($row['product_currency_code']);
-            $product_created_at = $row['product_created_at'];
-            $category_id = $row['category_id'];
-            $category_name = htmlentities($row['category_name']);
-            $product_tax_id = $row['product_tax_id'];
 
-          ?>
-          <tr>
-            <th><a class="text-dark" href="#" data-toggle="modal" data-target="#editProductModal<?php echo $product_id; ?>"><?php echo $product_name; ?></a></th>
-            <td><?php echo $category_name; ?></td>
-            <td><?php echo $product_description_display; ?></td>
-            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $product_price, $product_currency_code); ?></td>
-            <td>
-              <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                  <i class="fas fa-ellipsis-h"></i>
-                </button>
-                <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editProductModal<?php echo $product_id; ?>">Edit</a>
-                  <div class="dropdown-divider"></div>
-                  <a class="dropdown-item text-danger" href="post.php?delete_product=<?php echo $product_id; ?>">Delete</a>
+        <div class="card-body">
+            <form class="mb-4" autocomplete="off">
+                <div class="row">
+                    <div class="col-sm-4">
+                        <div class="input-group">
+                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo strip_tags(htmlentities($q));} ?>" placeholder="Search Products">
+                            <div class="input-group-append">
+                                <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-              </div>      
-            </td>   
-          </tr>
+            </form>
+            <hr>
+            <div class="table-responsive">
+                <table class="table table-striped table-borderless table-hover">
+                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                    <tr>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=product_name&o=<?php echo $disp; ?>">Name</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=category_name&o=<?php echo $disp; ?>">Category</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=product_description&o=<?php echo $disp; ?>">Description</a></th>
+                        <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=product_price&o=<?php echo $disp; ?>">Price</a></th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
 
-          <?php
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $product_id = $row['product_id'];
+                        $product_name = htmlentities($row['product_name']);
+                        $product_description = htmlentities($row['product_description']);
+                        if (empty($product_description)) {
+                            $product_description_display = "-";
+                        } else {
+                            $product_description_display = "<div style='white-space:pre-line'>$product_description</div>";
+                        }
+                        $product_price = floatval($row['product_price']);
+                        $product_currency_code = htmlentities($row['product_currency_code']);
+                        $product_created_at = $row['product_created_at'];
+                        $category_id = $row['category_id'];
+                        $category_name = htmlentities($row['category_name']);
+                        $product_tax_id = $row['product_tax_id'];
 
-          include("product_edit_modal.php");
-          
-          }
-          
-          ?>
+                        ?>
+                        <tr>
+                            <th><a class="text-dark" href="#" data-toggle="modal" data-target="#editProductModal<?php echo $product_id; ?>"><?php echo $product_name; ?></a></th>
+                            <td><?php echo $category_name; ?></td>
+                            <td><?php echo $product_description_display; ?></td>
+                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $product_price, $product_currency_code); ?></td>
+                            <td>
+                                <div class="dropdown dropleft text-center">
+                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                        <i class="fas fa-ellipsis-h"></i>
+                                    </button>
+                                    <div class="dropdown-menu">
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editProductModal<?php echo $product_id; ?>">Edit</a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger" href="post.php?delete_product=<?php echo $product_id; ?>">Delete</a>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
 
-        </tbody>
-      </table>
+                        <?php
+
+                        require("product_edit_modal.php");
+
+                    }
+
+                    ?>
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once("pagination.php"); ?>
+        </div>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
-</div>
 
-<?php 
-  
-  include("product_add_modal.php"); 
-  include("category_quick_add_modal.php");
+<?php
 
-  include("footer.php");
-
-?>
\ No newline at end of file
+require_once("product_add_modal.php");
+require_once("category_quick_add_modal.php");
+require_once("footer.php");
diff --git a/quote_add_modal.php b/quote_add_modal.php
index f95008b4..336a2475 100644
--- a/quote_add_modal.php
+++ b/quote_add_modal.php
@@ -25,7 +25,7 @@
                                     <option value="">- Client -</option>
                                     <?php
 
-                                    $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
+                                    $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
                                     while ($row = mysqli_fetch_array($sql)) {
                                         $client_id = $row['client_id'];
                                         $client_name = htmlentities($row['client_name']);
@@ -59,7 +59,7 @@
                                 <option value="">- Category -</option>
                                 <?php
 
-                                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC");
+                                $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC");
                                 while ($row = mysqli_fetch_array($sql)) {
                                     $category_id = $row['category_id'];
                                     $category_name = htmlentities($row['category_name']);
diff --git a/quote_edit_modal.php b/quote_edit_modal.php
index d876bade..d1975439 100644
--- a/quote_edit_modal.php
+++ b/quote_edit_modal.php
@@ -32,7 +32,7 @@
                 <option value="">- Category -</option>
                 <?php 
                 
-                $sql_income_category = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$quote_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC"); 
+                $sql_income_category = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$quote_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC"); 
                 while ($row = mysqli_fetch_array($sql_income_category)) {
                   $category_id_select = $row['category_id'];
                   $category_name_select = htmlentities($row['category_name']);
diff --git a/quotes.php b/quotes.php
index 622931d5..d6833150 100644
--- a/quotes.php
+++ b/quotes.php
@@ -1,60 +1,61 @@
-<?php include("inc_all.php");
+<?php
+require_once("inc_all.php");
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
-  $sb = "quote_number";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
+    $sb = "quote_number";
 }
 
 // Reverse default sort
 if (!isset($_GET['o'])) {
-  $o = "DESC";
-  $disp = "ASC";
+    $o = "DESC";
+    $disp = "ASC";
 }
 
 if (empty($_GET['canned_date'])) {
-  //Prevents lots of undefined variable errors.
-  // $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00
-  $_GET['canned_date'] = 'custom';
+    //Prevents lots of undefined variable errors.
+    // $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00
+    $_GET['canned_date'] = 'custom';
 }
 
 //Date Filter
 if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
-  $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf']));
-  $dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt']));
-}elseif ($_GET['canned_date'] == "today") {
-  $dtf = date('Y-m-d');
-  $dtt = date('Y-m-d');
-}elseif ($_GET['canned_date'] == "yesterday") {
-  $dtf = date('Y-m-d',strtotime("yesterday"));
-  $dtt = date('Y-m-d',strtotime("yesterday"));
-}elseif ($_GET['canned_date'] == "thisweek") {
-  $dtf = date('Y-m-d',strtotime("monday this week"));
-  $dtt = date('Y-m-d');
-}elseif ($_GET['canned_date'] == "lastweek") {
-  $dtf = date('Y-m-d',strtotime("monday last week"));
-  $dtt = date('Y-m-d',strtotime("sunday last week"));
-}elseif ($_GET['canned_date'] == "thismonth") {
-  $dtf = date('Y-m-01');
-  $dtt = date('Y-m-d');
-}elseif ($_GET['canned_date'] == "lastmonth") {
-  $dtf = date('Y-m-d',strtotime("first day of last month"));
-  $dtt = date('Y-m-d',strtotime("last day of last month"));
-}elseif ($_GET['canned_date'] == "thisyear") {
-  $dtf = date('Y-01-01');
-  $dtt = date('Y-m-d');
-}elseif ($_GET['canned_date'] == "lastyear") {
-  $dtf = date('Y-m-d',strtotime("first day of january last year"));
-  $dtt = date('Y-m-d',strtotime("last day of december last year"));  
-}else{
-  $dtf = "0000-00-00";
-  $dtt = "9999-00-00";
+    $dtf = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtf']));
+    $dtt = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtt']));
+} elseif ($_GET['canned_date'] == "today") {
+    $dtf = date('Y-m-d');
+    $dtt = date('Y-m-d');
+} elseif ($_GET['canned_date'] == "yesterday") {
+    $dtf = date('Y-m-d', strtotime("yesterday"));
+    $dtt = date('Y-m-d', strtotime("yesterday"));
+} elseif ($_GET['canned_date'] == "thisweek") {
+    $dtf = date('Y-m-d', strtotime("monday this week"));
+    $dtt = date('Y-m-d');
+} elseif ($_GET['canned_date'] == "lastweek") {
+    $dtf = date('Y-m-d', strtotime("monday last week"));
+    $dtt = date('Y-m-d', strtotime("sunday last week"));
+} elseif ($_GET['canned_date'] == "thismonth") {
+    $dtf = date('Y-m-01');
+    $dtt = date('Y-m-d');
+} elseif ($_GET['canned_date'] == "lastmonth") {
+    $dtf = date('Y-m-d', strtotime("first day of last month"));
+    $dtt = date('Y-m-d', strtotime("last day of last month"));
+} elseif ($_GET['canned_date'] == "thisyear") {
+    $dtf = date('Y-01-01');
+    $dtt = date('Y-m-d');
+} elseif ($_GET['canned_date'] == "lastyear") {
+    $dtf = date('Y-m-d', strtotime("first day of january last year"));
+    $dtt = date('Y-m-d', strtotime("last day of december last year"));
+} else {
+    $dtf = "0000-00-00";
+    $dtt = "9999-00-00";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM quotes 
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM quotes 
   LEFT JOIN clients ON quote_client_id = client_id
   LEFT JOIN categories ON quote_category_id = category_id
   WHERE quotes.company_id = $session_company_id
@@ -62,175 +63,172 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM quotes
   AND DATE(quote_date) BETWEEN '$dtf' AND '$dtt'
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
-<div class="card card-dark">
-  <div class="card-header py-2">
-    <h3 class="card-title mt-2"><i class="fa fa-fw fa-file"></i> Quotes</h3>
-    <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addQuoteModal"><i class="fas fa-fw fa-plus"></i> New Quote</button>
-    </div>
-  </div>
-
-  <div class="card-body">
-    <form class="mb-4" autocomplete="off">
-      <div class="row">
-        <div class="col-sm-4">
-          <div class="input-group">
-            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo strip_tags(htmlentities($q));} ?>" placeholder="Search Quotes">
-            <div class="input-group-append">
-              <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
-              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+    <div class="card card-dark">
+        <div class="card-header py-2">
+            <h3 class="card-title mt-2"><i class="fa fa-fw fa-file"></i> Quotes</h3>
+            <div class="card-tools">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addQuoteModal"><i class="fas fa-fw fa-plus"></i> New Quote</button>
             </div>
-          </div>
         </div>
-      </div>
-      <div class="collapse mt-3 <?php if (!empty($_GET['dtf'])) { echo "show"; } ?>" id="advancedFilter">
-        <div class="row">
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Canned Date</label>
-              <select class="form-control select2" name="canned_date">
-                <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
-                <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-              </select>
-            </div>
-          </div>
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Date From</label>
-              <input type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo htmlentities($dtf); ?>">
-            </div>
-          </div>
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Date To</label>
-              <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo htmlentities($dtt); ?>">
-            </div>
-          </div>
-        </div>    
-      </div>
-    </form>
-    <hr>
-    <div class="table-responsive">
-      <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-          <tr>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_number&o=<?php echo $disp; ?>">Number</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_scope&o=<?php echo $disp; ?>">Scope</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client</a></th>
-            <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_amount&o=<?php echo $disp; ?>">Amount</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_date&o=<?php echo $disp; ?>">Date</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=category_name&o=<?php echo $disp; ?>">Category</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_status&o=<?php echo $disp; ?>">Status</a></th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $quote_id = $row['quote_id'];
-            $quote_prefix = htmlentities($row['quote_prefix']);
-            $quote_number = htmlentities($row['quote_number']);
-            $quote_scope = htmlentities($row['quote_scope']);
-            if (empty($quote_scope)) {
-              $quote_scope_display = "-";
-            }else{
-              $quote_scope_display = $quote_scope;
-            }
-            $quote_status = htmlentities($row['quote_status']);
-            $quote_date = $row['quote_date'];
-            $quote_amount = floatval($row['quote_amount']);
-            $quote_currency_code = htmlentities($row['quote_currency_code']);
-            $quote_created_at = $row['quote_created_at'];
-            $client_id = $row['client_id'];
-            $client_name = htmlentities($row['client_name']);
-            $client_currency_code = htmlentities($row['client_currency_code']);
-            $category_id = $row['category_id'];
-            $category_name = htmlentities($row['category_name']);
-            $client_net_terms = htmlentities($row['client_net_terms']);
-            if ($client_net_terms == 0) {
-              $client_net_terms = $config_default_net_terms;
-            }
 
-            if ($quote_status == "Sent") {
-              $quote_badge_color = "warning text-white";
-            }elseif ($quote_status == "Viewed") {
-              $quote_badge_color = "primary";
-            }elseif ($quote_status == "Accepted") {
-              $quote_badge_color = "success";
-            }elseif ($quote_status == "Declined") {
-              $quote_badge_color = "danger";
-            }elseif ($quote_status == "Invoiced") {
-              $quote_badge_color = "info";
-            }else{
-              $quote_badge_color = "secondary";
-            }
+        <div class="card-body">
+            <form class="mb-4" autocomplete="off">
+                <div class="row">
+                    <div class="col-sm-4">
+                        <div class="input-group">
+                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo strip_tags(htmlentities($q));} ?>" placeholder="Search Quotes">
+                            <div class="input-group-append">
+                                <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
+                                <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="collapse mt-3 <?php if (!empty($_GET['dtf'])) { echo "show"; } ?>" id="advancedFilter">
+                    <div class="row">
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label>Canned Date</label>
+                                <select class="form-control select2" name="canned_date">
+                                    <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
+                                    <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
+                                    <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
+                                    <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
+                                    <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
+                                    <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
+                                    <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
+                                    <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
+                                    <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label>Date From</label>
+                                <input type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo htmlentities($dtf); ?>">
+                            </div>
+                        </div>
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label>Date To</label>
+                                <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo htmlentities($dtt); ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </form>
+            <hr>
+            <div class="table-responsive">
+                <table class="table table-striped table-borderless table-hover">
+                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                    <tr>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_number&o=<?php echo $disp; ?>">Number</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_scope&o=<?php echo $disp; ?>">Scope</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client</a></th>
+                        <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_amount&o=<?php echo $disp; ?>">Amount</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_date&o=<?php echo $disp; ?>">Date</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=category_name&o=<?php echo $disp; ?>">Category</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_status&o=<?php echo $disp; ?>">Status</a></th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
 
-          ?>
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $quote_id = $row['quote_id'];
+                        $quote_prefix = htmlentities($row['quote_prefix']);
+                        $quote_number = htmlentities($row['quote_number']);
+                        $quote_scope = htmlentities($row['quote_scope']);
+                        if (empty($quote_scope)) {
+                            $quote_scope_display = "-";
+                        } else {
+                            $quote_scope_display = $quote_scope;
+                        }
+                        $quote_status = htmlentities($row['quote_status']);
+                        $quote_date = $row['quote_date'];
+                        $quote_amount = floatval($row['quote_amount']);
+                        $quote_currency_code = htmlentities($row['quote_currency_code']);
+                        $quote_created_at = $row['quote_created_at'];
+                        $client_id = $row['client_id'];
+                        $client_name = htmlentities($row['client_name']);
+                        $client_currency_code = htmlentities($row['client_currency_code']);
+                        $category_id = $row['category_id'];
+                        $category_name = htmlentities($row['category_name']);
+                        $client_net_terms = htmlentities($row['client_net_terms']);
+                        if ($client_net_terms == 0) {
+                            $client_net_terms = $config_default_net_terms;
+                        }
 
-          <tr>
-            <td><a href="quote.php?quote_id=<?php echo $quote_id; ?>"><?php echo "$quote_prefix$quote_number"; ?></a></td>
-            <td><?php echo $quote_scope_display; ?></td>
-            <td><a href="client_quotes.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
-            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code); ?></td>
-            <td><?php echo $quote_date; ?></td>
-            <td><?php echo $category_name; ?></td>
-            <td>
+                        if ($quote_status == "Sent") {
+                            $quote_badge_color = "warning text-white";
+                        } elseif ($quote_status == "Viewed") {
+                            $quote_badge_color = "primary";
+                        } elseif ($quote_status == "Accepted") {
+                            $quote_badge_color = "success";
+                        } elseif ($quote_status == "Declined") {
+                            $quote_badge_color = "danger";
+                        } elseif ($quote_status == "Invoiced") {
+                            $quote_badge_color = "info";
+                        } else {
+                            $quote_badge_color = "secondary";
+                        }
+
+                        ?>
+
+                        <tr>
+                            <td><a href="quote.php?quote_id=<?php echo $quote_id; ?>"><?php echo "$quote_prefix$quote_number"; ?></a></td>
+                            <td><?php echo $quote_scope_display; ?></td>
+                            <td><a href="client_quotes.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
+                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code); ?></td>
+                            <td><?php echo $quote_date; ?></td>
+                            <td><?php echo $category_name; ?></td>
+                            <td>
               <span class="p-2 badge badge-<?php echo $quote_badge_color; ?>">
                 <?php echo $quote_status; ?>
               </span>
-            </td>
-            <td>
-              <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                  <i class="fas fa-ellipsis-h"></i>
-                </button>
-                <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editQuoteModal<?php echo $quote_id; ?>">Edit</a>
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addQuoteCopyModal<?php echo $quote_id; ?>">Copy</a>
-                  <div class="dropdown-divider"></div>
-                  <?php if (!empty($config_smtp_host)) { ?>
-                  <a class="dropdown-item" href="post.php?email_quote=<?php echo $quote_id; ?>">Send</a>
-                  <div class="dropdown-divider"></div>
-                  <?php } ?>
-                  <a class="dropdown-item text-danger" href="post.php?delete_quote=<?php echo $quote_id; ?>">Delete</a>
-                </div>
-              </div>
-            </td>
-          </tr>
+                            </td>
+                            <td>
+                                <div class="dropdown dropleft text-center">
+                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                        <i class="fas fa-ellipsis-h"></i>
+                                    </button>
+                                    <div class="dropdown-menu">
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editQuoteModal<?php echo $quote_id; ?>">Edit</a>
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addQuoteCopyModal<?php echo $quote_id; ?>">Copy</a>
+                                        <div class="dropdown-divider"></div>
+                                        <?php if (!empty($config_smtp_host)) { ?>
+                                            <a class="dropdown-item" href="post.php?email_quote=<?php echo $quote_id; ?>">Send</a>
+                                            <div class="dropdown-divider"></div>
+                                        <?php } ?>
+                                        <a class="dropdown-item text-danger" href="post.php?delete_quote=<?php echo $quote_id; ?>">Delete</a>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
 
-          <?php
-            
-            include("quote_edit_modal.php");
-            include("quote_copy_modal.php");
+                        <?php
 
-          }
+                        require("quote_edit_modal.php");
+                        require("quote_copy_modal.php");
 
-          ?>
+                    }
 
-        </tbody>
-      </table>
+                    ?>
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once("pagination.php"); ?>
+        </div>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
-</div>
 
-<?php 
-  
-  include("quote_add_modal.php"); 
-  include("category_quick_add_modal.php");
-  
-  include("footer.php");
+<?php
 
-?>
\ No newline at end of file
+require_once("quote_add_modal.php");
+require_once("category_quick_add_modal.php");
+require_once("footer.php");
diff --git a/recurring_invoice.php b/recurring_invoice.php
index 4d96b417..e0b57a0d 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -1,10 +1,13 @@
-<?php require_once("inc_all.php");
+<?php
+require_once("inc_all.php");
 
 if (isset($_GET['recurring_id'])) {
 
     $recurring_id = intval($_GET['recurring_id']);
 
-    $sql = mysqli_query($mysqli, "SELECT * FROM recurring 
+    $sql = mysqli_query(
+        $mysqli,
+        "SELECT * FROM recurring 
         LEFT JOIN clients ON recurring_client_id = client_id
         LEFT JOIN locations ON primary_location = location_id
         LEFT JOIN contacts ON primary_contact = contact_id
diff --git a/recurring_invoice_add_modal.php b/recurring_invoice_add_modal.php
index 9dbc3465..51087762 100644
--- a/recurring_invoice_add_modal.php
+++ b/recurring_invoice_add_modal.php
@@ -24,7 +24,7 @@
                 <option value="">- Client -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC"); 
+                $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC"); 
                 while ($row = mysqli_fetch_array($sql)) {
                   $client_id = $row['client_id'];
                   $client_name = htmlentities($row['client_name']);
@@ -75,7 +75,7 @@
                 <option value="">- Category -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC"); 
+                $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC"); 
                 while ($row = mysqli_fetch_array($sql)) {
                   $category_id = $row['category_id'];
                   $category_name = htmlentities($row['category_name']);
diff --git a/recurring_invoice_edit_modal.php b/recurring_invoice_edit_modal.php
index 27f6883e..37b51855 100644
--- a/recurring_invoice_edit_modal.php
+++ b/recurring_invoice_edit_modal.php
@@ -47,7 +47,7 @@
                 <option value="">- Category -</option>
                 <?php 
                 
-                $sql_income_category = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$recurring_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC"); 
+                $sql_income_category = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$recurring_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC"); 
                 while ($row = mysqli_fetch_array($sql_income_category)) {
                   $category_id_select= $row['category_id'];
                   $category_name_select = htmlentities($row['category_name']);
diff --git a/recurring_invoices.php b/recurring_invoices.php
index fff1a1e0..97d4bba2 100644
--- a/recurring_invoices.php
+++ b/recurring_invoices.php
@@ -1,60 +1,61 @@
-<?php include("inc_all.php");
+<?php
+require_once("inc_all.php");
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
-  $sb = "recurring_next_date";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
+    $sb = "recurring_next_date";
 }
 
 if (empty($_GET['canned_date'])) {
-  //Prevents lots of undefined variable errors.
-  // $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00
-  $_GET['canned_date'] = 'custom';
+    //Prevents lots of undefined variable errors.
+    // $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00
+    $_GET['canned_date'] = 'custom';
 }
 
 //Date Filter
 if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
-  $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf']));
-  $dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt']));
+    $dtf = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtf']));
+    $dtt = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtt']));
 }elseif ($_GET['canned_date'] == "today") {
-  $dtf = date('Y-m-d');
-  $dtt = date('Y-m-d');
+    $dtf = date('Y-m-d');
+    $dtt = date('Y-m-d');
 }elseif ($_GET['canned_date'] == "yesterday") {
-  $dtf = date('Y-m-d',strtotime("yesterday"));
-  $dtt = date('Y-m-d',strtotime("yesterday"));
+    $dtf = date('Y-m-d', strtotime("yesterday"));
+    $dtt = date('Y-m-d', strtotime("yesterday"));
 }elseif ($_GET['canned_date'] == "thisweek") {
-  $dtf = date('Y-m-d',strtotime("monday this week"));
-  $dtt = date('Y-m-d');
+    $dtf = date('Y-m-d', strtotime("monday this week"));
+    $dtt = date('Y-m-d');
 }elseif ($_GET['canned_date'] == "lastweek") {
-  $dtf = date('Y-m-d',strtotime("monday last week"));
-  $dtt = date('Y-m-d',strtotime("sunday last week"));
+    $dtf = date('Y-m-d', strtotime("monday last week"));
+    $dtt = date('Y-m-d', strtotime("sunday last week"));
 }elseif ($_GET['canned_date'] == "thismonth") {
-  $dtf = date('Y-m-01');
-  $dtt = date('Y-m-d');
+    $dtf = date('Y-m-01');
+    $dtt = date('Y-m-d');
 }elseif ($_GET['canned_date'] == "lastmonth") {
-  $dtf = date('Y-m-d',strtotime("first day of last month"));
-  $dtt = date('Y-m-d',strtotime("last day of last month"));
+    $dtf = date('Y-m-d', strtotime("first day of last month"));
+    $dtt = date('Y-m-d', strtotime("last day of last month"));
 }elseif ($_GET['canned_date'] == "thisyear") {
-  $dtf = date('Y-01-01');
-  $dtt = date('Y-m-d');
+    $dtf = date('Y-01-01');
+    $dtt = date('Y-m-d');
 }elseif ($_GET['canned_date'] == "lastyear") {
-  $dtf = date('Y-m-d',strtotime("first day of january last year"));
-  $dtt = date('Y-m-d',strtotime("last day of december last year"));  
-}else{
-  $dtf = "0000-00-00";
-  $dtt = "9999-00-00";
+    $dtf = date('Y-m-d', strtotime("first day of january last year"));
+    $dtt = date('Y-m-d', strtotime("last day of december last year"));
+} else {
+    $dtf = "0000-00-00";
+    $dtt = "9999-00-00";
 }
 
 if (empty($_GET['canned_date'])) {
-  //Prevents lots of undefined variable errors.
-  // $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00
-  $_GET['canned_date'] = 'custom';
+    //Prevents lots of undefined variable errors.
+    // $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00
+    $_GET['canned_date'] = 'custom';
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM recurring
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM recurring
   LEFT JOIN clients ON recurring_client_id = client_id
   LEFT JOIN categories ON recurring_category_id = category_id
   WHERE recurring.company_id = $session_company_id
@@ -62,162 +63,161 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM recurring
   AND DATE(recurring_next_date) BETWEEN '$dtf' AND '$dtt'
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
-<div class="card card-dark">
-  <div class="card-header py-2">
-    <h3 class="card-title mt-2"><i class="fa fa-fw fa-sync-alt"></i> Recurring Invoices</h3>
-    <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRecurringModal"><i class="fas fa-fw fa-plus"></i> New Recurring</button>
-    </div>
-  </div>
-
-  <div class="card-body">
-    <form class="mb-4" autocomplete="off">
-      <div class="row">
-        <div class="col-sm-4">
-          <div class="input-group">
-            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo strip_tags(htmlentities($q));} ?>" placeholder="Search Recurring Invoices">
-            <div class="input-group-append">
-              <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
-              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+    <div class="card card-dark">
+        <div class="card-header py-2">
+            <h3 class="card-title mt-2"><i class="fa fa-fw fa-sync-alt"></i> Recurring Invoices</h3>
+            <div class="card-tools">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRecurringModal"><i class="fas fa-fw fa-plus"></i> New Recurring</button>
             </div>
-          </div>
         </div>
-      </div>
-      <div class="collapse mt-3 <?php if (!empty($_GET['dtf'])) { echo "show"; } ?>" id="advancedFilter">
-        <div class="row">
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Canned Date</label>
-              <select class="form-control select2" name="canned_date">
-                <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
-                <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-              </select>
-            </div>
-          </div>
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Date From</label>
-              <input type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo htmlentities($dtf); ?>">
-            </div>
-          </div>
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Date To</label>
-              <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo htmlentities($dtt); ?>">
-            </div>
-          </div>
-        </div>    
-      </div>
-    </form>
-    <hr>
-    <div class="table-responsive">
-      <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-          <tr>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_number&o=<?php echo $disp; ?>">Number</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_next_date&o=<?php echo $disp; ?>">Next Date</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_scope&o=<?php echo $disp; ?>">Scope</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_frequency&o=<?php echo $disp; ?>">Frequency</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client</a></th>
-            <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_amount&o=<?php echo $disp; ?>">Amount</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_last_sent&o=<?php echo $disp; ?>">Last Sent</a></th>
-            
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=category_name&o=<?php echo $disp; ?>">Category</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_status&o=<?php echo $disp; ?>">Status</a></th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $recurring_id = $row['recurring_id'];
-            $recurring_prefix = htmlentities($row['recurring_prefix']);
-            $recurring_number = htmlentities($row['recurring_number']);
-            $recurring_scope = htmlentities($row['recurring_scope']);
-            $recurring_frequency = htmlentities($row['recurring_frequency']);
-            $recurring_status = htmlentities($row['recurring_status']);
-            $recurring_last_sent = $row['recurring_last_sent'];
-            if ($recurring_last_sent == 0) {
-              $recurring_last_sent = "-";
-            }
-            $recurring_next_date = $row['recurring_next_date'];
-            $recurring_amount = floatval($row['recurring_amount']);
-            $recurring_currency_code = htmlentities($row['recurring_currency_code']);
-            $recurring_created_at = $row['recurring_created_at'];
-            $client_id = $row['client_id'];
-            $client_name = htmlentities($row['client_name']);
-            $client_currency_code = htmlentities($row['client_currency_code']);
-            $category_id = $row['category_id'];
-            $category_name = htmlentities($row['category_name']);
-            if ($recurring_status == 1) {
-              $status = "Active";
-              $status_badge_color = "success";
-            }else{
-              $status = "Inactive";
-              $status_badge_color = "secondary";
-            }
 
-          ?>
+        <div class="card-body">
+            <form class="mb-4" autocomplete="off">
+                <div class="row">
+                    <div class="col-sm-4">
+                        <div class="input-group">
+                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo strip_tags(htmlentities($q));} ?>" placeholder="Search Recurring Invoices">
+                            <div class="input-group-append">
+                                <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
+                                <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="collapse mt-3 <?php if (!empty($_GET['dtf'])) { echo "show"; } ?>" id="advancedFilter">
+                    <div class="row">
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label>Canned Date</label>
+                                <select class="form-control select2" name="canned_date">
+                                    <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
+                                    <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
+                                    <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
+                                    <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
+                                    <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
+                                    <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
+                                    <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
+                                    <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
+                                    <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label>Date From</label>
+                                <input type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo htmlentities($dtf); ?>">
+                            </div>
+                        </div>
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label>Date To</label>
+                                <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo htmlentities($dtt); ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </form>
+            <hr>
+            <div class="table-responsive">
+                <table class="table table-striped table-borderless table-hover">
+                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                    <tr>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_number&o=<?php echo $disp; ?>">Number</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_next_date&o=<?php echo $disp; ?>">Next Date</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_scope&o=<?php echo $disp; ?>">Scope</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_frequency&o=<?php echo $disp; ?>">Frequency</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client</a></th>
+                        <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_amount&o=<?php echo $disp; ?>">Amount</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_last_sent&o=<?php echo $disp; ?>">Last Sent</a></th>
 
-          <tr>
-            <td><a href="recurring_invoice.php?recurring_id=<?php echo $recurring_id; ?>"><?php echo "$recurring_prefix$recurring_number"; ?></a></td>
-            <td><?php echo $recurring_next_date; ?></td>
-            <td><?php echo $recurring_scope; ?></td>
-            <td><?php echo ucwords($recurring_frequency); ?>ly</td>
-            <td><a href="client_recurring_invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
-            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $recurring_amount, $recurring_currency_code); ?></td>
-            <td><?php echo $recurring_last_sent; ?></td>
-            <td><?php echo $category_name; ?></td>
-            <td>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=category_name&o=<?php echo $disp; ?>">Category</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_status&o=<?php echo $disp; ?>">Status</a></th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
+
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $recurring_id = $row['recurring_id'];
+                        $recurring_prefix = htmlentities($row['recurring_prefix']);
+                        $recurring_number = htmlentities($row['recurring_number']);
+                        $recurring_scope = htmlentities($row['recurring_scope']);
+                        $recurring_frequency = htmlentities($row['recurring_frequency']);
+                        $recurring_status = htmlentities($row['recurring_status']);
+                        $recurring_last_sent = $row['recurring_last_sent'];
+                        if ($recurring_last_sent == 0) {
+                            $recurring_last_sent = "-";
+                        }
+                        $recurring_next_date = $row['recurring_next_date'];
+                        $recurring_amount = floatval($row['recurring_amount']);
+                        $recurring_currency_code = htmlentities($row['recurring_currency_code']);
+                        $recurring_created_at = $row['recurring_created_at'];
+                        $client_id = $row['client_id'];
+                        $client_name = htmlentities($row['client_name']);
+                        $client_currency_code = htmlentities($row['client_currency_code']);
+                        $category_id = $row['category_id'];
+                        $category_name = htmlentities($row['category_name']);
+                        if ($recurring_status == 1) {
+                            $status = "Active";
+                            $status_badge_color = "success";
+                        } else {
+                            $status = "Inactive";
+                            $status_badge_color = "secondary";
+                        }
+
+                        ?>
+
+                        <tr>
+                            <td><a href="recurring_invoice.php?recurring_id=<?php echo $recurring_id; ?>"><?php echo "$recurring_prefix$recurring_number"; ?></a></td>
+                            <td><?php echo $recurring_next_date; ?></td>
+                            <td><?php echo $recurring_scope; ?></td>
+                            <td><?php echo ucwords($recurring_frequency); ?>ly</td>
+                            <td><a href="client_recurring_invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
+                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $recurring_amount, $recurring_currency_code); ?></td>
+                            <td><?php echo $recurring_last_sent; ?></td>
+                            <td><?php echo $category_name; ?></td>
+                            <td>
                <span class="p-2 badge badge-<?php echo $status_badge_color; ?>">
                 <?php echo $status; ?>
               </span>
-                
-            </td>
-            <td>
-              <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                  <i class="fas fa-ellipsis-h"></i>
-                </button>
-                <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editRecurringModal<?php echo $recurring_id; ?>">Edit</a>
-                  <div class="dropdown-divider"></div>
-                    <a class="dropdown-item text-danger" href="post.php?delete_recurring=<?php echo $recurring_id; ?>">Delete</a>
-                </div>
-              </div>      
-            </td>
-          </tr>
-          
-          <?php
-          include("recurring_invoice_edit_modal.php");
 
-          }
-          ?>
+                            </td>
+                            <td>
+                                <div class="dropdown dropleft text-center">
+                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                        <i class="fas fa-ellipsis-h"></i>
+                                    </button>
+                                    <div class="dropdown-menu">
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editRecurringModal<?php echo $recurring_id; ?>">Edit</a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger" href="post.php?delete_recurring=<?php echo $recurring_id; ?>">Delete</a>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
 
-        </tbody>
-      </table>
+                        <?php
+                        require("recurring_invoice_edit_modal.php");
+
+                    }
+                    ?>
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once("pagination.php"); ?>
+        </div>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
-</div>
 
-<?php 
-  
-  include("recurring_invoice_add_modal.php");
-  include("category_quick_add_modal.php");
+<?php
 
-  include("footer.php");
+require_once("recurring_invoice_add_modal.php");
+require_once("category_quick_add_modal.php");
+require_once("footer.php");
 
-?>
\ No newline at end of file
+?>
diff --git a/report_expense_by_vendor.php b/report_expense_by_vendor.php
index 694b4391..e16166b5 100644
--- a/report_expense_by_vendor.php
+++ b/report_expense_by_vendor.php
@@ -1,6 +1,6 @@
 <?php
 
-include("inc_all_reports.php");
+require_once("inc_all_reports.php");
 validateAccountantRole();
 
 if (isset($_GET['year'])) {
@@ -9,9 +9,9 @@ if (isset($_GET['year'])) {
     $year = date('Y');
 }
 
-$sql_payment_years = mysqli_query($mysqli,"SELECT DISTINCT YEAR(payment_date) AS payment_year FROM payments WHERE company_id = $session_company_id UNION SELECT DISTINCT YEAR(revenue_date) AS payment_year FROM revenues WHERE company_id = $session_company_id ORDER BY payment_year DESC");
+$sql_payment_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(payment_date) AS payment_year FROM payments WHERE company_id = $session_company_id UNION SELECT DISTINCT YEAR(revenue_date) AS payment_year FROM revenues WHERE company_id = $session_company_id ORDER BY payment_year DESC");
 
-$sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE company_id = $session_company_id");
+$sql_vendors = mysqli_query($mysqli, "SELECT * FROM vendors WHERE company_id = $session_company_id");
 
 ?>
 
@@ -53,14 +53,12 @@ $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE company_id = $s
                         $vendor_id = $row['vendor_id'];
                         $vendor_name = htmlentities($row['vendor_name']);
 
-                        $sql_amount_paid = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS amount_paid FROM expenses WHERE YEAR(expense_date) = $year AND expense_vendor_id = $vendor_id");
+                        $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS amount_paid FROM expenses WHERE YEAR(expense_date) = $year AND expense_vendor_id = $vendor_id");
                         $row = mysqli_fetch_array($sql_amount_paid);
 
                         $amount_paid = floatval($row['amount_paid']);
 
-                        if ($amount_paid > 599) {
-
-                            ?>
+                        if ($amount_paid > 599) { ?>
 
                             <tr>
                                 <td><?php echo $vendor_name; ?></td>
diff --git a/report_expense_summary.php b/report_expense_summary.php
index 11d162b4..bc0a4984 100644
--- a/report_expense_summary.php
+++ b/report_expense_summary.php
@@ -9,9 +9,9 @@ if (isset($_GET['year'])) {
     $year = date('Y');
 }
 
-$sql_expense_years = mysqli_query($mysqli,"SELECT DISTINCT YEAR(expense_date) AS expense_year FROM expenses WHERE expense_category_id > 0 AND company_id = $session_company_id ORDER BY expense_year DESC");
+$sql_expense_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(expense_date) AS expense_year FROM expenses WHERE expense_category_id > 0 AND company_id = $session_company_id ORDER BY expense_year DESC");
 
-$sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense' AND company_id = $session_company_id ORDER BY category_name ASC");
+$sql_categories = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Expense' AND company_id = $session_company_id ORDER BY category_name ASC");
 
 ?>
 
@@ -75,7 +75,7 @@ $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_
 
                         $total_expense_for_all_months = 0;
                         for($month = 1; $month<=12; $month++) {
-                            $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS expense_amount_for_month FROM expenses WHERE expense_category_id = $category_id AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month");
+                            $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS expense_amount_for_month FROM expenses WHERE expense_category_id = $category_id AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month");
                             $row = mysqli_fetch_array($sql_expenses);
                             $expense_amount_for_month = $row['expense_amount_for_month'];
                             $total_expense_for_all_months = $expense_amount_for_month + $total_expense_for_all_months;
@@ -104,7 +104,7 @@ $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_
                     <?php
 
                     for($month = 1; $month<=12; $month++) {
-                        $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS expense_total_amount_for_month FROM expenses WHERE YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND expense_vendor_id > 0 AND company_id = $session_company_id");
+                        $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS expense_total_amount_for_month FROM expenses WHERE YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND expense_vendor_id > 0 AND company_id = $session_company_id");
                         $row = mysqli_fetch_array($sql_expenses);
                         $expense_total_amount_for_month = $row['expense_total_amount_for_month'];
                         $total_expense_for_all_months = $expense_total_amount_for_month + $total_expense_for_all_months;
@@ -156,7 +156,7 @@ $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_
                     $largest_expense_month = 0;
 
                     for($month = 1; $month<=12; $month++) {
-                    $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS expense_amount_for_month FROM expenses WHERE YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND expense_vendor_id > 0 AND expenses.company_id = $session_company_id");
+                    $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS expense_amount_for_month FROM expenses WHERE YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND expense_vendor_id > 0 AND expenses.company_id = $session_company_id");
                     $row = mysqli_fetch_array($sql_expenses);
                     $expenses_for_month = $row['expense_amount_for_month'];
 
diff --git a/report_income_by_client.php b/report_income_by_client.php
index e5a7a7fa..816a84c1 100644
--- a/report_income_by_client.php
+++ b/report_income_by_client.php
@@ -9,9 +9,9 @@ if (isset($_GET['year'])) {
     $year = date('Y');
 }
 
-$sql_payment_years = mysqli_query($mysqli,"SELECT DISTINCT YEAR(payment_date) AS payment_year FROM payments WHERE company_id = $session_company_id UNION SELECT DISTINCT YEAR(revenue_date) AS payment_year FROM revenues WHERE company_id = $session_company_id ORDER BY payment_year DESC");
+$sql_payment_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(payment_date) AS payment_year FROM payments WHERE company_id = $session_company_id UNION SELECT DISTINCT YEAR(revenue_date) AS payment_year FROM revenues WHERE company_id = $session_company_id ORDER BY payment_year DESC");
 
-$sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id");
+$sql_clients = mysqli_query($mysqli, "SELECT * FROM clients WHERE company_id = $session_company_id");
 
 ?>
 
diff --git a/report_income_summary.php b/report_income_summary.php
index dfffedc7..adfa16d9 100644
--- a/report_income_summary.php
+++ b/report_income_summary.php
@@ -78,12 +78,12 @@ $sql_categories = mysqli_query($mysqli, "SELECT * FROM categories WHERE category
 
                         for($month = 1; $month<=12; $month++) {
                             //Payments to Invoices
-                            $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS payment_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_category_id = $category_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month");
+                            $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS payment_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_category_id = $category_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month");
                             $row = mysqli_fetch_array($sql_payments);
                             $payment_amount_for_month = $row['payment_amount_for_month'];
 
                             //Revenues
-                            $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id = $category_id AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month");
+                            $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id = $category_id AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month");
                             $row = mysqli_fetch_array($sql_revenues);
                             $revenues_amount_for_month = $row['revenue_amount_for_month'];
 
@@ -114,11 +114,11 @@ $sql_categories = mysqli_query($mysqli, "SELECT * FROM categories WHERE category
                     <?php
 
                     for($month = 1; $month<=12; $month++) {
-                        $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS payment_total_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month AND payments.company_id = $session_company_id");
+                        $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS payment_total_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month AND payments.company_id = $session_company_id");
                         $row = mysqli_fetch_array($sql_payments);
                         $payment_total_amount_for_month = $row['payment_total_amount_for_month'];
 
-                        $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id > 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND revenues.company_id = $session_company_id");
+                        $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id > 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND revenues.company_id = $session_company_id");
                         $row = mysqli_fetch_array($sql_revenues);
                         $revenues_total_amount_for_month = $row['revenue_amount_for_month'];
 
@@ -171,11 +171,11 @@ $sql_categories = mysqli_query($mysqli, "SELECT * FROM categories WHERE category
                     <?php
 
                     for ($month = 1; $month<=12; $month++) {
-                    $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS payment_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month AND payments.company_id = $session_company_id");
+                    $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS payment_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month AND payments.company_id = $session_company_id");
                     $row = mysqli_fetch_array($sql_payments);
                     $payments_for_month = $row['payment_amount_for_month'];
 
-                    $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id > 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND company_id = $session_company_id");
+                    $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id > 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND company_id = $session_company_id");
                     $row = mysqli_fetch_array($sql_revenues);
                     $revenues_for_month = $row['revenue_amount_for_month'];
 
diff --git a/report_profit_loss.php b/report_profit_loss.php
index 4fa68d5b..1846a95a 100644
--- a/report_profit_loss.php
+++ b/report_profit_loss.php
@@ -10,11 +10,11 @@ if (isset($_GET['year'])) {
 }
 
 //GET unique years from expenses, payments and revenues
-$sql_all_years = mysqli_query($mysqli,"SELECT YEAR(expense_date) AS all_years FROM expenses WHERE company_id = $session_company_id UNION DISTINCT SELECT YEAR(payment_date) FROM payments WHERE company_id = $session_company_id UNION DISTINCT SELECT YEAR(revenue_date) FROM revenues WHERE company_id = $session_company_id ORDER BY all_years DESC");
+$sql_all_years = mysqli_query($mysqli, "SELECT YEAR(expense_date) AS all_years FROM expenses WHERE company_id = $session_company_id UNION DISTINCT SELECT YEAR(payment_date) FROM payments WHERE company_id = $session_company_id UNION DISTINCT SELECT YEAR(revenue_date) FROM revenues WHERE company_id = $session_company_id ORDER BY all_years DESC");
 
-$sql_categories_income = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND company_id = $session_company_id ORDER BY category_name ASC");
+$sql_categories_income = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND company_id = $session_company_id ORDER BY category_name ASC");
 
-$sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense' AND company_id = $session_company_id ORDER BY category_name ASC");
+$sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Expense' AND company_id = $session_company_id ORDER BY category_name ASC");
 
 
 ?>
@@ -73,11 +73,11 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
                             $payment_amount_for_quarter_one = 0;
 
                             for($month = 1; $month<=3; $month++) {
-                                $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS payment_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_category_id = $category_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month");
+                                $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS payment_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_category_id = $category_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month");
                                 $row = mysqli_fetch_array($sql_payments);
                                 $payment_amount_for_month = $row['payment_amount_for_month'];
 
-                                $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id = $category_id AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month");
+                                $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id = $category_id AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month");
                                 $row = mysqli_fetch_array($sql_revenues);
                                 $revenue_amount_for_month = $row['revenue_amount_for_month'];
 
@@ -95,11 +95,11 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
                             $payment_amount_for_quarter_two = 0;
 
                             for($month = 4; $month<=6; $month++) {
-                                $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS payment_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_category_id = $category_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month");
+                                $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS payment_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_category_id = $category_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month");
                                 $row = mysqli_fetch_array($sql_payments);
                                 $payment_amount_for_month = $row['payment_amount_for_month'];
 
-                                $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id = $category_id AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month");
+                                $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id = $category_id AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month");
                                 $row = mysqli_fetch_array($sql_revenues);
                                 $revenue_amount_for_month = $row['revenue_amount_for_month'];
 
@@ -117,11 +117,11 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
                             $payment_amount_for_quarter_three = 0;
 
                             for($month = 7; $month<=9; $month++) {
-                                $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS payment_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_category_id = $category_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month");
+                                $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS payment_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_category_id = $category_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month");
                                 $row = mysqli_fetch_array($sql_payments);
                                 $payment_amount_for_month = $row['payment_amount_for_month'];
 
-                                $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id = $category_id AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month");
+                                $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id = $category_id AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month");
                                 $row = mysqli_fetch_array($sql_revenues);
                                 $revenue_amount_for_month = $row['revenue_amount_for_month'];
 
@@ -138,11 +138,11 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
                             $payment_amount_for_quarter_four = 0;
 
                             for($month = 10; $month<=12; $month++) {
-                                $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS payment_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_category_id = $category_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month");
+                                $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS payment_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_category_id = $category_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month");
                                 $row = mysqli_fetch_array($sql_payments);
                                 $payment_amount_for_month = $row['payment_amount_for_month'];
 
-                                $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id = $category_id AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month");
+                                $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS revenue_amount_for_month FROM revenues WHERE revenue_category_id = $category_id AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month");
                                 $row = mysqli_fetch_array($sql_revenues);
                                 $revenue_amount_for_month = $row['revenue_amount_for_month'];
 
@@ -174,11 +174,11 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
                         $payment_total_amount_for_quarter_one = 0;
 
                         for($month = 1; $month<=3; $month++) {
-                            $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS payment_total_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month AND payments.company_id = $session_company_id");
+                            $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS payment_total_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month AND payments.company_id = $session_company_id");
                             $row = mysqli_fetch_array($sql_payments);
                             $payment_total_amount_for_month = $row['payment_total_amount_for_month'];
 
-                            $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS revenue_total_amount_for_month FROM revenues WHERE revenue_category_id > 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND revenues.company_id = $session_company_id");
+                            $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS revenue_total_amount_for_month FROM revenues WHERE revenue_category_id > 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND revenues.company_id = $session_company_id");
                             $row = mysqli_fetch_array($sql_revenues);
                             $revenue_total_amount_for_month = $row['revenue_total_amount_for_month'];
 
@@ -196,11 +196,11 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
                         $payment_total_amount_for_quarter_two = 0;
 
                         for($month = 4; $month<=6; $month++) {
-                            $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS payment_total_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month AND payments.company_id = $session_company_id");
+                            $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS payment_total_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month AND payments.company_id = $session_company_id");
                             $row = mysqli_fetch_array($sql_payments);
                             $payment_total_amount_for_month = $row['payment_total_amount_for_month'];
 
-                            $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS revenue_total_amount_for_month FROM revenues WHERE revenue_category_id > 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND revenues.company_id = $session_company_id");
+                            $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS revenue_total_amount_for_month FROM revenues WHERE revenue_category_id > 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND revenues.company_id = $session_company_id");
                             $row = mysqli_fetch_array($sql_revenues);
                             $revenue_total_amount_for_month = $row['revenue_total_amount_for_month'];
 
@@ -218,11 +218,11 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
                         $payment_total_amount_for_quarter_three = 0;
 
                         for($month = 7; $month<=9; $month++) {
-                            $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS payment_total_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month AND payments.company_id = $session_company_id");
+                            $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS payment_total_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month AND payments.company_id = $session_company_id");
                             $row = mysqli_fetch_array($sql_payments);
                             $payment_total_amount_for_month = $row['payment_total_amount_for_month'];
 
-                            $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS revenue_total_amount_for_month FROM revenues WHERE revenue_category_id > 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND revenues.company_id = $session_company_id");
+                            $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS revenue_total_amount_for_month FROM revenues WHERE revenue_category_id > 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND revenues.company_id = $session_company_id");
                             $row = mysqli_fetch_array($sql_revenues);
                             $revenue_total_amount_for_month = $row['revenue_total_amount_for_month'];
 
@@ -240,11 +240,11 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
                         $payment_total_amount_for_quarter_four = 0;
 
                         for($month = 10; $month<=12; $month++) {
-                            $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS payment_total_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month AND payments.company_id = $session_company_id");
+                            $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS payment_total_amount_for_month FROM payments, invoices WHERE payment_invoice_id = invoice_id AND YEAR(payment_date) = $year AND MONTH(payment_date) = $month AND payments.company_id = $session_company_id");
                             $row = mysqli_fetch_array($sql_payments);
                             $payment_total_amount_for_month = $row['payment_total_amount_for_month'];
 
-                            $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS revenue_total_amount_for_month FROM revenues WHERE revenue_category_id > 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND revenues.company_id = $session_company_id");
+                            $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS revenue_total_amount_for_month FROM revenues WHERE revenue_category_id > 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND revenues.company_id = $session_company_id");
                             $row = mysqli_fetch_array($sql_revenues);
                             $revenue_total_amount_for_month = $row['revenue_total_amount_for_month'];
 
@@ -280,7 +280,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
                             $expense_amount_for_quarter_one = 0;
 
                             for($month = 1; $month<=3; $month++) {
-                                $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS expense_amount_for_month FROM expenses WHERE expense_category_id = $category_id AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month");
+                                $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS expense_amount_for_month FROM expenses WHERE expense_category_id = $category_id AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month");
                                 $row = mysqli_fetch_array($sql_expenses);
                                 $expense_amount_for_quarter_one = $expense_amount_for_quarter_one + $row['expense_amount_for_month'];
                             }
@@ -294,7 +294,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
                             $expense_amount_for_quarter_two = 0;
 
                             for($month = 4; $month<=6; $month++) {
-                                $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS expense_amount_for_month FROM expenses WHERE expense_category_id = $category_id AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month");
+                                $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS expense_amount_for_month FROM expenses WHERE expense_category_id = $category_id AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month");
                                 $row = mysqli_fetch_array($sql_expenses);
                                 $expense_amount_for_quarter_two = $expense_amount_for_quarter_two + $row['expense_amount_for_month'];
                             }
@@ -308,7 +308,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
                             $expense_amount_for_quarter_three = 0;
 
                             for($month = 7; $month<=9; $month++) {
-                                $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS expense_amount_for_month FROM expenses WHERE expense_category_id = $category_id AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month");
+                                $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS expense_amount_for_month FROM expenses WHERE expense_category_id = $category_id AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month");
                                 $row = mysqli_fetch_array($sql_expenses);
                                 $expense_amount_for_quarter_three = $expense_amount_for_quarter_three + $row['expense_amount_for_month'];
                             }
@@ -322,7 +322,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
                             $expense_amount_for_quarter_four = 0;
 
                             for($month = 10; $month<=12; $month++) {
-                                $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS expense_amount_for_month FROM expenses WHERE expense_category_id = $category_id AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month");
+                                $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS expense_amount_for_month FROM expenses WHERE expense_category_id = $category_id AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month");
                                 $row = mysqli_fetch_array($sql_expenses);
                                 $expense_amount_for_quarter_four = $expense_amount_for_quarter_four + $row['expense_amount_for_month'];
                             }
@@ -351,7 +351,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
                         $expense_total_amount_for_quarter_one = 0;
 
                         for($month = 1; $month<=3; $month++) {
-                            $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS expense_total_amount_for_month FROM expenses WHERE expense_category_id > 0 AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND expense_vendor_id > 0 AND company_id = $session_company_id");
+                            $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS expense_total_amount_for_month FROM expenses WHERE expense_category_id > 0 AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND expense_vendor_id > 0 AND company_id = $session_company_id");
                             $row = mysqli_fetch_array($sql_expenses);
                             $expense_total_amount_for_quarter_one = $expense_total_amount_for_quarter_one + $row['expense_total_amount_for_month'];
                         }
@@ -365,7 +365,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
                         $expense_total_amount_for_quarter_two = 0;
 
                         for($month = 4; $month<=6; $month++) {
-                            $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS expense_total_amount_for_month FROM expenses WHERE expense_category_id > 0 AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND expense_vendor_id > 0 AND company_id = $session_company_id");
+                            $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS expense_total_amount_for_month FROM expenses WHERE expense_category_id > 0 AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND expense_vendor_id > 0 AND company_id = $session_company_id");
                             $row = mysqli_fetch_array($sql_expenses);
                             $expense_total_amount_for_quarter_two = $expense_total_amount_for_quarter_two + $row['expense_total_amount_for_month'];
                         }
@@ -379,7 +379,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
                         $expense_total_amount_for_quarter_three = 0;
 
                         for($month = 7; $month<=9; $month++) {
-                            $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS expense_total_amount_for_month FROM expenses WHERE expense_category_id > 0 AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND expense_vendor_id > 0 AND company_id = $session_company_id");
+                            $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS expense_total_amount_for_month FROM expenses WHERE expense_category_id > 0 AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND expense_vendor_id > 0 AND company_id = $session_company_id");
                             $row = mysqli_fetch_array($sql_expenses);
                             $expense_total_amount_for_quarter_three = $expense_total_amount_for_quarter_three + $row['expense_total_amount_for_month'];
                         }
@@ -393,7 +393,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
                         $expense_total_amount_for_quarter_four = 0;
 
                         for($month = 10; $month<=12; $month++) {
-                            $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS expense_total_amount_for_month FROM expenses WHERE expense_category_id > 0 AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND expense_vendor_id > 0 AND company_id = $session_company_id");
+                            $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS expense_total_amount_for_month FROM expenses WHERE expense_category_id > 0 AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND expense_vendor_id > 0 AND company_id = $session_company_id");
                             $row = mysqli_fetch_array($sql_expenses);
                             $expense_total_amount_for_quarter_four = $expense_total_amount_for_quarter_four + $row['expense_total_amount_for_month'];
                         }
diff --git a/report_tax_summary.php b/report_tax_summary.php
index a2ce2b84..f7ef42e5 100644
--- a/report_tax_summary.php
+++ b/report_tax_summary.php
@@ -67,12 +67,14 @@ $sql_tax = mysqli_query($mysqli, "SELECT * FROM taxes WHERE company_id = $sessio
 
                             for($month = 1; $month<=3; $month++) {
 
-                                $sql_tax_collected = mysqli_query($mysqli, "SELECT SUM(item_tax) AS tax_collected_for_month 
-                  FROM invoices, invoice_items 
-                  WHERE item_invoice_id = invoice_id
-                  AND invoice_status LIKE 'Paid' 
-                  AND item_tax_id = $tax_id 
-                  AND YEAR(invoice_date) = $year AND MONTH(invoice_date) = $month"
+                                $sql_tax_collected = mysqli_query(
+                                    $mysqli,
+                                    "SELECT SUM(item_tax) AS tax_collected_for_month 
+                                    FROM invoices, invoice_items 
+                                    WHERE item_invoice_id = invoice_id
+                                    AND invoice_status LIKE 'Paid' 
+                                    AND item_tax_id = $tax_id 
+                                    AND YEAR(invoice_date) = $year AND MONTH(invoice_date) = $month"
                                 );
 
                                 $row = mysqli_fetch_array($sql_tax_collected);
@@ -91,12 +93,14 @@ $sql_tax = mysqli_query($mysqli, "SELECT * FROM taxes WHERE company_id = $sessio
 
                             for($month = 4; $month <= 6; $month ++) {
 
-                                $sql_tax_collected = mysqli_query($mysqli, "SELECT SUM(item_tax) AS tax_collected_for_month 
-                  FROM invoices, invoice_items 
-                  WHERE item_invoice_id = invoice_id
-                  AND invoice_status LIKE 'Paid' 
-                  AND item_tax_id = $tax_id 
-                  AND YEAR(invoice_date) = $year AND MONTH(invoice_date) = $month"
+                                $sql_tax_collected = mysqli_query(
+                                    $mysqli,
+                                    "SELECT SUM(item_tax) AS tax_collected_for_month 
+                                    FROM invoices, invoice_items 
+                                    WHERE item_invoice_id = invoice_id
+                                    AND invoice_status LIKE 'Paid' 
+                                    AND item_tax_id = $tax_id 
+                                    AND YEAR(invoice_date) = $year AND MONTH(invoice_date) = $month"
                                 );
 
                                 $row = mysqli_fetch_array($sql_tax_collected);
@@ -115,12 +119,14 @@ $sql_tax = mysqli_query($mysqli, "SELECT * FROM taxes WHERE company_id = $sessio
 
                             for($month = 7; $month <= 9; $month ++) {
 
-                                $sql_tax_collected = mysqli_query($mysqli, "SELECT SUM(item_tax) AS tax_collected_for_month 
-                  FROM invoices, invoice_items 
-                  WHERE item_invoice_id = invoice_id
-                  AND invoice_status LIKE 'Paid' 
-                  AND item_tax_id = $tax_id 
-                  AND YEAR(invoice_date) = $year AND MONTH(invoice_date) = $month"
+                                $sql_tax_collected = mysqli_query(
+                                    $mysqli,
+                                    "SELECT SUM(item_tax) AS tax_collected_for_month 
+                                    FROM invoices, invoice_items 
+                                    WHERE item_invoice_id = invoice_id
+                                    AND invoice_status LIKE 'Paid' 
+                                    AND item_tax_id = $tax_id 
+                                    AND YEAR(invoice_date) = $year AND MONTH(invoice_date) = $month"
                                 );
 
                                 $row = mysqli_fetch_array($sql_tax_collected);
@@ -139,12 +145,14 @@ $sql_tax = mysqli_query($mysqli, "SELECT * FROM taxes WHERE company_id = $sessio
 
                             for($month = 10; $month <= 12; $month ++) {
 
-                                $sql_tax_collected = mysqli_query($mysqli, "SELECT SUM(item_tax) AS tax_collected_for_month 
-                  FROM invoices, invoice_items 
-                  WHERE item_invoice_id = invoice_id
-                  AND invoice_status LIKE 'Paid' 
-                  AND item_tax_id = $tax_id 
-                  AND YEAR(invoice_date) = $year AND MONTH(invoice_date) = $month"
+                                $sql_tax_collected = mysqli_query(
+                                    $mysqli,
+                                    "SELECT SUM(item_tax) AS tax_collected_for_month 
+                                    FROM invoices, invoice_items 
+                                    WHERE item_invoice_id = invoice_id
+                                    AND invoice_status LIKE 'Paid' 
+                                    AND item_tax_id = $tax_id 
+                                    AND YEAR(invoice_date) = $year AND MONTH(invoice_date) = $month"
                                 );
 
                                 $row = mysqli_fetch_array($sql_tax_collected);
@@ -176,11 +184,13 @@ $sql_tax = mysqli_query($mysqli, "SELECT * FROM taxes WHERE company_id = $sessio
 
                         for($month = 1; $month <= 3; $month ++) {
 
-                            $sql_tax_collected = mysqli_query($mysqli, "SELECT SUM(item_tax) AS tax_collected_for_month 
-                FROM invoices, invoice_items 
-                WHERE item_invoice_id = invoice_id
-                AND invoice_status LIKE 'Paid'  
-                AND YEAR(invoice_date) = $year AND MONTH(invoice_date) = $month"
+                            $sql_tax_collected = mysqli_query(
+                                $mysqli,
+                                "SELECT SUM(item_tax) AS tax_collected_for_month 
+                                FROM invoices, invoice_items 
+                                WHERE item_invoice_id = invoice_id
+                                AND invoice_status LIKE 'Paid'  
+                                AND YEAR(invoice_date) = $year AND MONTH(invoice_date) = $month"
                             );
 
                             $row = mysqli_fetch_array($sql_tax_collected);
@@ -199,11 +209,13 @@ $sql_tax = mysqli_query($mysqli, "SELECT * FROM taxes WHERE company_id = $sessio
 
                         for($month = 4; $month <= 6; $month ++) {
 
-                            $sql_tax_collected = mysqli_query($mysqli, "SELECT SUM(item_tax) AS tax_collected_for_month 
-                FROM invoices, invoice_items 
-                WHERE item_invoice_id = invoice_id
-                AND invoice_status LIKE 'Paid'  
-                AND YEAR(invoice_date) = $year AND MONTH(invoice_date) = $month"
+                            $sql_tax_collected = mysqli_query(
+                                $mysqli,
+                                "SELECT SUM(item_tax) AS tax_collected_for_month 
+                                FROM invoices, invoice_items 
+                                WHERE item_invoice_id = invoice_id
+                                AND invoice_status LIKE 'Paid'  
+                                AND YEAR(invoice_date) = $year AND MONTH(invoice_date) = $month"
                             );
 
                             $row = mysqli_fetch_array($sql_tax_collected);
@@ -222,11 +234,13 @@ $sql_tax = mysqli_query($mysqli, "SELECT * FROM taxes WHERE company_id = $sessio
 
                         for($month = 7; $month <= 9; $month ++) {
 
-                            $sql_tax_collected = mysqli_query($mysqli, "SELECT SUM(item_tax) AS tax_collected_for_month 
-                FROM invoices, invoice_items 
-                WHERE item_invoice_id = invoice_id
-                AND invoice_status LIKE 'Paid'  
-                AND YEAR(invoice_date) = $year AND MONTH(invoice_date) = $month"
+                            $sql_tax_collected = mysqli_query(
+                                $mysqli,
+                                "SELECT SUM(item_tax) AS tax_collected_for_month 
+                                FROM invoices, invoice_items 
+                                WHERE item_invoice_id = invoice_id
+                                AND invoice_status LIKE 'Paid'  
+                                AND YEAR(invoice_date) = $year AND MONTH(invoice_date) = $month"
                             );
 
                             $row = mysqli_fetch_array($sql_tax_collected);
@@ -245,11 +259,13 @@ $sql_tax = mysqli_query($mysqli, "SELECT * FROM taxes WHERE company_id = $sessio
 
                         for($month = 10; $month <= 12; $month ++) {
 
-                            $sql_tax_collected = mysqli_query($mysqli, "SELECT SUM(item_tax) AS tax_collected_for_month
-                FROM invoices, invoice_items 
-                WHERE item_invoice_id = invoice_id
-                AND invoice_status LIKE 'Paid'  
-                AND YEAR(invoice_date) = $year AND MONTH(invoice_date) = $month"
+                            $sql_tax_collected = mysqli_query(
+                                $mysqli,
+                                "SELECT SUM(item_tax) AS tax_collected_for_month
+                                FROM invoices, invoice_items 
+                                WHERE item_invoice_id = invoice_id
+                                AND invoice_status LIKE 'Paid'  
+                                AND YEAR(invoice_date) = $year AND MONTH(invoice_date) = $month"
                             );
 
                             $row = mysqli_fetch_array($sql_tax_collected);
diff --git a/report_ticket_by_client.php b/report_ticket_by_client.php
index f2bf4941..930c0f25 100644
--- a/report_ticket_by_client.php
+++ b/report_ticket_by_client.php
@@ -9,9 +9,9 @@ if (isset($_GET['year'])) {
     $year = date('Y');
 }
 
-$sql_ticket_years = mysqli_query($mysqli,"SELECT DISTINCT YEAR(ticket_created_at) AS ticket_year FROM tickets WHERE company_id = $session_company_id ORDER BY ticket_year DESC");
+$sql_ticket_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(ticket_created_at) AS ticket_year FROM tickets WHERE company_id = $session_company_id ORDER BY ticket_year DESC");
 
-$sql_clients = mysqli_query($mysqli,"SELECT client_id, client_name FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
+$sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
 
 ?>
 
diff --git a/revenue_add_modal.php b/revenue_add_modal.php
index 5e24253b..b06bb8c2 100644
--- a/revenue_add_modal.php
+++ b/revenue_add_modal.php
@@ -1,173 +1,173 @@
 <div class="modal" id="addRevenueModal" tabindex="-1">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fas fa-money-bill-alt"></i> New Revenue</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <div class="modal-body bg-white">
-          
-          <div class="form-row">
-            
-            <div class="form-group col-md">
-              <label>Date <strong class="text-danger">*</strong></label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fas fa-money-bill-alt"></i> New Revenue</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <div class="modal-body bg-white">
+
+                    <div class="form-row">
+
+                        <div class="form-group col-md">
+                            <label>Date <strong class="text-danger">*</strong></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                </div>
+                                <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
+                            </div>
+                        </div>
+
+                        <div class="form-group col-md">
+                            <label>Currency <strong class="text-danger">*</strong></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
+                                </div>
+                                <select class="form-control select2" name="currency_code" required>
+                                    <option value="">- Currency -</option>
+                                    <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
+                                        <option <?php if ($session_company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
+                                    <?php } ?>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group col-md">
+                            <label>Amount <strong class="text-danger">*</strong></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
+                                </div>
+                                <input type="number" class="form-control" step="0.01" min="0.00" name="amount" placeholder="Enter an amount" required>
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div class="form-row">
+
+                        <div class="form-group col-md">
+                            <label>Account <strong class="text-danger">*</strong></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
+                                </div>
+                                <select class="form-control select2" name="account" required>
+                                    <option value="">- Account -</option>
+                                    <?php
+
+                                    $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL AND company_id = $session_company_id ORDER BY account_name ASC");
+                                    while ($row = mysqli_fetch_array($sql)) {
+                                        $account_id = $row['account_id'];
+                                        $account_name = htmlentities($row['account_name']);
+                                        $opening_balance = floatval($row['opening_balance']);
+
+                                        $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
+                                        $row = mysqli_fetch_array($sql_payments);
+                                        $total_payments = $row['total_payments'];
+
+                                        $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
+                                        $row = mysqli_fetch_array($sql_revenues);
+                                        $total_revenues = $row['total_revenues'];
+
+                                        $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
+                                        $row = mysqli_fetch_array($sql_expenses);
+                                        $total_expenses = $row['total_expenses'];
+
+                                        $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
+
+                                        ?>
+                                        <option <?php if ($config_default_payment_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance, 2); ?>]</option>
+
+                                        <?php
+                                    }
+                                    ?>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group col-md">
+                            <label>Category <strong class="text-danger">*</strong></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
+                                </div>
+                                <select class="form-control select2" name="category" required>
+                                    <option value="">- Category -</option>
+                                    <?php
+
+                                    $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC");
+                                    while ($row = mysqli_fetch_array($sql)) {
+                                        $category_id = $row['category_id'];
+                                        $category_name = htmlentities($row['category_name']);
+                                        ?>
+                                        <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+
+                                        <?php
+                                    }
+                                    ?>
+                                </select>
+                                <div class="input-group-append">
+                                    <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button>
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group">
+                        <label>Description</label>
+                        <textarea class="form-control" rows="5" name="description" placeholder="Enter a description"></textarea>
+                    </div>
+
+                    <div class="form-row">
+
+                        <div class="form-group col-md">
+                            <label>Payment Method <strong class="text-danger">*</strong></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
+                                </div>
+                                <select class="form-control select2" name="payment_method" required>
+                                    <option value="">- Method of Payment -</option>
+                                    <?php
+
+                                    $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Payment Method' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC");
+                                    while ($row = mysqli_fetch_array($sql)) {
+                                        $category_name = htmlentities($row['category_name']);
+                                        ?>
+                                        <option><?php echo "$category_name"; ?></option>
+
+                                        <?php
+                                    }
+                                    ?>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group col-md">
+                            <label>Reference</label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
+                                </div>
+                                <input type="text" class="form-control" name="reference" placeholder="Enter a reference">
+                            </div>
+                        </div>
+
+                    </div>
+
                 </div>
-                <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
-              </div>
-            </div>
-
-            <div class="form-group col-md">
-              <label>Currency <strong class="text-danger">*</strong></label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_revenue" class="btn btn-primary"><strong><i class="fas fa-check"></i> Add Revenue</strong></button>
                 </div>
-                <select class="form-control select2" name="currency_code" required>
-                  <option value="">- Currency -</option>
-                  <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
-                  <option <?php if ($session_company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
-                  <?php } ?>
-                </select>
-              </div>
-            </div>
-            
-            <div class="form-group col-md">
-              <label>Amount <strong class="text-danger">*</strong></label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
-                </div>
-                <input type="number" class="form-control" step="0.01" min="0.00" name="amount" placeholder="Enter an amount" required>
-              </div>
-            </div>
-          
-          </div>
-
-          <div class="form-row">
-
-            <div class="form-group col-md">
-              <label>Account <strong class="text-danger">*</strong></label>
-              <div class="input-group"> 
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
-                </div> 
-                <select class="form-control select2" name="account" required>
-                  <option value="">- Account -</option>
-                  <?php 
-                  
-                  $sql = mysqli_query($mysqli,"SELECT * FROM accounts WHERE account_archived_at IS NULL AND company_id = $session_company_id ORDER BY account_name ASC"); 
-                    while ($row = mysqli_fetch_array($sql)) {
-                      $account_id = $row['account_id'];
-                      $account_name = htmlentities($row['account_name']);
-                      $opening_balance = floatval($row['opening_balance']);
-                      
-                      $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
-                      $row = mysqli_fetch_array($sql_payments);
-                      $total_payments = $row['total_payments'];
-                      
-                      $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
-                      $row = mysqli_fetch_array($sql_revenues);
-                      $total_revenues = $row['total_revenues'];
-
-                      $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
-                      $row = mysqli_fetch_array($sql_expenses);
-                      $total_expenses = $row['total_expenses'];
-
-                      $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
-                    
-                  ?>
-                    <option <?php if ($config_default_payment_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
-                  
-                  <?php
-                  }
-                  ?>
-                </select>
-              </div>
-            </div>
-          
-            <div class="form-group col-md">
-              <label>Category <strong class="text-danger">*</strong></label>
-              <div class="input-group"> 
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
-                </div> 
-                <select class="form-control select2" name="category" required>
-                  <option value="">- Category -</option>
-                  <?php 
-                  
-                  $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC"); 
-                  while ($row = mysqli_fetch_array($sql)) {
-                    $category_id = $row['category_id'];
-                    $category_name = htmlentities($row['category_name']);
-                  ?>
-                    <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-                  
-                  <?php
-                  }
-                  ?>
-                </select>
-                <div class="input-group-append">
-                  <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button>
-                </div>
-              </div>
-            </div>
-
-          </div>
-
-          <div class="form-group">
-            <label>Description</label>
-            <textarea class="form-control" rows="5" name="description" placeholder="Enter a description"></textarea>
-          </div>
-
-          <div class="form-row">
-
-            <div class="form-group col-md">
-              <label>Payment Method <strong class="text-danger">*</strong></label>
-              <div class="input-group"> 
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
-                </div> 
-                <select class="form-control select2" name="payment_method" required>
-                  <option value="">- Method of Payment -</option>
-                  <?php 
-                  
-                  $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC"); 
-                  while ($row = mysqli_fetch_array($sql)) {
-                    $category_name = htmlentities($row['category_name']);
-                  ?>
-                    <option><?php echo "$category_name"; ?></option>
-                  
-                  <?php
-                  }
-                  ?>
-                </select>
-              </div>
-            </div>
-
-            <div class="form-group col-md">
-              <label>Reference</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
-                </div>
-                <input type="text" class="form-control" name="reference" placeholder="Enter a reference">
-              </div>
-            </div>
-
-          </div>
-  
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_revenue" class="btn btn-primary"><strong><i class="fas fa-check"></i> Add Revenue</strong></button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/revenue_edit_modal.php b/revenue_edit_modal.php
index f9dcf4e2..4cc0bb09 100644
--- a/revenue_edit_modal.php
+++ b/revenue_edit_modal.php
@@ -1,174 +1,174 @@
 <div class="modal" id="editRevenueModal<?php echo $revenue_id; ?>" tabindex="-1">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fas fa-money-bill-alt mr-2"></i>Edit Revenue</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="revenue_id" value="<?php echo $revenue_id; ?>">
-        <div class="modal-body bg-white">
-          
-          <div class="form-row">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fas fa-money-bill-alt mr-2"></i>Edit Revenue</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="revenue_id" value="<?php echo $revenue_id; ?>">
+                <div class="modal-body bg-white">
+
+                    <div class="form-row">
+
+                        <div class="form-group col-md">
+                            <label>Date <strong class="text-danger">*</strong></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                                </div>
+                                <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo $revenue_date; ?>" required>
+                            </div>
+                        </div>
+
+                        <div class="form-group col-md">
+                            <label>Currency <strong class="text-danger">*</strong></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
+                                </div>
+                                <select class="form-control select2" name="currency_code" required>
+                                    <option value="">- Currency -</option>
+                                    <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
+                                        <option <?php if ($revenue_currency_code == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
+                                    <?php } ?>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group col-md">
+                            <label>Amount <strong class="text-danger">*</strong></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
+                                </div>
+                                <input type="number" class="form-control" step="0.01" min="0.00" name="amount" value="<?php echo $revenue_amount; ?>" required>
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div class="form-row">
+
+                        <div class="form-group col-md">
+                            <label>Account <strong class="text-danger">*</strong></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
+                                </div>
+                                <select class="form-control select2" name="account" required>
+                                    <option value="">- Account -</option>
+                                    <?php
+
+                                    $sql_accounts = mysqli_query($mysqli, "SELECT * FROM accounts WHERE (account_archived_at > '$revenue_created_at' OR account_archived_at IS NULL) AND company_id = $session_company_id  ORDER BY account_name ASC");
+                                    while ($row = mysqli_fetch_array($sql_accounts)) {
+                                        $account_id_select = $row['account_id'];
+                                        $account_name_select = htmlentities($row['account_name']);
+                                        $opening_balance = floatval($row['opening_balance']);
+
+                                        $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id_select");
+                                        $row = mysqli_fetch_array($sql_payments);
+                                        $total_payments = $row['total_payments'];
+
+                                        $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id_select");
+                                        $row = mysqli_fetch_array($sql_revenues);
+                                        $total_revenues = $row['total_revenues'];
+
+                                        $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id_select");
+                                        $row = mysqli_fetch_array($sql_expenses);
+                                        $total_expenses = $row['total_expenses'];
+
+                                        $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
+
+                                        ?>
+                                        <option <?php if ($account_id == $account_id_select) { echo "selected"; } ?> value="<?php echo $account_id_select; ?>"><?php echo $account_name_select; ?> [$<?php echo number_format($balance, 2); ?>]</option>
+
+                                        <?php
+                                    }
+                                    ?>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group col-md">
+                            <label>Category <strong class="text-danger">*</strong></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
+                                </div>
+                                <select class="form-control select2" name="category" required>
+                                    <option value="">- Category -</option>
+                                    <?php
+
+                                    $sql_category = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$revenue_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC");
+                                    while ($row = mysqli_fetch_array($sql_category)) {
+                                        $category_id_select = $row['category_id'];
+                                        $category_name = htmlentities($row['category_name']);
+                                        ?>
+                                        <option <?php if ($category_id_select == $category_id) { echo "selected"; } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name; ?></option>
+
+                                        <?php
+                                    }
+                                    ?>
+                                </select>
+                                <div class="input-group-append">
+                                    <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button>
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group">
+                        <label>Description</label>
+                        <textarea class="form-control" rows="4" name="description"><?php echo $revenue_description; ?></textarea>
+                    </div>
+
+                    <div class="form-row">
+
+                        <div class="form-group col-md">
+                            <label>Payment Method <strong class="text-danger">*</strong></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
+                                </div>
+                                <select class="form-control select2" name="payment_method" required>
+                                    <option value="">- Method of Payment -</option>
+                                    <?php
+
+                                    $sql_categories = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Payment Method' AND (category_archived_at > '$revenue_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC");
+                                    while ($row = mysqli_fetch_array($sql_categories)) {
+                                        $category_name_select = htmlentities($row['category_name']);
+                                        ?>
+                                        <option <?php if ($revenue_payment_method == $category_name_select) { echo "selected"; } ?>><?php echo "$category_name_select"; ?></option>
+
+                                        <?php
+                                    }
+                                    ?>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group col-md">
+                            <label>Reference</label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
+                                </div>
+                                <input type="text" class="form-control" name="reference" placeholder="Enter a reference" value="<?php echo $revenue_reference; ?>">
+                            </div>
+                        </div>
+
+                    </div>
 
-            <div class="form-group col-md">
-              <label>Date <strong class="text-danger">*</strong></label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
-                <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo $revenue_date; ?>" required>
-              </div>
-            </div>
-
-            <div class="form-group col-md">
-              <label>Currency <strong class="text-danger">*</strong></label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="edit_revenue" class="btn btn-primary"><strong><i class="fas fa-check"></i> Save</strong></button>
                 </div>
-                <select class="form-control select2" name="currency_code" required>
-                  <option value="">- Currency -</option>
-                  <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
-                  <option <?php if ($revenue_currency_code == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
-                  <?php } ?>
-                </select>
-              </div>
-            </div>
-            
-            <div class="form-group col-md">
-              <label>Amount <strong class="text-danger">*</strong></label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
-                </div>
-                <input type="number" class="form-control" step="0.01" min="0.00" name="amount" value="<?php echo $revenue_amount; ?>" required>
-              </div>
-            </div>
-
-          </div>
-
-          <div class="form-row">
-
-            <div class="form-group col-md">
-              <label>Account <strong class="text-danger">*</strong></label>
-              <div class="input-group"> 
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
-                </div> 
-                <select class="form-control select2" name="account" required>
-                  <option value="">- Account -</option>
-                  <?php 
-                  
-                  $sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts WHERE (account_archived_at > '$revenue_created_at' OR account_archived_at IS NULL) AND company_id = $session_company_id  ORDER BY account_name ASC");
-                  while ($row = mysqli_fetch_array($sql_accounts)) {
-                    $account_id_select = $row['account_id'];
-                    $account_name_select = htmlentities($row['account_name']);
-                    $opening_balance = floatval($row['opening_balance']);
-                    
-                    $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id_select");
-                    $row = mysqli_fetch_array($sql_payments);
-                    $total_payments = $row['total_payments'];
-                    
-                    $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id_select");
-                    $row = mysqli_fetch_array($sql_revenues);
-                    $total_revenues = $row['total_revenues'];
-
-                    $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id_select");
-                    $row = mysqli_fetch_array($sql_expenses);
-                    $total_expenses = $row['total_expenses'];
-
-                    $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
-                    
-                  ?>
-                    <option <?php if ($account_id == $account_id_select) { echo "selected"; } ?> value="<?php echo $account_id_select; ?>"><?php echo $account_name_select; ?> [$<?php echo number_format($balance,2); ?>]</option>
-                  
-                  <?php
-                  }
-                  ?>
-                </select>
-              </div>
-            </div>
-
-            <div class="form-group col-md">
-              <label>Category <strong class="text-danger">*</strong></label>
-              <div class="input-group"> 
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
-                </div> 
-                <select class="form-control select2" name="category" required>
-                  <option value="">- Category -</option>
-                  <?php 
-                  
-                  $sql_category = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$revenue_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC"); 
-                  while ($row = mysqli_fetch_array($sql_category)) {
-                    $category_id_select = $row['category_id'];
-                    $category_name = htmlentities($row['category_name']);
-                  ?>
-                    <option <?php if ($category_id_select == $category_id) { echo "selected"; } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name; ?></option>
-                  
-                  <?php
-                  }
-                  ?>
-                </select>
-                <div class="input-group-append">
-                  <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button>
-                </div>
-              </div>
-            </div>
-
-          </div>
-
-          <div class="form-group">
-            <label>Description</label>
-            <textarea class="form-control" rows="4" name="description"><?php echo $revenue_description; ?></textarea>
-          </div>
-
-          <div class="form-row">
-          
-            <div class="form-group col-md">
-              <label>Payment Method <strong class="text-danger">*</strong></label>
-              <div class="input-group"> 
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
-                </div> 
-                <select class="form-control select2" name="payment_method" required>
-                  <option value="">- Method of Payment -</option>
-                  <?php 
-                  
-                  $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method' AND (category_archived_at > '$revenue_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC"); 
-                  while ($row = mysqli_fetch_array($sql_categories)) {
-                    $category_name_select = htmlentities($row['category_name']);
-                  ?>
-                    <option <?php if ($revenue_payment_method == $category_name_select) { echo "selected"; } ?>><?php echo "$category_name_select"; ?></option>
-                  
-                  <?php
-                  }
-                  ?>
-                </select>
-              </div>
-            </div>
-
-            <div class="form-group col-md">
-              <label>Reference</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
-                </div>
-                <input type="text" class="form-control" name="reference" placeholder="Enter a reference" value="<?php echo $revenue_reference; ?>">
-              </div>
-            </div>
-
-          </div>
-  
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_revenue" class="btn btn-primary"><strong><i class="fas fa-check"></i> Save</strong></button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/revenues.php b/revenues.php
index c9b95772..a5e5b537 100644
--- a/revenues.php
+++ b/revenues.php
@@ -3,7 +3,7 @@
 require_once("inc_all.php");
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "revenue_date";
 }
@@ -22,41 +22,41 @@ if (empty($_GET['canned_date'])) {
 
 //Date Filter
 if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
-    $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf']));
-    $dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt']));
+    $dtf = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtf']));
+    $dtt = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtt']));
 } elseif ($_GET['canned_date'] == "today") {
     $dtf = date('Y-m-d');
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "yesterday") {
-    $dtf = date('Y-m-d',strtotime("yesterday"));
-    $dtt = date('Y-m-d',strtotime("yesterday"));
+    $dtf = date('Y-m-d', strtotime("yesterday"));
+    $dtt = date('Y-m-d', strtotime("yesterday"));
 } elseif ($_GET['canned_date'] == "thisweek") {
-    $dtf = date('Y-m-d',strtotime("monday this week"));
+    $dtf = date('Y-m-d', strtotime("monday this week"));
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastweek") {
-    $dtf = date('Y-m-d',strtotime("monday last week"));
-    $dtt = date('Y-m-d',strtotime("sunday last week"));
+    $dtf = date('Y-m-d', strtotime("monday last week"));
+    $dtt = date('Y-m-d', strtotime("sunday last week"));
 } elseif ($_GET['canned_date'] == "thismonth") {
     $dtf = date('Y-m-01');
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastmonth") {
-    $dtf = date('Y-m-d',strtotime("first day of last month"));
-    $dtt = date('Y-m-d',strtotime("last day of last month"));
+    $dtf = date('Y-m-d', strtotime("first day of last month"));
+    $dtt = date('Y-m-d', strtotime("last day of last month"));
 } elseif ($_GET['canned_date'] == "thisyear") {
     $dtf = date('Y-01-01');
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastyear") {
-    $dtf = date('Y-m-d',strtotime("first day of january last year"));
-    $dtt = date('Y-m-d',strtotime("last day of december last year"));
+    $dtf = date('Y-m-d', strtotime("first day of january last year"));
+    $dtt = date('Y-m-d', strtotime("last day of december last year"));
 } else {
     $dtf = "0000-00-00";
     $dtt = "9999-00-00";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM revenues
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM revenues
   JOIN categories ON revenue_category_id = category_id
   LEFT JOIN accounts ON revenue_account_id = account_id
   WHERE revenues.company_id = $session_company_id
@@ -64,7 +64,7 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM revenues
   AND DATE(revenue_date) BETWEEN '$dtf' AND '$dtt'
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
diff --git a/rfc6238.php b/rfc6238.php
index c95554db..61e91418 100644
--- a/rfc6238.php
+++ b/rfc6238.php
@@ -17,7 +17,7 @@ class TokenAuth6238 {
             $checktime = (int)($unixtimestamp+$i);
             $thiskey = self::oath_hotp($key, $checktime);
 
-            if ((int)$code == self::oath_truncate($thiskey,6)) {
+            if ((int)$code == self::oath_truncate($thiskey, 6)) {
                 return true;
             }
 
@@ -31,12 +31,12 @@ class TokenAuth6238 {
 
         $checktime = (int)($unixtimestamp);
         $thiskey = self::oath_hotp($key, $checktime);
-        $result = $result . self::oath_truncate($thiskey,6);
+        $result = $result . self::oath_truncate($thiskey, 6);
 
         $result = "000000" . $result;
         return substr($result, -6);
     }
-    public static function getTokenCodeDebug($secretkey,$rangein30s = 3) {
+    public static function getTokenCodeDebug($secretkey, $rangein30s = 3) {
         $result = "";
         print "<br/>SecretKey: $secretkey <br/>";
 
@@ -52,7 +52,7 @@ class TokenAuth6238 {
             $thiskey = self::oath_hotp($key, $checktime, true);
             print "======================================================<br/>";
             print "CheckTime: $checktime oath_hotp:".$thiskey."<br/>";
-            $result = $result." # ".self::oath_truncate($thiskey,6,true);
+            $result = $result." # ".self::oath_truncate($thiskey, 6, true);
         }
 
         return $result;
@@ -117,7 +117,7 @@ class TokenAuth6238 {
             print "converting hex hash into characters<br/>";
         }
 
-        $hashcharacters = str_split($hash,2);
+        $hashcharacters = str_split($hash, 2);
 
         if ($debug) {
             print_r($hashcharacters);
@@ -144,7 +144,7 @@ class TokenAuth6238 {
                 (($hmac_result[$offset+1] & 0xff) << 16) |
                 (($hmac_result[$offset+2] & 0xff) << 8) |
                 ($hmac_result[$offset+3] & 0xff)
-            ) % pow(10,$length);
+            ) % pow(10, $length);
         return $result;
     }
 
diff --git a/scheduled_ticket_add_modal.php b/scheduled_ticket_add_modal.php
index 0b05de61..6c4226b4 100644
--- a/scheduled_ticket_add_modal.php
+++ b/scheduled_ticket_add_modal.php
@@ -21,7 +21,7 @@
                                     <option value="">- Contact -</option>
                                     <?php
 
-                                    $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
+                                    $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
                                     while ($row = mysqli_fetch_array($sql)) {
                                         $contact_id = $row['contact_id'];
                                         $contact_name = htmlentities($row['contact_name']);
@@ -45,7 +45,7 @@
                                     <option value="">- Client -</option>
                                     <?php
 
-                                    $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
+                                    $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
                                     while ($row = mysqli_fetch_array($sql)) {
                                         $client_id = $row['client_id'];
                                         $client_name = htmlentities($row['client_name']);
@@ -120,7 +120,7 @@
                                 <option value="0">- None -</option>
                                 <?php
 
-                                $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
+                                $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
                                 while ($row = mysqli_fetch_array($sql_assets)) {
                                     $asset_id_select = $row['asset_id'];
                                     $asset_name_select = htmlentities($row['asset_name']);
diff --git a/scheduled_tickets.php b/scheduled_tickets.php
index 6aca2c11..d9ef81a1 100644
--- a/scheduled_tickets.php
+++ b/scheduled_tickets.php
@@ -1,115 +1,115 @@
 <?php
-include("inc_all.php");
+require_once("inc_all.php");
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
-  $sb = "scheduled_ticket_subject";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
+    $sb = "scheduled_ticket_subject";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
 // SQL
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM scheduled_tickets
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM scheduled_tickets
   LEFT JOIN clients on scheduled_ticket_client_id = client_id
   WHERE scheduled_tickets.scheduled_ticket_subject LIKE '%$q%'
   ORDER BY $sb $o LIMIT $record_from, $record_to"
 );
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 ?>
 
-<script src="js/scheduled_tickets_edit_modal.js"></script>
+    <script src="js/scheduled_tickets_edit_modal.js"></script>
 
-<div class="card card-dark">
-  <div class="card-header">
-    <h3 class="card-title"><i class="fa fa-fw fa-sync"></i> Scheduled Tickets</h3>
-  </div>
-
-  <div class="card-body">
-
-    <form autocomplete="off">
-      <div class="row">
-
-        <div class="col-md-4">
-          <div class="input-group mb-3 mb-md-0">
-            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo strip_tags(htmlentities($q));} ?>" placeholder="Search Scheduled Tickets">
-            <div class="input-group-append">
-              <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-            </div>
-          </div>
+    <div class="card card-dark">
+        <div class="card-header">
+            <h3 class="card-title"><i class="fa fa-fw fa-sync"></i> Scheduled Tickets</h3>
         </div>
 
-      </div>
-    </form>
-    <hr>
+        <div class="card-body">
 
-    <div class="table-responsive">
-      <table class="table table-striped table-borderless table-hover">
-        <thead class="<?php if ($num_rows[0] == 0) {
-          echo "d-none";
-        } ?>">
-        <tr>
-          <th><a class="text-dark">Client</a></th>
-          <th><a class="text-dark">Subject</a></th>
-          <th><a class="text-dark">Priority</a></th>
-          <th><a class="text-dark">Frequency</a></th>
-          <th><a class="text-dark">Next Run Date</a></th>
+            <form autocomplete="off">
+                <div class="row">
 
-          <th class="text-center">Action</th>
-        </tr>
-        </thead>
-        <tbody>
-        <?php
-
-        while ($row = mysqli_fetch_array($sql)) {
-          $scheduled_ticket_id = $row['scheduled_ticket_id'];
-          $scheduled_ticket_client_id = $row['client_id'];
-          $scheduled_ticket_subject = htmlentities($row['scheduled_ticket_subject']);
-          $scheduled_ticket_priority = htmlentities($row['scheduled_ticket_priority']);
-          $scheduled_ticket_frequency = htmlentities($row['scheduled_ticket_frequency']);
-          $scheduled_ticket_next_run = $row['scheduled_ticket_next_run'];
-          $scheduled_ticket_client_name = htmlentities($row['client_name']);
-          ?>
-
-          <tr>
-            <td><a> <?php echo $scheduled_ticket_client_name ?></a></td>
-            <td><a href="#" data-toggle="modal" data-target="#editScheduledTicketModal"
-                   onclick="populateScheduledTicketEditModal(<?php echo $scheduled_ticket_client_id, ",", $scheduled_ticket_id ?>)"> <?php echo $scheduled_ticket_subject ?> </a></td>                            <td><a> <?php echo $scheduled_ticket_priority ?></a></td>
-            <td><a> <?php echo $scheduled_ticket_frequency ?></a></td>
-            <td><a> <?php echo $scheduled_ticket_next_run ?></a></td>
-
-            <td>
-              <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                  <i class="fas fa-ellipsis-h"></i>
-                </button>
-                <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#" data-toggle="modal"
-                     data-target="#editScheduledTicketModal" onclick="populateScheduledTicketEditModal(<?php echo $scheduled_ticket_client_id, ",", $scheduled_ticket_id ?>)">Edit</a>
-                  <?php
-                  if ($session_user_role == 3) { ?>
-                    <div class="dropdown-divider"></div>
-                      <a class="dropdown-item text-danger" href="post.php?delete_scheduled_ticket=<?php echo $scheduled_ticket_id; ?>">Delete</a>
+                    <div class="col-md-4">
+                        <div class="input-group mb-3 mb-md-0">
+                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo strip_tags(htmlentities($q));} ?>" placeholder="Search Scheduled Tickets">
+                            <div class="input-group-append">
+                                <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                            </div>
+                        </div>
                     </div>
-                  <?php
-                  } ?>
-              </div>
-        <?php
-        }
-        ?>
-            </td>
-          </tr>
-        </tbody>
-      </table>
+
+                </div>
+            </form>
+            <hr>
+
+            <div class="table-responsive">
+                <table class="table table-striped table-borderless table-hover">
+                    <thead class="<?php if ($num_rows[0] == 0) {
+                        echo "d-none";
+                    } ?>">
+                    <tr>
+                        <th><a class="text-dark">Client</a></th>
+                        <th><a class="text-dark">Subject</a></th>
+                        <th><a class="text-dark">Priority</a></th>
+                        <th><a class="text-dark">Frequency</a></th>
+                        <th><a class="text-dark">Next Run Date</a></th>
+
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
+
+                    while ($row = mysqli_fetch_array($sql)) {
+                    $scheduled_ticket_id = $row['scheduled_ticket_id'];
+                    $scheduled_ticket_client_id = $row['client_id'];
+                    $scheduled_ticket_subject = htmlentities($row['scheduled_ticket_subject']);
+                    $scheduled_ticket_priority = htmlentities($row['scheduled_ticket_priority']);
+                    $scheduled_ticket_frequency = htmlentities($row['scheduled_ticket_frequency']);
+                    $scheduled_ticket_next_run = $row['scheduled_ticket_next_run'];
+                    $scheduled_ticket_client_name = htmlentities($row['client_name']);
+                    ?>
+
+                    <tr>
+                        <td><a> <?php echo $scheduled_ticket_client_name ?></a></td>
+                        <td><a href="#" data-toggle="modal" data-target="#editScheduledTicketModal"
+                               onclick="populateScheduledTicketEditModal(<?php echo $scheduled_ticket_client_id, ",", $scheduled_ticket_id ?>)"> <?php echo $scheduled_ticket_subject ?> </a></td>                            <td><a> <?php echo $scheduled_ticket_priority ?></a></td>
+                        <td><a> <?php echo $scheduled_ticket_frequency ?></a></td>
+                        <td><a> <?php echo $scheduled_ticket_next_run ?></a></td>
+
+                        <td>
+                            <div class="dropdown dropleft text-center">
+                                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                    <i class="fas fa-ellipsis-h"></i>
+                                </button>
+                                <div class="dropdown-menu">
+                                    <a class="dropdown-item" href="#" data-toggle="modal"
+                                       data-target="#editScheduledTicketModal" onclick="populateScheduledTicketEditModal(<?php echo $scheduled_ticket_client_id, ",", $scheduled_ticket_id ?>)">Edit</a>
+                                    <?php
+                                    if ($session_user_role == 3) { ?>
+                                    <div class="dropdown-divider"></div>
+                                    <a class="dropdown-item text-danger" href="post.php?delete_scheduled_ticket=<?php echo $scheduled_ticket_id; ?>">Delete</a>
+                                </div>
+                                <?php
+                                } ?>
+                            </div>
+                            <?php
+                            }
+                            ?>
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once('pagination.php'); ?>
+        </div>
     </div>
-    <?php
-      include('pagination.php');
-    ?>
-  </div>
-</div>
 
 <?php
-include("scheduled_ticket_edit_modal.php");
-include("footer.php");
+require_once("scheduled_ticket_edit_modal.php");
+require_once("footer.php");
diff --git a/settings_api.php b/settings_api.php
index 64025385..7df9921b 100644
--- a/settings_api.php
+++ b/settings_api.php
@@ -11,13 +11,15 @@ if (!empty($_GET['sb'])) {
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM api_keys
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM api_keys
     LEFT JOIN clients on api_keys.api_key_client_id = clients.client_id
     WHERE (api_key_name LIKE '%$q%')
     AND api_keys.company_id = $session_company_id
     ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
diff --git a/settings_defaults.php b/settings_defaults.php
index 7323d381..4c55e079 100644
--- a/settings_defaults.php
+++ b/settings_defaults.php
@@ -19,7 +19,7 @@ require_once("inc_all_settings.php"); ?>
                             <option value="0">- None -</option>
                             <?php
 
-                            $sql = mysqli_query($mysqli,"SELECT * FROM accounts WHERE company_id = $session_company_id ORDER BY account_name ASC");
+                            $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE company_id = $session_company_id ORDER BY account_name ASC");
                             while ($row = mysqli_fetch_array($sql)) {
                                 $account_id = $row['account_id'];
                                 $account_name = htmlentities($row['account_name']); ?>
@@ -40,7 +40,7 @@ require_once("inc_all_settings.php"); ?>
                             <option value="0">- None -</option>
                             <?php
 
-                            $sql = mysqli_query($mysqli,"SELECT * FROM accounts WHERE company_id = $session_company_id ORDER BY account_name ASC");
+                            $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE company_id = $session_company_id ORDER BY account_name ASC");
                             while ($row = mysqli_fetch_array($sql)) {
                                 $account_id = $row['account_id'];
                                 $account_name = htmlentities($row['account_name']); ?>
@@ -61,7 +61,7 @@ require_once("inc_all_settings.php"); ?>
                             <option value="0">- None -</option>
                             <?php
 
-                            $sql = mysqli_query($mysqli,"SELECT * FROM accounts WHERE company_id = $session_company_id ORDER BY account_name ASC");
+                            $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE company_id = $session_company_id ORDER BY account_name ASC");
                             while ($row = mysqli_fetch_array($sql)) {
                                 $account_id = $row['account_id'];
                                 $account_name = htmlentities($row['account_name']); ?>
@@ -82,7 +82,7 @@ require_once("inc_all_settings.php"); ?>
                             <option value="0">- None -</option>
                             <?php
 
-                            $sql = mysqli_query($mysqli,"SELECT * FROM accounts WHERE company_id = $session_company_id ORDER BY account_name ASC");
+                            $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE company_id = $session_company_id ORDER BY account_name ASC");
                             while ($row = mysqli_fetch_array($sql)) {
                                 $account_id = $row['account_id'];
                                 $account_name = htmlentities($row['account_name']); ?>
@@ -103,7 +103,7 @@ require_once("inc_all_settings.php"); ?>
                             <option value="">- None -</option>
                             <?php
 
-                            $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method' AND company_id = $session_company_id ORDER BY category_name ASC");
+                            $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Payment Method' AND company_id = $session_company_id ORDER BY category_name ASC");
                             while ($row = mysqli_fetch_array($sql)) {
                                 $payment_method = htmlentities($row['category_name']); ?>
                                 <option <?php if ($config_default_payment_method == $payment_method) { echo "selected"; } ?>><?php echo $payment_method; ?></option>
@@ -123,7 +123,7 @@ require_once("inc_all_settings.php"); ?>
                             <option value="">- None -</option>
                             <?php
 
-                            $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method' AND company_id = $session_company_id ORDER BY category_name ASC");
+                            $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Payment Method' AND company_id = $session_company_id ORDER BY category_name ASC");
                             while ($row = mysqli_fetch_array($sql)) {
                                 $payment_method = htmlentities($row['category_name']); ?>
                                 <option <?php if ($config_default_expense_payment_method == $payment_method) { echo "selected"; } ?>><?php echo $payment_method; ?></option>
@@ -143,7 +143,7 @@ require_once("inc_all_settings.php"); ?>
                             <option value="0">- None -</option>
                             <?php
 
-                            $sql = mysqli_query($mysqli,"SELECT * FROM calendars WHERE company_id = $session_company_id ORDER BY calendar_name ASC");
+                            $sql = mysqli_query($mysqli, "SELECT * FROM calendars WHERE company_id = $session_company_id ORDER BY calendar_name ASC");
                             while ($row = mysqli_fetch_array($sql)) {
                                 $calendar_id = $row['calendar_id'];
                                 $calendar_name = htmlentities($row['calendar_name']); ?>
diff --git a/settings_software_templates.php b/settings_software_templates.php
index 4646edef..0d388f86 100644
--- a/settings_software_templates.php
+++ b/settings_software_templates.php
@@ -1,115 +1,118 @@
-<?php include("inc_all_settings.php"); ?>
+<?php
 
-<?php 
+require_once("inc_all_settings.php");
 
-if(!empty($_GET['sb'])){
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
-  $sb = "software_name";
+if (!empty($_GET['sb'])) {
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
+    $sb = "software_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM software 
-  LEFT JOIN logins ON login_software_id = software_id
-  WHERE software_template = 1 
-  AND (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_key LIKE '%$q%') 
-  ORDER BY $sb $o LIMIT $record_from, $record_to");
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM software 
+    LEFT JOIN logins ON login_software_id = software_id
+    WHERE software_template = 1 
+    AND (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_key LIKE '%$q%') 
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
+);
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
 <div class="card card-dark">
-  <div class="card-header py-2">
-    <h3 class="card-title mt-2"><i class="fa fa-fw fa-cube"></i> License Templates</h3>
-    <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addSoftwareTemplateModal"><i class="fas fa-fw fa-plus"></i> New License Template</button>
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-cube"></i> License Templates</h3>
+        <div class="card-tools">
+            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addSoftwareTemplateModal"><i class="fas fa-fw fa-plus"></i> New License Template</button>
+        </div>
     </div>
-  </div>
-  <div class="card-body">
-    <form autocomplete="off">
-      <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-      <div class="row">
-        
-        <div class="col-md-4">
-          <div class="input-group mb-3 mb-md-0">
-            <input type="search" class="form-control" name="q" value="<?php if(isset($q)){ echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Licenses">
-            <div class="input-group-append">
-              <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-            </div>
-          </div>
-        </div>
+    <div class="card-body">
+        <form autocomplete="off">
+            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+            <div class="row">
 
-        <div class="col-md-8">
-        </div>
-
-      </div>
-    </form>
-    <hr>
-    <div class="table-responsive">
-      <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
-          <tr>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_name&o=<?php echo $disp; ?>">Template</a></th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_type&o=<?php echo $disp; ?>">Type</a></th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_license_type&o=<?php echo $disp; ?>">License Type</a></th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_seats&o=<?php echo $disp; ?>">Seats</a></th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-    
-          while($row = mysqli_fetch_array($sql)){    
-            $software_id = $row['software_id'];
-            $software_name = htmlentities($row['software_name']);
-            $software_version = htmlentities($row['software_version']);
-            $software_type = htmlentities($row['software_type']);
-            $software_license_type = htmlentities($row['software_license_type']);
-            $software_key = htmlentities($row['software_key']);
-            $software_seats = htmlentities($row['software_seats']);
-            $software_purchase = $row['software_purchase'];
-            $software_expire = $row['software_expire'];
-            $software_notes = htmlentities($row['software_notes']);
-
-          ?>
-          <tr>
-            <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editSoftwareTemplateModal<?php echo $software_id; ?>"><?php echo "$software_name<br><span class='text-secondary'>$software_version</span>"; ?></a></td>
-            <td><?php echo $software_type; ?></td>
-            <td><?php echo $software_license_type; ?></td>
-            <td><?php echo "$software_seats"; ?></td>
-            <td>
-              <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" data-toggle="dropdown">
-                  <i class="fas fa-ellipsis-h"></i>
-                </button>
-                <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editSoftwareTemplateModal<?php echo $software_id; ?>">Edit</a>
-                  <?php if($session_user_role == 3) { ?>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item text-danger" href="post.php?delete_software=<?php echo $software_id; ?>">Delete</a>
-                  <?php } ?>
+                <div class="col-md-4">
+                    <div class="input-group mb-3 mb-md-0">
+                        <input type="search" class="form-control" name="q" value="<?php if(isset($q)){ echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Licenses">
+                        <div class="input-group-append">
+                            <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                        </div>
+                    </div>
                 </div>
-              </div> 
-            </td>
-          </tr>
 
-          <?php
+                <div class="col-md-8">
+                </div>
 
-          include("client_software_template_edit_modal.php");
-          }
-          
-          ?>
+            </div>
+        </form>
+        <hr>
+        <div class="table-responsive">
+            <table class="table table-striped table-borderless table-hover">
+                <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
+                <tr>
+                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_name&o=<?php echo $disp; ?>">Template</a></th>
+                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_type&o=<?php echo $disp; ?>">Type</a></th>
+                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_license_type&o=<?php echo $disp; ?>">License Type</a></th>
+                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_seats&o=<?php echo $disp; ?>">Seats</a></th>
+                    <th class="text-center">Action</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
 
-        </tbody>
-      </table>      
+                while($row = mysqli_fetch_array($sql)){
+                    $software_id = $row['software_id'];
+                    $software_name = htmlentities($row['software_name']);
+                    $software_version = htmlentities($row['software_version']);
+                    $software_type = htmlentities($row['software_type']);
+                    $software_license_type = htmlentities($row['software_license_type']);
+                    $software_key = htmlentities($row['software_key']);
+                    $software_seats = htmlentities($row['software_seats']);
+                    $software_purchase = $row['software_purchase'];
+                    $software_expire = $row['software_expire'];
+                    $software_notes = htmlentities($row['software_notes']);
+
+                    ?>
+                    <tr>
+                        <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editSoftwareTemplateModal<?php echo $software_id; ?>"><?php echo "$software_name<br><span class='text-secondary'>$software_version</span>"; ?></a></td>
+                        <td><?php echo $software_type; ?></td>
+                        <td><?php echo $software_license_type; ?></td>
+                        <td><?php echo "$software_seats"; ?></td>
+                        <td>
+                            <div class="dropdown dropleft text-center">
+                                <button class="btn btn-secondary btn-sm" data-toggle="dropdown">
+                                    <i class="fas fa-ellipsis-h"></i>
+                                </button>
+                                <div class="dropdown-menu">
+                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editSoftwareTemplateModal<?php echo $software_id; ?>">Edit</a>
+                                    <?php if($session_user_role == 3) { ?>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger" href="post.php?delete_software=<?php echo $software_id; ?>">Delete</a>
+                                    <?php } ?>
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
+
+                    <?php
+
+                    require("client_software_template_edit_modal.php");
+                }
+
+                ?>
+
+                </tbody>
+            </table>
+        </div>
+        <?php require_once("pagination.php"); ?>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
 </div>
 
-<?php include("client_software_template_add_modal.php"); ?>
-
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php
+require_once("client_software_template_add_modal.php");
+require_once("footer.php");
diff --git a/settings_tags.php b/settings_tags.php
index a351aa89..d361731f 100644
--- a/settings_tags.php
+++ b/settings_tags.php
@@ -1,27 +1,32 @@
-<?php require_once("inc_all_settings.php");
+<?php
+require_once("inc_all_settings.php");
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "tag_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM tags 
-  WHERE tag_name LIKE '%$q%'
-  AND company_id = $session_company_id 
-  ORDER BY $sb $o LIMIT $record_from, $record_to"
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM tags 
+    WHERE tag_name LIKE '%$q%'
+    AND company_id = $session_company_id 
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
 );
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 if ($num_rows > 0) {
     //Colors Used
-    $sql_colors_used = mysqli_query($mysqli, "SELECT tag_color FROM tags 
-      WHERE tag_archived_at IS NULL
-      AND company_id = $session_company_id"
+    $sql_colors_used = mysqli_query(
+        $mysqli,
+        "SELECT tag_color FROM tags 
+        WHERE tag_archived_at IS NULL
+        AND company_id = $session_company_id"
     );
 
     while ($color_used_row = mysqli_fetch_array($sql_colors_used)) {
@@ -102,7 +107,7 @@ if ($num_rows > 0) {
 
                     <?php
 
-                    include("settings_tag_edit_modal.php");
+                    require("settings_tag_edit_modal.php");
 
                 }
 
@@ -111,14 +116,10 @@ if ($num_rows > 0) {
                 </tbody>
             </table>
         </div>
-        <?php include("pagination.php"); ?>
+        <?php require_once("pagination.php"); ?>
     </div>
 </div>
 
 <?php
-
-include("settings_tag_add_modal.php");
-
-include("footer.php");
-
-?>
+require_once("settings_tag_add_modal.php");
+require_once("footer.php");
diff --git a/settings_taxes.php b/settings_taxes.php
index 33e71072..15ba5a90 100644
--- a/settings_taxes.php
+++ b/settings_taxes.php
@@ -1,18 +1,21 @@
-<?php require_once("inc_all_settings.php");
+<?php
+require_once("inc_all_settings.php");
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "tax_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT * FROM taxes 
-  WHERE tax_archived_at IS NULL 
-  AND company_id = $session_company_id 
-  ORDER BY $sb $o"
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT * FROM taxes 
+    WHERE tax_archived_at IS NULL 
+    AND company_id = $session_company_id 
+    ORDER BY $sb $o"
 );
 
 $num_rows = mysqli_num_rows($sql);
@@ -64,11 +67,11 @@ $num_rows = mysqli_num_rows($sql);
 
                     <?php
 
-                    include("settings_tax_edit_modal.php");
+                    require("settings_tax_edit_modal.php");
                 }
 
                 if ($num_rows == 0) {
-                    echo "<center><h3 class='text-secondary mt-3'>No Records Here</h3></center>";
+                    echo "<h3 class='text-secondary mt-3' style='text-align: center'>No Records Here</h3>";
                 }
 
                 ?>
@@ -81,9 +84,5 @@ $num_rows = mysqli_num_rows($sql);
 </div>
 
 <?php
-
-include("settings_tax_add_modal.php");
-
-include("footer.php");
-
-?>
+require_once("settings_tax_add_modal.php");
+require_once("footer.php");
diff --git a/settings_vendor_templates.php b/settings_vendor_templates.php
index c1915cba..39817874 100644
--- a/settings_vendor_templates.php
+++ b/settings_vendor_templates.php
@@ -1,176 +1,173 @@
-<?php include("inc_all_settings.php"); ?>
-
 <?php
 
+require_once("inc_all_settings.php");
+
 if (isset($_GET['q'])) {
-  $q = strip_tags(mysqli_real_escape_string($mysqli,$_GET['q']));
-  //Phone Numbers
-  $phone_query = preg_replace("/[^0-9]/", '',$q);
-  if (empty($phone_query)) {
-    $phone_query = $q;
-  }
-}else{
-  $q = "";
-  $phone_query = "";
+    $q = strip_tags(mysqli_real_escape_string($mysqli, $_GET['q']));
+    //Phone Numbers
+    $phone_query = preg_replace("/[^0-9]/", '', $q);
+    if (empty($phone_query)) {
+        $phone_query = $q;
+    }
+} else {
+    $q = "";
+    $phone_query = "";
 }
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
-  $sb = "vendor_name";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
+    $sb = "vendor_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM vendors 
-  WHERE vendor_template = 1 
-  AND (vendor_name LIKE '%$q%' OR vendor_description LIKE '%$q%' OR vendor_account_number LIKE '%$q%' OR vendor_website LIKE '%$q%' OR vendor_contact_name LIKE '%$q%' OR vendor_email LIKE '%$q%' OR vendor_phone LIKE '%$phone_query%') ORDER BY $sb $o LIMIT $record_from, $record_to");
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM vendors 
+    WHERE vendor_template = 1 
+    AND (vendor_name LIKE '%$q%' OR vendor_description LIKE '%$q%' OR vendor_account_number LIKE '%$q%' OR vendor_website LIKE '%$q%' OR vendor_contact_name LIKE '%$q%' OR vendor_email LIKE '%$q%' OR vendor_phone LIKE '%$phone_query%') ORDER BY $sb $o LIMIT $record_from, $record_to"
+);
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
-<div class="card card-dark">
-  <div class="card-header py-2">
-    <h3 class="card-title mt-2">
-      <i class="fa fa-fw fa-building"></i> Vendor Templates
-    </h3>
-    <div class="card-tools">
-        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addVendorTemplateModal">
-          <i class="fas fa-fw fa-plus"></i> New Vendor Template
-        </button>
-    </div>
-  </div>
-  <div class="card-body">
-    <form autocomplete="off">
-      <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-      <div class="row">
-        
-        <div class="col-md-4">
-          <div class="input-group mb-3 mb-md-0">
-            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Vendors Templates">
-            <div class="input-group-append">
-              <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-            </div>
-          </div>
-        </div>
-
-      </div>
-    </form>
-    <hr>
-    <div class="table-responsive">
-      <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-          <tr>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_name&o=<?php echo $disp; ?>">Vendor</a></th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_description&o=<?php echo $disp; ?>">Description</a></th>
-            <th>Contact</th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $vendor_id = $row['vendor_id'];
-            $vendor_name = htmlentities($row['vendor_name']);
-            $vendor_description = htmlentities($row['vendor_description']);
-            if (empty($vendor_description)) {
-              $vendor_description_display = "-";
-            }else{
-              $vendor_description_display = $vendor_description;
-            }
-            $vendor_account_number = htmlentities($row['vendor_account_number']);
-            $vendor_contact_name = htmlentities($row['vendor_contact_name']);
-            if (empty($vendor_contact_name)) {
-              $vendor_contact_name_display = "-";
-            }else{
-              $vendor_contact_name_display = $vendor_contact_name;
-            }
-            $vendor_phone = formatPhoneNumber($row['vendor_phone']);
-            $vendor_extension = htmlentities($row['vendor_extension']);
-            $vendor_email = htmlentities($row['vendor_email']);
-            $vendor_website = htmlentities($row['vendor_website']);
-            $vendor_hours = htmlentities($row['vendor_hours']);
-            $vendor_sla = htmlentities($row['vendor_sla']);
-            $vendor_code = htmlentities($row['vendor_code']);
-            $vendor_notes = htmlentities($row['vendor_notes']);
-            $vendor_template = intval($row['vendor_template']);
-              
-          ?>
-          <tr>
-            <th>
-              <i class="fa fa-fw fa-building text-secondary"></i> 
-              <a class="text-dark" href="#" data-toggle="modal" data-target="#editVendorTemplateModal<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></a>
-              <?php
-              if (!empty($vendor_account_number)) {
-              ?>
-              <br>
-              <small class="text-secondary"><?php echo $vendor_account_number; ?></small>
-              <?php
-              }
-              ?>
-            </th>
-            <td><?php echo $vendor_description_display; ?></td>
-            <td>
-              <?php
-              if (!empty($vendor_contact_name)) {
-              ?>
-              <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><?php echo $vendor_contact_name_display; ?>
-              <br>
-              <?php
-              }else{
-                echo $vendor_contact_name_display;
-              }
-              ?>
-              <?php
-              if (!empty($vendor_phone)) {
-              ?>
-              <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $vendor_phone; ?>
-              <br>
-              <?php
-              }
-              ?>
-              <?php
-              if (!empty($vendor_email)) {
-              ?>
-              <i class="fa fa-fw fa-envelope text-secondary mr-2 mb-2"></i><?php echo $vendor_email; ?>
-              <br>
-              <?php
-              }
-              ?>
-            </td>
-            <td>
-              <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                  <i class="fas fa-ellipsis-h"></i>
+    <div class="card card-dark">
+        <div class="card-header py-2">
+            <h3 class="card-title mt-2">
+                <i class="fa fa-fw fa-building"></i> Vendor Templates
+            </h3>
+            <div class="card-tools">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addVendorTemplateModal">
+                    <i class="fas fa-fw fa-plus"></i> New Vendor Template
                 </button>
-                <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editVendorTemplateModal<?php echo $vendor_id; ?>">Edit</a>
-                  <?php if ($session_user_role == 3) { ?>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item text-danger" href="post.php?delete_vendor=<?php echo $vendor_id; ?>">Delete</a>
-                  <?php } ?>
+            </div>
+        </div>
+        <div class="card-body">
+            <form autocomplete="off">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <div class="row">
+
+                    <div class="col-md-4">
+                        <div class="input-group mb-3 mb-md-0">
+                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Vendors Templates">
+                            <div class="input-group-append">
+                                <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                            </div>
+                        </div>
+                    </div>
+
                 </div>
-              </div>
-            </td>
-          </tr>
+            </form>
+            <hr>
+            <div class="table-responsive">
+                <table class="table table-striped table-borderless table-hover">
+                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                    <tr>
+                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_name&o=<?php echo $disp; ?>">Vendor</a></th>
+                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_description&o=<?php echo $disp; ?>">Description</a></th>
+                        <th>Contact</th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
 
-          <?php
-          
-          include("vendor_template_edit_modal.php");
-          }
-          
-          ?>
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $vendor_id = $row['vendor_id'];
+                        $vendor_name = htmlentities($row['vendor_name']);
+                        $vendor_description = htmlentities($row['vendor_description']);
+                        if (empty($vendor_description)) {
+                            $vendor_description_display = "-";
+                        } else {
+                            $vendor_description_display = $vendor_description;
+                        }
+                        $vendor_account_number = htmlentities($row['vendor_account_number']);
+                        $vendor_contact_name = htmlentities($row['vendor_contact_name']);
+                        if (empty($vendor_contact_name)) {
+                            $vendor_contact_name_display = "-";
+                        } else {
+                            $vendor_contact_name_display = $vendor_contact_name;
+                        }
+                        $vendor_phone = formatPhoneNumber($row['vendor_phone']);
+                        $vendor_extension = htmlentities($row['vendor_extension']);
+                        $vendor_email = htmlentities($row['vendor_email']);
+                        $vendor_website = htmlentities($row['vendor_website']);
+                        $vendor_hours = htmlentities($row['vendor_hours']);
+                        $vendor_sla = htmlentities($row['vendor_sla']);
+                        $vendor_code = htmlentities($row['vendor_code']);
+                        $vendor_notes = htmlentities($row['vendor_notes']);
+                        $vendor_template = intval($row['vendor_template']);
 
-        </tbody>
-      </table>
+                        ?>
+                        <tr>
+                            <th>
+                                <i class="fa fa-fw fa-building text-secondary"></i>
+                                <a class="text-dark" href="#" data-toggle="modal" data-target="#editVendorTemplateModal<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></a>
+                                <?php
+                                if (!empty($vendor_account_number)) {
+                                    ?>
+                                    <br>
+                                    <small class="text-secondary"><?php echo $vendor_account_number; ?></small>
+                                    <?php
+                                }
+                                ?>
+                            </th>
+                            <td><?php echo $vendor_description_display; ?></td>
+                            <td>
+                                <?php
+                                if (!empty($vendor_contact_name)) {
+                                    ?>
+                                    <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><?php echo $vendor_contact_name_display; ?>
+                                    <br>
+                                    <?php
+                                } else {
+                                    echo $vendor_contact_name_display;
+                                }
+
+                                if (!empty($vendor_phone)) { ?>
+                                    <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $vendor_phone; ?>
+                                    <br>
+                                <?php }
+
+                                if (!empty($vendor_email)) { ?>
+                                    <i class="fa fa-fw fa-envelope text-secondary mr-2 mb-2"></i><?php echo $vendor_email; ?>
+                                    <br>
+                                <?php } ?>
+
+                            </td>
+                            <td>
+                                <div class="dropdown dropleft text-center">
+                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                        <i class="fas fa-ellipsis-h"></i>
+                                    </button>
+                                    <div class="dropdown-menu">
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editVendorTemplateModal<?php echo $vendor_id; ?>">Edit</a>
+                                        <?php if ($session_user_role == 3) { ?>
+                                            <div class="dropdown-divider"></div>
+                                            <a class="dropdown-item text-danger" href="post.php?delete_vendor=<?php echo $vendor_id; ?>">Delete</a>
+                                        <?php } ?>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                        <?php
+
+                        require("vendor_template_edit_modal.php");
+                    }
+
+                    ?>
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once("pagination.php"); ?>
+        </div>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
-</div>
 
-<?php include("vendor_template_add_modal.php"); ?>
-
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php
+require_once("vendor_template_add_modal.php");
+require_once("footer.php");
diff --git a/side_nav.php b/side_nav.php
index 7fecbf77..71cd4c9a 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -7,7 +7,7 @@
         <!-- Sidebar Menu -->
         <nav class="">
             <?php
-            $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id IN ($session_user_company_access)");
+            $sql = mysqli_query($mysqli, "SELECT * FROM companies WHERE company_id IN ($session_user_company_access)");
 
             if (mysqli_num_rows($sql) > 1) {
 
diff --git a/ticket.php b/ticket.php
index 5008d57c..ef161c6c 100644
--- a/ticket.php
+++ b/ticket.php
@@ -4,7 +4,9 @@ require_once("inc_all.php");
 if (isset($_GET['ticket_id'])) {
     $ticket_id = intval($_GET['ticket_id']);
 
-    $sql = mysqli_query($mysqli,"SELECT * FROM tickets 
+    $sql = mysqli_query(
+        $mysqli,
+        "SELECT * FROM tickets 
         LEFT JOIN clients ON ticket_client_id = client_id 
         LEFT JOIN contacts ON ticket_contact_id = contact_id 
         LEFT JOIN users ON ticket_assigned_to = user_id 
@@ -40,7 +42,7 @@ if (isset($_GET['ticket_id'])) {
         $ticket_feedback = htmlentities($row['ticket_feedback']);
         $ticket_status = htmlentities($row['ticket_status']);
         $ticket_created_at = $row['ticket_created_at'];
-        $ticket_date = date('Y-m-d',strtotime($ticket_created_at));
+        $ticket_date = date('Y-m-d', strtotime($ticket_created_at));
         $ticket_updated_at = $row['ticket_updated_at'];
         $ticket_closed_at = $row['ticket_closed_at'];
         $ticket_created_by = $row['ticket_created_by'];
@@ -112,7 +114,7 @@ if (isset($_GET['ticket_id'])) {
 
         //Ticket Created By
         $ticket_created_by = $row['ticket_created_by'];
-        $ticket_created_by_sql = mysqli_query($mysqli,"SELECT user_name FROM users WHERE user_id = $ticket_created_by");
+        $ticket_created_by_sql = mysqli_query($mysqli, "SELECT user_name FROM users WHERE user_id = $ticket_created_by");
         $row = mysqli_fetch_array($ticket_created_by_sql);
         $ticket_created_by_display = htmlentities($row['user_name']);
 
@@ -125,28 +127,28 @@ if (isset($_GET['ticket_id'])) {
 
         if ($contact_id) {
             //Get Contact Ticket Stats
-            $ticket_related_open = mysqli_query($mysqli,"SELECT COUNT(ticket_id) AS ticket_related_open FROM tickets WHERE ticket_status != 'Closed' AND ticket_contact_id = $contact_id ");
+            $ticket_related_open = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS ticket_related_open FROM tickets WHERE ticket_status != 'Closed' AND ticket_contact_id = $contact_id ");
             $row = mysqli_fetch_array($ticket_related_open);
             $ticket_related_open = $row['ticket_related_open'];
 
-            $ticket_related_closed = mysqli_query($mysqli,"SELECT COUNT(ticket_id) AS ticket_related_closed  FROM tickets WHERE ticket_status = 'Closed' AND ticket_contact_id = $contact_id ");
+            $ticket_related_closed = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS ticket_related_closed  FROM tickets WHERE ticket_status = 'Closed' AND ticket_contact_id = $contact_id ");
             $row = mysqli_fetch_array($ticket_related_closed);
             $ticket_related_closed = $row['ticket_related_closed'];
 
-            $ticket_related_total = mysqli_query($mysqli,"SELECT COUNT(ticket_id) AS ticket_related_total FROM tickets WHERE ticket_contact_id = $contact_id ");
+            $ticket_related_total = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS ticket_related_total FROM tickets WHERE ticket_contact_id = $contact_id ");
             $row = mysqli_fetch_array($ticket_related_total);
             $ticket_related_total = $row['ticket_related_total'];
         }
 
         //Get Total Ticket Time
-        $ticket_total_reply_time = mysqli_query($mysqli,"SELECT SEC_TO_TIME(SUM(TIME_TO_SEC(ticket_reply_time_worked))) AS ticket_total_reply_time FROM ticket_replies WHERE ticket_reply_archived_at IS NULL AND ticket_reply_ticket_id = $ticket_id");
+        $ticket_total_reply_time = mysqli_query($mysqli, "SELECT SEC_TO_TIME(SUM(TIME_TO_SEC(ticket_reply_time_worked))) AS ticket_total_reply_time FROM ticket_replies WHERE ticket_reply_archived_at IS NULL AND ticket_reply_ticket_id = $ticket_id");
         $row = mysqli_fetch_array($ticket_total_reply_time);
         $ticket_total_reply_time = $row['ticket_total_reply_time'];
 
         //Client Tags
         $client_tag_name_display_array = array();
         $client_tag_id_array = array();
-        $sql_client_tags = mysqli_query($mysqli,"SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_tags.client_id = $client_id");
+        $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_tags.client_id = $client_id");
         while ($row = mysqli_fetch_array($sql_client_tags)) {
 
             $client_tag_id = $row['tag_id'];
@@ -165,7 +167,7 @@ if (isset($_GET['ticket_id'])) {
         // Get & format asset warranty expiry
         $date = date('Y-m-d H:i:s');
         $dt_value = $asset_warranty_expire; //sample date
-        $warranty_check = date('m/d/Y',strtotime('-8 hours'));
+        $warranty_check = date('m/d/Y', strtotime('-8 hours'));
 
         if ($dt_value <= $date) {
             $dt_value = "Expired on $asset_warranty_expire"; $warranty_status_color ='red';
@@ -178,16 +180,16 @@ if (isset($_GET['ticket_id'])) {
         }
 
         // Get all ticket replies
-        $sql_ticket_replies = mysqli_query($mysqli,"SELECT * FROM ticket_replies LEFT JOIN users ON ticket_reply_by = user_id LEFT JOIN contacts ON ticket_reply_by = contact_id WHERE ticket_reply_ticket_id = $ticket_id AND ticket_reply_archived_at IS NULL ORDER BY ticket_reply_id DESC");
+        $sql_ticket_replies = mysqli_query($mysqli, "SELECT * FROM ticket_replies LEFT JOIN users ON ticket_reply_by = user_id LEFT JOIN contacts ON ticket_reply_by = contact_id WHERE ticket_reply_ticket_id = $ticket_id AND ticket_reply_archived_at IS NULL ORDER BY ticket_reply_id DESC");
 
         // Get other tickets for this asset
         if (!empty($asset_id)) {
-            $sql_asset_tickets = mysqli_query($mysqli,"SELECT * FROM tickets WHERE ticket_asset_id = $asset_id ORDER BY ticket_number DESC");
+            $sql_asset_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_asset_id = $asset_id ORDER BY ticket_number DESC");
             $ticket_asset_count = mysqli_num_rows($sql_asset_tickets);
         }
 
         // Get technicians to assign the ticket to
-        $sql_assign_to_select = mysqli_query($mysqli,"SELECT users.user_id, user_name FROM users
+        $sql_assign_to_select = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users
                                   LEFT JOIN user_companies ON users.user_id = user_companies.user_id
                                   LEFT JOIN user_settings on users.user_id = user_settings.user_id
                                   WHERE user_companies.company_id = $session_company_id 
@@ -447,7 +449,7 @@ if (isset($_GET['ticket_id'])) {
                     <div class="ml-1"><i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i>Created by: <?php echo $ticket_created_by_display; ?></div>
                     <?php
                     if ($ticket_status == "Closed") {
-                        $sql_closed_by = mysqli_query($mysqli,"SELECT * FROM tickets, users WHERE ticket_closed_by = user_id");
+                        $sql_closed_by = mysqli_query($mysqli, "SELECT * FROM tickets, users WHERE ticket_closed_by = user_id");
                         $row = mysqli_fetch_array($sql_closed_by);
                         $ticket_closed_by_display = htmlentities($row['user_name']); ?>
                         <div class="ml-1"><i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i>Closed by: <?php echo ucwords($ticket_closed_by_display); ?></a></div>
diff --git a/ticket_add_modal.php b/ticket_add_modal.php
index faaac445..ad194005 100644
--- a/ticket_add_modal.php
+++ b/ticket_add_modal.php
@@ -60,7 +60,7 @@
                                             <option value="">- Client -</option>
                                             <?php
 
-                                            $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
+                                            $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
                                             while ($row = mysqli_fetch_array($sql)) {
                                                 $client_id = $row['client_id'];
                                                 $client_name = htmlentities($row['client_name']); ?>
@@ -97,7 +97,9 @@
                                         <option value="0">Not Assigned</option>
                                         <?php
 
-                                        $sql = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users
+                                        $sql = mysqli_query(
+                                            $mysqli,
+                                            "SELECT users.user_id, user_name FROM users
                                           LEFT JOIN user_companies ON users.user_id = user_companies.user_id
                                           LEFT JOIN user_settings on users.user_id = user_settings.user_id
                                           WHERE user_companies.company_id = $session_company_id 
@@ -128,7 +130,7 @@
                                         <select class="form-control select2" name="contact" required>
                                             <option value="">- Contact -</option>
                                             <?php
-                                            $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL ORDER BY contact_name ASC");
+                                            $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL ORDER BY contact_name ASC");
                                             while ($row = mysqli_fetch_array($sql)) {
                                                 $contact_id = $row['contact_id'];
                                                 $contact_name = htmlentities($row['contact_name']); ?>
@@ -152,7 +154,7 @@
                                             <option value="0">- None -</option>
                                             <?php
 
-                                            $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
+                                            $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
                                             while ($row = mysqli_fetch_array($sql_assets)) {
                                                 $asset_id_select = $row['asset_id'];
                                                 $asset_name_select = htmlentities($row['asset_name']); ?>
@@ -177,7 +179,7 @@
                                             <option value="0">- None -</option>
                                             <?php
 
-                                            $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = $client_id AND vendor_template = 0 AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
+                                            $sql_vendors = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = $client_id AND vendor_template = 0 AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
                                             while ($row = mysqli_fetch_array($sql_vendors)) {
                                                 $vendor_id_select = $row['vendor_id'];
                                                 $vendor_name_select = htmlentities($row['vendor_name']); ?>
diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php
index a43097ac..627dda21 100644
--- a/ticket_edit_modal.php
+++ b/ticket_edit_modal.php
@@ -70,7 +70,9 @@
                                         <option value="0">Not Assigned</option>
                                         <?php
 
-                                        $sql_assign_to_select = mysqli_query($mysqli,"SELECT users.user_id, user_name FROM users
+                                        $sql_assign_to_select = mysqli_query(
+                                            $mysqli,
+                                            "SELECT users.user_id, user_name FROM users
                                             LEFT JOIN user_companies ON users.user_id = user_companies.user_id
                                             LEFT JOIN user_settings on users.user_id = user_settings.user_id
                                             WHERE user_companies.company_id = $session_company_id 
@@ -103,7 +105,7 @@
                                         <option value="">No One</option>
                                         <?php
 
-                                        $sql_client_contacts_select = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
+                                        $sql_client_contacts_select = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
                                         while ($row = mysqli_fetch_array($sql_client_contacts_select)) {
                                             $contact_id_select = $row['contact_id'];
                                             $contact_name_select = htmlentities($row['contact_name']);
@@ -131,7 +133,7 @@
                                         <option value="0">- None -</option>
                                         <?php
 
-                                        $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
+                                        $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
                                         while ($row = mysqli_fetch_array($sql_assets)) {
                                             $asset_id_select = $row['asset_id'];
                                             $asset_name_select = htmlentities($row['asset_name']);
@@ -159,7 +161,7 @@
                                         <option value="0">- None -</option>
                                         <?php
 
-                                        $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = $client_id AND vendor_template = 0 ORDER BY vendor_name ASC");
+                                        $sql_vendors = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = $client_id AND vendor_template = 0 ORDER BY vendor_name ASC");
                                         while ($row = mysqli_fetch_array($sql_vendors)) {
                                             $vendor_id_select = $row['vendor_id'];
                                             $vendor_name_select = htmlentities($row['vendor_name']);
diff --git a/ticket_invoice_add_modal.php b/ticket_invoice_add_modal.php
index 367fd625..8f14f643 100644
--- a/ticket_invoice_add_modal.php
+++ b/ticket_invoice_add_modal.php
@@ -23,7 +23,7 @@
                                 <option value="0">New Invoice</option>
                                 <?php
 
-                                $sql_invoices = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_status NOT LIKE 'Paid' AND invoice_client_id = $client_id AND company_id = $session_company_id ORDER BY invoice_number ASC");
+                                $sql_invoices = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_status NOT LIKE 'Paid' AND invoice_client_id = $client_id AND company_id = $session_company_id ORDER BY invoice_number ASC");
                                 while ($row = mysqli_fetch_array($sql_invoices)) {
                                     $invoice_id = $row['invoice_id'];
                                     $invoice_prefix = htmlentities($row['invoice_prefix']);
@@ -64,7 +64,7 @@
                                 <option value="">- Category -</option>
                                 <?php
 
-                                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC");
+                                $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC");
                                 while ($row = mysqli_fetch_array($sql)) {
                                     $category_id = $row['category_id'];
                                     $category_name = htmlentities($row['category_name']);
@@ -151,7 +151,7 @@
                                 <option value="0">None</option>
                                 <?php
 
-                                $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE (tax_archived_at > '$item_created_at' OR tax_archived_at IS NULL) AND company_id = $session_company_id ORDER BY tax_name ASC");
+                                $taxes_sql = mysqli_query($mysqli, "SELECT * FROM taxes WHERE (tax_archived_at > '$item_created_at' OR tax_archived_at IS NULL) AND company_id = $session_company_id ORDER BY tax_name ASC");
                                 while ($row = mysqli_fetch_array($taxes_sql)) {
                                     $tax_id_select = $row['tax_id'];
                                     $tax_name = htmlentities($row['tax_name']);
diff --git a/tickets.php b/tickets.php
index 326fc8bf..df30c2e9 100644
--- a/tickets.php
+++ b/tickets.php
@@ -282,7 +282,7 @@ $user_active_assigned_tickets = $row['total_tickets_assigned'];
                                     <option value="unassigned"<?php if ($ticket_assigned_filter == "0") {echo "selected";}?> >Unassigned</option>
 
                                     <?php
-                                    $sql_assign_to = mysqli_query($mysqli,"SELECT * FROM users WHERE user_archived_at IS NULL ORDER BY user_name ASC");
+                                    $sql_assign_to = mysqli_query($mysqli, "SELECT * FROM users WHERE user_archived_at IS NULL ORDER BY user_name ASC");
                                     while ($row = mysqli_fetch_array($sql_assign_to)) {
                                         $user_id = $row['user_id'];
                                         $user_name = htmlentities($row['user_name']);
diff --git a/top_nav.php b/top_nav.php
index 871ec314..ad909b0c 100644
--- a/top_nav.php
+++ b/top_nav.php
@@ -31,7 +31,7 @@
 
     <!-- New Notifications Dropdown -->
     <?php
-    $sql_notifications = mysqli_query($mysqli,"SELECT * FROM notifications LEFT JOIN clients ON notification_client_id = client_id WHERE notification_dismissed_at IS NULL AND (notification_user_id = $session_user_id OR notification_user_id = 0) AND notifications.company_id = $session_company_id ORDER BY notification_id DESC LIMIT 5");
+    $sql_notifications = mysqli_query($mysqli, "SELECT * FROM notifications LEFT JOIN clients ON notification_client_id = client_id WHERE notification_dismissed_at IS NULL AND (notification_user_id = $session_user_id OR notification_user_id = 0) AND notifications.company_id = $session_company_id ORDER BY notification_id DESC LIMIT 5");
     ?>
 
     <?php if ($num_notifications > 0) { ?>
diff --git a/transfer_add_modal.php b/transfer_add_modal.php
index f18b7766..1a533fac 100644
--- a/transfer_add_modal.php
+++ b/transfer_add_modal.php
@@ -44,28 +44,28 @@
                                 <option value="">- Account From -</option>
                                 <?php
 
-                                $sql = mysqli_query($mysqli,"SELECT * FROM accounts WHERE account_archived_at IS NULL AND company_id = $session_company_id ORDER BY account_name ASC");
+                                $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL AND company_id = $session_company_id ORDER BY account_name ASC");
                                 while ($row = mysqli_fetch_array($sql)) {
                                     $account_id = $row['account_id'];
                                     $account_name = htmlentities($row['account_name']);
                                     $opening_balance = floatval($row['opening_balance']);
 
-                                    $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
+                                    $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
                                     $row = mysqli_fetch_array($sql_payments);
                                     $total_payments = $row['total_payments'];
 
-                                    $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
+                                    $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
                                     $row = mysqli_fetch_array($sql_revenues);
                                     $total_revenues = $row['total_revenues'];
 
-                                    $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
+                                    $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
                                     $row = mysqli_fetch_array($sql_expenses);
                                     $total_expenses = $row['total_expenses'];
 
                                     $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
 
                                     ?>
-                                    <option <?php if ($config_default_transfer_from_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
+                                    <option <?php if ($config_default_transfer_from_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance, 2); ?>]</option>
 
                                 <?php } ?>
 
@@ -82,28 +82,28 @@
                                 <option value="">- Account To -</option>
                                 <?php
 
-                                $sql = mysqli_query($mysqli,"SELECT * FROM accounts WHERE account_archived_at IS NULL AND company_id = $session_company_id ORDER BY account_name ASC");
+                                $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL AND company_id = $session_company_id ORDER BY account_name ASC");
                                 while ($row = mysqli_fetch_array($sql)) {
                                     $account_id = $row['account_id'];
                                     $account_name = htmlentities($row['account_name']);
                                     $opening_balance = floatval($row['opening_balance']);
 
-                                    $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
+                                    $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
                                     $row = mysqli_fetch_array($sql_payments);
                                     $total_payments = $row['total_payments'];
 
-                                    $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
+                                    $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
                                     $row = mysqli_fetch_array($sql_revenues);
                                     $total_revenues = $row['total_revenues'];
 
-                                    $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
+                                    $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
                                     $row = mysqli_fetch_array($sql_expenses);
                                     $total_expenses = $row['total_expenses'];
 
                                     $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
 
                                     ?>
-                                    <option <?php if ($config_default_transfer_to_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
+                                    <option <?php if ($config_default_transfer_to_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance, 2); ?>]</option>
 
                                 <?php } ?>
                             </select>
diff --git a/transfer_edit_modal.php b/transfer_edit_modal.php
index b0e9e7be..5c219c4d 100644
--- a/transfer_edit_modal.php
+++ b/transfer_edit_modal.php
@@ -47,28 +47,28 @@
                             <select class="form-control select2" name="account_from" required>
                                 <?php
 
-                                $sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts WHERE (account_archived_at > '$transfer_created_at' OR account_archived_at IS NULL) AND company_id = $session_company_id ORDER BY account_name ASC");
+                                $sql_accounts = mysqli_query($mysqli, "SELECT * FROM accounts WHERE (account_archived_at > '$transfer_created_at' OR account_archived_at IS NULL) AND company_id = $session_company_id ORDER BY account_name ASC");
                                 while ($row = mysqli_fetch_array($sql_accounts)) {
                                     $account_id_select = $row['account_id'];
                                     $account_name_select = htmlentities($row['account_name']);
                                     $opening_balance = floatval($row['opening_balance']);
 
-                                    $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id_select");
+                                    $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id_select");
                                     $row = mysqli_fetch_array($sql_payments);
                                     $total_payments = $row['total_payments'];
 
-                                    $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id_select");
+                                    $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id_select");
                                     $row = mysqli_fetch_array($sql_revenues);
                                     $total_revenues = $row['total_revenues'];
 
-                                    $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id_select");
+                                    $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id_select");
                                     $row = mysqli_fetch_array($sql_expenses);
                                     $total_expenses = $row['total_expenses'];
 
                                     $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
 
                                     ?>
-                                    <option <?php if ($transfer_account_from == $account_id_select) { echo "selected"; } ?> value="<?php echo $account_id_select; ?>"><?php echo $account_name_select; ?> [$<?php echo number_format($balance,2); ?>]</option>
+                                    <option <?php if ($transfer_account_from == $account_id_select) { echo "selected"; } ?> value="<?php echo $account_id_select; ?>"><?php echo $account_name_select; ?> [$<?php echo number_format($balance, 2); ?>]</option>
                                     <?php
                                 }
 
@@ -85,28 +85,28 @@
                             <select class="form-control select2" name="account_to" required>
                                 <?php
 
-                                $sql2 = mysqli_query($mysqli,"SELECT * FROM accounts WHERE (account_archived_at > '$transfer_created_at' OR account_archived_at IS NULL) AND company_id = $session_company_id ORDER BY account_name ASC");
+                                $sql2 = mysqli_query($mysqli, "SELECT * FROM accounts WHERE (account_archived_at > '$transfer_created_at' OR account_archived_at IS NULL) AND company_id = $session_company_id ORDER BY account_name ASC");
                                 while ($row = mysqli_fetch_array($sql2)) {
                                     $account_id2 = $row['account_id'];
                                     $account_name = htmlentities($row['account_name']);
                                     $opening_balance = floatval($row['opening_balance']);
 
-                                    $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id2");
+                                    $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id2");
                                     $row = mysqli_fetch_array($sql_payments);
                                     $total_payments = $row['total_payments'];
 
-                                    $sql_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id2");
+                                    $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id2");
                                     $row = mysqli_fetch_array($sql_revenues);
                                     $total_revenues = $row['total_revenues'];
 
-                                    $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id2");
+                                    $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id2");
                                     $row = mysqli_fetch_array($sql_expenses);
                                     $total_expenses = $row['total_expenses'];
 
                                     $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
 
                                     ?>
-                                    <option <?php if ($transfer_account_to == $account_id2) { echo "selected"; } ?> value="<?php echo $account_id2; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
+                                    <option <?php if ($transfer_account_to == $account_id2) { echo "selected"; } ?> value="<?php echo $account_id2; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance, 2); ?>]</option>
                                     <?php
                                 }
 
diff --git a/transfers.php b/transfers.php
index 02b9b683..8c87e942 100644
--- a/transfers.php
+++ b/transfers.php
@@ -1,61 +1,65 @@
-<?php include("inc_all.php"); 
+<?php
+
+require_once("inc_all.php");
 
 //Column Sortby Filter
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
-  $sb = "transfer_date";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
+    $sb = "transfer_date";
 }
 
 // Reverse default sort
 if (!isset($_GET['o'])) {
-  $o = "DESC";
-  $disp = "ASC";
+    $o = "DESC";
+    $disp = "ASC";
 }
 
 if (empty($_GET['canned_date'])) {
-  //Prevents lots of undefined variable errors.
-  // $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00
-  $_GET['canned_date'] = 'custom';
+    //Prevents lots of undefined variable errors.
+    // $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00
+    $_GET['canned_date'] = 'custom';
 }
 
 //Date Filter
 if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
-  $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf']));
-  $dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt']));
-}elseif ($_GET['canned_date'] == "today") {
-  $dtf = date('Y-m-d');
-  $dtt = date('Y-m-d');
-}elseif ($_GET['canned_date'] == "yesterday") {
-  $dtf = date('Y-m-d',strtotime("yesterday"));
-  $dtt = date('Y-m-d',strtotime("yesterday"));
-}elseif ($_GET['canned_date'] == "thisweek") {
-  $dtf = date('Y-m-d',strtotime("monday this week"));
-  $dtt = date('Y-m-d');
-}elseif ($_GET['canned_date'] == "lastweek") {
-  $dtf = date('Y-m-d',strtotime("monday last week"));
-  $dtt = date('Y-m-d',strtotime("sunday last week"));
-}elseif ($_GET['canned_date'] == "thismonth") {
-  $dtf = date('Y-m-01');
-  $dtt = date('Y-m-d');
-}elseif ($_GET['canned_date'] == "lastmonth") {
-  $dtf = date('Y-m-d',strtotime("first day of last month"));
-  $dtt = date('Y-m-d',strtotime("last day of last month"));
-}elseif ($_GET['canned_date'] == "thisyear") {
-  $dtf = date('Y-01-01');
-  $dtt = date('Y-m-d');
-}elseif ($_GET['canned_date'] == "lastyear") {
-  $dtf = date('Y-m-d',strtotime("first day of january last year"));
-  $dtt = date('Y-m-d',strtotime("last day of december last year"));  
-}else{
-  $dtf = "0000-00-00";
-  $dtt = "9999-00-00";
+    $dtf = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtf']));
+    $dtt = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtt']));
+} elseif ($_GET['canned_date'] == "today") {
+    $dtf = date('Y-m-d');
+    $dtt = date('Y-m-d');
+} elseif ($_GET['canned_date'] == "yesterday") {
+    $dtf = date('Y-m-d', strtotime("yesterday"));
+    $dtt = date('Y-m-d', strtotime("yesterday"));
+} elseif ($_GET['canned_date'] == "thisweek") {
+    $dtf = date('Y-m-d', strtotime("monday this week"));
+    $dtt = date('Y-m-d');
+} elseif ($_GET['canned_date'] == "lastweek") {
+    $dtf = date('Y-m-d', strtotime("monday last week"));
+    $dtt = date('Y-m-d', strtotime("sunday last week"));
+} elseif ($_GET['canned_date'] == "thismonth") {
+    $dtf = date('Y-m-01');
+    $dtt = date('Y-m-d');
+} elseif ($_GET['canned_date'] == "lastmonth") {
+    $dtf = date('Y-m-d', strtotime("first day of last month"));
+    $dtt = date('Y-m-d', strtotime("last day of last month"));
+} elseif ($_GET['canned_date'] == "thisyear") {
+    $dtf = date('Y-01-01');
+    $dtt = date('Y-m-d');
+} elseif ($_GET['canned_date'] == "lastyear") {
+    $dtf = date('Y-m-d', strtotime("first day of january last year"));
+    $dtt = date('Y-m-d', strtotime("last day of december last year"));
+} else {
+    $dtf = "0000-00-00";
+    $dtt = "9999-00-00";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
- 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS transfer_created_at, expense_date AS transfer_date, expense_amount AS transfer_amount, expense_account_id AS transfer_account_from, revenue_account_id AS transfer_account_to, transfer_expense_id, transfer_revenue_id , transfer_id, transfer_notes FROM transfers, expenses, revenues 
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
+
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS transfer_created_at, expense_date AS transfer_date, expense_amount AS transfer_amount, expense_account_id AS transfer_account_from, revenue_account_id AS transfer_account_to, transfer_expense_id, transfer_revenue_id , transfer_id, transfer_notes FROM transfers, expenses, revenues 
   WHERE transfer_expense_id = expense_id 
   AND transfer_revenue_id = revenue_id 
   AND transfers.company_id = $session_company_id
@@ -63,133 +67,133 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS transfer_created_at, exp
   ORDER BY $sb $o LIMIT $record_from, $record_to"
 );
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
-<div class="card card-dark">
-  <div class="card-header py-2">
-    <h3 class="card-title mt-2"><i class="fa fa-fw fa-exchange-alt"></i> Transfers</h3>
-    <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTransferModal"><i class="fas fa-fw fa-plus"></i> New Transfer</button>
-    </div>
-  </div>
-
-  <div class="card-body">
-    <form class="mb-4" autocomplete="off">
-      <div class="row">
-        <div class="col-sm-4">
-          <div class="input-group">
-            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo strip_tags(htmlentities($q));} ?>" placeholder="Search Transfers">
-            <div class="input-group-append">
-              <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
-              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+    <div class="card card-dark">
+        <div class="card-header py-2">
+            <h3 class="card-title mt-2"><i class="fa fa-fw fa-exchange-alt"></i> Transfers</h3>
+            <div class="card-tools">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTransferModal"><i class="fas fa-fw fa-plus"></i> New Transfer</button>
             </div>
-          </div>
         </div>
-      </div>
-      <div class="collapse mt-3 <?php if (!empty($_GET['dtf'])) { echo "show"; } ?>" id="advancedFilter">
-        <div class="row">
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Canned Date</label>
-              <select class="form-control select2" name="canned_date">
-                <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
-                <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-              </select>
-            </div>
-          </div>
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Date From</label>
-              <input type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo htmlentities($dtf); ?>">
-            </div>
-          </div>
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Date To</label>
-              <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo htmlentities($dtt); ?>">
-            </div>
-          </div>
-        </div>    
-      </div>
-    </form>
-    <hr>
-    <div class="table-responsive">
-      <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-          <tr>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=transfer_date&o=<?php echo $disp; ?>">Date</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=transfer_account_from&o=<?php echo $disp; ?>">From Account</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=transfer_account_to&o=<?php echo $disp; ?>">To Account</a></th>
-            <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=transfer_amount&o=<?php echo $disp; ?>">Amount</a></th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $transfer_id = $row['transfer_id'];
-            $transfer_date = $row['transfer_date'];
-            $transfer_account_from = $row['transfer_account_from'];
-            $transfer_account_to = $row['transfer_account_to'];
-            $transfer_amount = floatval($row['transfer_amount']);
-            $transfer_notes = htmlentities($row['transfer_notes']);
-            $transfer_created_at = $row['transfer_created_at'];
-            $expense_id = $row['transfer_expense_id'];
-            $revenue_id = $row['transfer_revenue_id'];
-   
-            $sql2 = mysqli_query($mysqli,"SELECT * FROM accounts WHERE account_id = $transfer_account_from");
-            $row = mysqli_fetch_array($sql2);
-            $account_name_from = htmlentities($row['account_name']);
 
-            $sql2 = mysqli_query($mysqli,"SELECT * FROM accounts WHERE account_id = $transfer_account_to");
-            $row = mysqli_fetch_array($sql2);
-            $account_name_to = htmlentities($row['account_name']);
-
-          ?>
-          <tr>
-            <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editTransferModal<?php echo $transfer_id; ?>"><?php echo $transfer_date; ?></a></td>
-            <td><?php echo $account_name_from; ?></td>
-            <td><?php echo $account_name_to; ?></td>
-            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $transfer_amount, $session_company_currency); ?></td>
-            <td>
-              <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                  <i class="fas fa-ellipsis-h"></i>
-                </button>
-                <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTransferModal<?php echo $transfer_id; ?>">Edit</a>
-                  <div class="dropdown-divider"></div>
-                  <a class="dropdown-item text-danger" href="post.php?delete_transfer=<?php echo $transfer_id; ?>">Delete</a>
+        <div class="card-body">
+            <form class="mb-4" autocomplete="off">
+                <div class="row">
+                    <div class="col-sm-4">
+                        <div class="input-group">
+                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo strip_tags(htmlentities($q));} ?>" placeholder="Search Transfers">
+                            <div class="input-group-append">
+                                <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
+                                <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-              </div>      
-            </td>
-          </tr>
+                <div class="collapse mt-3 <?php if (!empty($_GET['dtf'])) { echo "show"; } ?>" id="advancedFilter">
+                    <div class="row">
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label>Canned Date</label>
+                                <select class="form-control select2" name="canned_date">
+                                    <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
+                                    <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
+                                    <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
+                                    <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
+                                    <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
+                                    <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
+                                    <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
+                                    <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
+                                    <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label>Date From</label>
+                                <input type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo htmlentities($dtf); ?>">
+                            </div>
+                        </div>
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label>Date To</label>
+                                <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo htmlentities($dtt); ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </form>
+            <hr>
+            <div class="table-responsive">
+                <table class="table table-striped table-borderless table-hover">
+                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                    <tr>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=transfer_date&o=<?php echo $disp; ?>">Date</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=transfer_account_from&o=<?php echo $disp; ?>">From Account</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=transfer_account_to&o=<?php echo $disp; ?>">To Account</a></th>
+                        <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=transfer_amount&o=<?php echo $disp; ?>">Amount</a></th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
 
-          <?php
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $transfer_id = $row['transfer_id'];
+                        $transfer_date = $row['transfer_date'];
+                        $transfer_account_from = $row['transfer_account_from'];
+                        $transfer_account_to = $row['transfer_account_to'];
+                        $transfer_amount = floatval($row['transfer_amount']);
+                        $transfer_notes = htmlentities($row['transfer_notes']);
+                        $transfer_created_at = $row['transfer_created_at'];
+                        $expense_id = $row['transfer_expense_id'];
+                        $revenue_id = $row['transfer_revenue_id'];
 
-          include("transfer_edit_modal.php");
-        
-          }
-          
-          ?>
+                        $sql2 = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_id = $transfer_account_from");
+                        $row = mysqli_fetch_array($sql2);
+                        $account_name_from = htmlentities($row['account_name']);
 
-        </tbody>
-      </table>
+                        $sql2 = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_id = $transfer_account_to");
+                        $row = mysqli_fetch_array($sql2);
+                        $account_name_to = htmlentities($row['account_name']);
+
+                        ?>
+                        <tr>
+                            <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editTransferModal<?php echo $transfer_id; ?>"><?php echo $transfer_date; ?></a></td>
+                            <td><?php echo $account_name_from; ?></td>
+                            <td><?php echo $account_name_to; ?></td>
+                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $transfer_amount, $session_company_currency); ?></td>
+                            <td>
+                                <div class="dropdown dropleft text-center">
+                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                        <i class="fas fa-ellipsis-h"></i>
+                                    </button>
+                                    <div class="dropdown-menu">
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTransferModal<?php echo $transfer_id; ?>">Edit</a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger" href="post.php?delete_transfer=<?php echo $transfer_id; ?>">Delete</a>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                        <?php
+
+                        require("transfer_edit_modal.php");
+
+                    }
+
+                    ?>
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once("pagination.php"); ?>
+        </div>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
-</div>
 
-<?php include("transfer_add_modal.php"); ?>
-
-<?php include("footer.php");
\ No newline at end of file
+<?php
+require_once("transfer_add_modal.php");
+require_once("footer.php");
diff --git a/trip_add_modal.php b/trip_add_modal.php
index ca791518..e1fdac23 100644
--- a/trip_add_modal.php
+++ b/trip_add_modal.php
@@ -72,7 +72,7 @@
                                 <?php
 
                                 // WIP Need to only show users within the session company
-                                $sql = mysqli_query($mysqli,"SELECT * FROM users WHERE user_id IN('$session_user_company_access') ORDER BY user_name ASC");
+                                $sql = mysqli_query($mysqli, "SELECT * FROM users WHERE user_id IN('$session_user_company_access') ORDER BY user_name ASC");
                                 while ($row = mysqli_fetch_array($sql)) {
                                     $user_id = $row['user_id'];
                                     $user_name = htmlentities($row['user_name']);
@@ -100,7 +100,7 @@
                                     <option value="0">- Client (Optional) -</option>
                                     <?php
 
-                                    $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
+                                    $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
                                     while ($row = mysqli_fetch_array($sql)) {
                                         $client_id = $row['client_id'];
                                         $client_name = htmlentities($row['client_name']);
diff --git a/trip_copy_modal.php b/trip_copy_modal.php
index 0d040a9b..460c2b37 100644
--- a/trip_copy_modal.php
+++ b/trip_copy_modal.php
@@ -74,7 +74,7 @@
                                 <?php
 
                                 // WIP Need to only show users within the session company
-                                $sql_trips = mysqli_query($mysqli,"SELECT * FROM users ORDER BY user_name ASC");
+                                $sql_trips = mysqli_query($mysqli, "SELECT * FROM users ORDER BY user_name ASC");
                                 while ($row = mysqli_fetch_array($sql_trips)) {
                                     $user_id_select = $row['user_id'];
                                     $user_name_select = htmlentities($row['user_name']);
@@ -100,7 +100,7 @@
                                     <option value="">- Client (Optional) -</option>
                                     <?php
 
-                                    $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
+                                    $sql_clients = mysqli_query($mysqli, "SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
                                     while ($row = mysqli_fetch_array($sql_clients)) {
                                         $client_id_select = $row['client_id'];
                                         $client_name_select = htmlentities($row['client_name']);
diff --git a/trip_edit_modal.php b/trip_edit_modal.php
index 9a77a5b2..72ef1d25 100644
--- a/trip_edit_modal.php
+++ b/trip_edit_modal.php
@@ -75,7 +75,7 @@
                                 <?php
 
                                 // WIP Need to only show users within the session company
-                                $sql_trips = mysqli_query($mysqli,"SELECT * FROM users ORDER BY user_name ASC");
+                                $sql_trips = mysqli_query($mysqli, "SELECT * FROM users ORDER BY user_name ASC");
                                 while ($row = mysqli_fetch_array($sql_trips)) {
                                     $user_id_select = $row['user_id'];
                                     $user_name_select = htmlentities($row['user_name']);
@@ -102,7 +102,7 @@
                                     <option value="">- Client (Optional) -</option>
                                     <?php
 
-                                    $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
+                                    $sql_clients = mysqli_query($mysqli, "SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
                                     while ($row = mysqli_fetch_array($sql_clients)) {
                                         $client_id_select = $row['client_id'];
                                         $client_name_select = htmlentities($row['client_name']);
diff --git a/trips.php b/trips.php
index b6906163..dc300d47 100644
--- a/trips.php
+++ b/trips.php
@@ -1,7 +1,8 @@
-<?php include("inc_all.php");
+<?php
+require_once("inc_all.php");
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "trip_date";
 }
@@ -20,32 +21,32 @@ if (empty($_GET['canned_date'])) {
 
 //Date Filter
 if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
-    $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf']));
-    $dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt']));
+    $dtf = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtf']));
+    $dtt = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtt']));
 } elseif ($_GET['canned_date'] == "today") {
     $dtf = date('Y-m-d');
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "yesterday") {
-    $dtf = date('Y-m-d',strtotime("yesterday"));
-    $dtt = date('Y-m-d',strtotime("yesterday"));
+    $dtf = date('Y-m-d', strtotime("yesterday"));
+    $dtt = date('Y-m-d', strtotime("yesterday"));
 } elseif ($_GET['canned_date'] == "thisweek") {
-    $dtf = date('Y-m-d',strtotime("monday this week"));
+    $dtf = date('Y-m-d', strtotime("monday this week"));
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastweek") {
-    $dtf = date('Y-m-d',strtotime("monday last week"));
-    $dtt = date('Y-m-d',strtotime("sunday last week"));
+    $dtf = date('Y-m-d', strtotime("monday last week"));
+    $dtt = date('Y-m-d', strtotime("sunday last week"));
 } elseif ($_GET['canned_date'] == "thismonth") {
     $dtf = date('Y-m-01');
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastmonth") {
-    $dtf = date('Y-m-d',strtotime("first day of last month"));
-    $dtt = date('Y-m-d',strtotime("last day of last month"));
+    $dtf = date('Y-m-d', strtotime("first day of last month"));
+    $dtt = date('Y-m-d', strtotime("last day of last month"));
 } elseif ($_GET['canned_date'] == "thisyear") {
     $dtf = date('Y-01-01');
     $dtt = date('Y-m-d');
 } elseif ($_GET['canned_date'] == "lastyear") {
-    $dtf = date('Y-m-d',strtotime("first day of january last year"));
-    $dtt = date('Y-m-d',strtotime("last day of december last year"));
+    $dtf = date('Y-m-d', strtotime("first day of january last year"));
+    $dtt = date('Y-m-d', strtotime("last day of december last year"));
 } else {
     $dtf = "0000-00-00";
     $dtt = "9999-00-00";
@@ -54,9 +55,11 @@ if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
 
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM trips 
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM trips 
     LEFT JOIN clients ON trip_client_id = client_id
     LEFT JOIN users ON trip_user_id = user_id
     WHERE (trip_purpose LIKE '%$q%' OR trip_source LIKE '%$q%' OR trip_destination LIKE '%$q%' OR trip_miles LIKE '%$q%' OR client_name LIKE '%$q%' OR user_name LIKE '%$q%')
@@ -65,7 +68,7 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM trips
     ORDER BY $sb $o LIMIT $record_from, $record_to"
 );
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 $total_found_rows = $num_rows[0];
 $total_pages = ceil($total_found_rows / 10);
 
diff --git a/user_add_modal.php b/user_add_modal.php
index a41a9f0e..fe7a1421 100644
--- a/user_add_modal.php
+++ b/user_add_modal.php
@@ -57,7 +57,7 @@
                                 <option value="">- Company -</option>
                                 <?php
 
-                                $sql_companies_select = mysqli_query($mysqli,"SELECT * FROM companies ORDER BY company_name ASC");
+                                $sql_companies_select = mysqli_query($mysqli, "SELECT * FROM companies ORDER BY company_name ASC");
                                 while ($row = mysqli_fetch_array($sql_companies_select)) {
                                     $company_id = $row['company_id'];
                                     $company_name = htmlentities($row['company_name']);
diff --git a/user_companies_modal.php b/user_companies_modal.php
index fa16bdf0..45871592 100644
--- a/user_companies_modal.php
+++ b/user_companies_modal.php
@@ -1,51 +1,62 @@
 <div class="modal" id="editUserCompaniesModal<?php echo $user_id ?>" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-building"></i> Company access: <strong><?php echo $user_name; ?></strong></h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="user_id" value="<?php echo $user_id; ?>">
-        <input type="hidden" name="companies[]" value="<?php echo $user_default_company; ?>">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-building"></i> Company access:
+                    <strong><?php echo $user_name; ?></strong></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="user_id" value="<?php echo $user_id; ?>">
+                <input type="hidden" name="companies[]" value="<?php echo $user_default_company; ?>">
 
-        <div class="modal-body bg-white">
+                <div class="modal-body bg-white">
 
-          <div class="alert alert-info">
-            Select Companies that the user will need access to
-          </div>
+                    <div class="alert alert-info">
+                        Select Companies that the user will need access to
+                    </div>
 
-          <ul class="list-group">
+                    <ul class="list-group">
 
-            <?php
-            $sql_companies_select = mysqli_query($mysqli,"SELECT * FROM companies ORDER BY company_name ASC");
+                        <?php
+                        $sql_companies_select = mysqli_query($mysqli, "SELECT * FROM companies ORDER BY company_name ASC");
 
-            while ($row = mysqli_fetch_array($sql_companies_select)) {
-              $company_id_select = $row['company_id'];
-              $company_name_select = htmlentities($row['company_name']);
+                        while ($row = mysqli_fetch_array($sql_companies_select)) {
+                            $company_id_select = $row['company_id'];
+                            $company_name_select = htmlentities($row['company_name']);
+
+                            ?>
+                            <li class="list-group-item">
+                                <div class="form-check">
+                                    <input type="checkbox" class="form-check-input" name="companies[]"
+                                           value="<?php echo $company_id_select; ?>" <?php if (in_array("$company_id_select", $user_company_access_array)) {
+                                        echo "checked";
+                                    } ?> <?php if ($user_default_company == $company_id_select) {
+                                        echo "disabled";
+                                    } ?>>
+                                    <label
+                                        class="form-check-label ml-2"><?php echo $company_name_select; ?><?php if ($user_default_company == $company_id_select) {
+                                            echo "<small>(Default Company)</small>";
+                                        } ?></label>
+                                </div>
+                            </li>
+
+                            <?php
+                        }
+                        ?>
+
+                    </ul>
 
-            ?>
-              <li class="list-group-item">
-                <div class="form-check">
-                  <input type="checkbox" class="form-check-input" name="companies[]" value="<?php echo $company_id_select; ?>" <?php if (in_array("$company_id_select",$user_company_access_array)) { echo "checked"; } ?> <?php if ($user_default_company == $company_id_select) { echo "disabled"; } ?>>
-                  <label class="form-check-label ml-2"><?php echo $company_name_select; ?> <?php if ($user_default_company == $company_id_select) { echo "<small>(Default Company)</small>"; } ?></label>
                 </div>
-              </li>
-
-            <?php
-            }
-            ?>
-
-          </ul>
-
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="edit_user_companies" class="btn btn-primary text-bold"><i
+                            class="fa fa-check"></i> Save
+                    </button>
+                </div>
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_user_companies" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/user_edit_modal.php b/user_edit_modal.php
index 00d9768a..2504fc34 100644
--- a/user_edit_modal.php
+++ b/user_edit_modal.php
@@ -1,129 +1,147 @@
 <div class="modal" id="editUserModal<?php echo $user_id; ?>" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-user-edit"></i> Editing user: <strong><?php echo $user_name; ?></strong></h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-        <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-        <input type="hidden" name="user_id" value="<?php echo $user_id; ?>">
-        <input type="hidden" name="existing_file_name" value="<?php echo "$user_avatar"; ?>">
-        <div class="modal-body bg-white">    
-          
-          <center class="mb-3">
-            <?php if (!empty($user_avatar)) { ?>
-            <img class="img-fluid" src="<?php echo "uploads/users/$user_id/$user_avatar"; ?>">
-            <?php }else{ ?>
-            <span class="fa-stack fa-4x">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-user-edit"></i> Editing user:
+                    <strong><?php echo $user_name; ?></strong></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+                <input type="hidden" name="user_id" value="<?php echo $user_id; ?>">
+                <input type="hidden" name="existing_file_name" value="<?php echo "$user_avatar"; ?>">
+                <div class="modal-body bg-white">
+
+                    <center class="mb-3">
+                        <?php if (!empty($user_avatar)) { ?>
+                            <img class="img-fluid" src="<?php echo "uploads/users/$user_id/$user_avatar"; ?>">
+                        <?php } else { ?>
+                            <span class="fa-stack fa-4x">
               <i class="fa fa-circle fa-stack-2x text-secondary"></i>
               <span class="fa fa-stack-1x text-white"><?php echo $user_initials; ?></span>
             </span>
-            <?php } ?>
-          </center>
-          
-          <div class="form-group">
-            <label>Name <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" placeholder="Full Name" value="<?php echo $user_name; ?>" required>
-            </div>
-          </div>
+                        <?php } ?>
+                    </center>
 
-          <div class="form-group">
-            <label>Email <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-              </div>
-              <input type="email" class="form-control" name="email" placeholder="Email Address" value="<?php echo $user_email; ?>" required>
-            </div>
-          </div>
+                    <div class="form-group">
+                        <label>Name <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="name" placeholder="Full Name"
+                                   value="<?php echo $user_name; ?>" required>
+                        </div>
+                    </div>
 
-          <div class="form-group">
-            <label>New Password</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
-              </div>
-              <input type="password" class="form-control" data-toggle="password" name="new_password" placeholder="Leave Blank For No Password Change" autocomplete="new-password">
-              <div class="input-group-append">
-                <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-              </div>
-            </div>
-          </div>
+                    <div class="form-group">
+                        <label>Email <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                            </div>
+                            <input type="email" class="form-control" name="email" placeholder="Email Address"
+                                   value="<?php echo $user_email; ?>" required>
+                        </div>
+                    </div>
 
-          <div class="form-group">
-            <label>Company <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-              </div>
-              <select class="form-control select2" name="default_company" required>
-                <option value="">- Company -</option>
-                <?php 
-                
-                $sql_companies_select = mysqli_query($mysqli,"SELECT * FROM companies ORDER BY company_name ASC"); 
-                while ($row = mysqli_fetch_array($sql_companies_select)) {
-                  $company_id_select = $row['company_id'];
-                  $company_name_select = htmlentities($row['company_name']);
-                ?>
-                  <option <?php if ($company_id_select == $user_default_company) { echo "selected"; } ?> value="<?php echo $company_id_select; ?>"><?php echo $company_name_select; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
+                    <div class="form-group">
+                        <label>New Password</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
+                            </div>
+                            <input type="password" class="form-control" data-toggle="password" name="new_password"
+                                   placeholder="Leave Blank For No Password Change" autocomplete="new-password">
+                            <div class="input-group-append">
+                                <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                            </div>
+                        </div>
+                    </div>
 
-          <div class="form-group">
-            <label>Role <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
-              </div>
-              <select class="form-control select2" name="role" required>
-                <option value="">- Role -</option>
-                <option <?php if ($user_role == 3) { echo "selected"; } ?> value="3">Administrator</option>
-                <option <?php if ($user_role == 2) { echo "selected"; } ?> value="2">Technician</option>
-                <option <?php if ($user_role == 1) { echo "selected"; } ?> value="1">Accountant</option>
-              </select>
-            </div>
-          </div>
+                    <div class="form-group">
+                        <label>Company <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                            </div>
+                            <select class="form-control select2" name="default_company" required>
+                                <option value="">- Company -</option>
+                                <?php
 
-          <div class="form-group">
-            <label>Avatar</label>
-            <input type="file" class="form-control-file" accept="image/*;capture=camera" name="file">
-          </div>
+                                $sql_companies_select = mysqli_query($mysqli, "SELECT * FROM companies ORDER BY company_name ASC");
+                                while ($row = mysqli_fetch_array($sql_companies_select)) {
+                                    $company_id_select = $row['company_id'];
+                                    $company_name_select = htmlentities($row['company_name']);
+                                    ?>
+                                    <option <?php if ($company_id_select == $user_default_company) {
+                                        echo "selected";
+                                    } ?>
+                                        value="<?php echo $company_id_select; ?>"><?php echo $company_name_select; ?></option>
 
-          <?php if (!empty($user_token)) { ?>
+                                    <?php
+                                }
+                                ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Role <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
+                            </div>
+                            <select class="form-control select2" name="role" required>
+                                <option value="">- Role -</option>
+                                <option <?php if ($user_role == 3) {
+                                    echo "selected";
+                                } ?> value="3">Administrator
+                                </option>
+                                <option <?php if ($user_role == 2) {
+                                    echo "selected";
+                                } ?> value="2">Technician
+                                </option>
+                                <option <?php if ($user_role == 1) {
+                                    echo "selected";
+                                } ?> value="1">Accountant
+                                </option>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Avatar</label>
+                        <input type="file" class="form-control-file" accept="image/*;capture=camera" name="file">
+                    </div>
+
+                    <?php if (!empty($user_token)) { ?>
+
+                        <div class="form-group">
+                            <label>2FA</label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-id-card"></i></span>
+                                </div>
+                                <select class="form-control" name="2fa">
+                                    <option value="">Keep enabled</option>
+                                    <option value="disable">Disable</option>
+                                </select>
+                            </div>
+                        </div>
+
+                    <?php } ?>
 
-            <div class="form-group">
-              <label>2FA</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-id-card"></i></span>
                 </div>
-                <select class="form-control" name="2fa">
-                  <option value="">Keep enabled</option>
-                  <option value="disable">Disable</option>
-                </select>
-              </div>
-            </div>
-
-          <?php } ?>
-                   
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="edit_user" class="btn btn-primary text-bold"><i class="fa fa-check"></i>
+                        Save
+                    </button>
+                </div>
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_user" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/user_invite_modal.php b/user_invite_modal.php
index 09bb4fca..d91597a0 100644
--- a/user_invite_modal.php
+++ b/user_invite_modal.php
@@ -1,71 +1,70 @@
 <div class="modal" id="userInviteModal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-user-plus"></i> Invite User</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-        <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-        <div class="modal-body bg-white">
-
-          <div class="form-group">
-            <label>Email <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-              </div>
-              <input type="email" class="form-control" name="email" placeholder="Email Address" required>
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-user-plus"></i> Invite User</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
+            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+                <div class="modal-body bg-white">
 
-          <div class="form-group">
-            <label>Company <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-              </div>
-              <select class="form-control select2" name="default_company" required>
-                <option value="">- Company -</option>
-                <?php 
-                
-                $sql_companies_select = mysqli_query($mysqli,"SELECT * FROM companies ORDER BY company_name ASC"); 
-                while ($row = mysqli_fetch_array($sql_companies_select)) {
-                  $company_id = $row['company_id'];
-                  $company_name = htmlentities($row['company_name']);
-                ?>
-                  <option value="<?php echo $company_id; ?>"><?php echo $company_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
+                    <div class="form-group">
+                        <label>Email <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                            </div>
+                            <input type="email" class="form-control" name="email" placeholder="Email Address" required>
+                        </div>
+                    </div>
 
-          <div class="form-group">
-            <label>Role <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
-              </div>
-              <select class="form-control select2" name="role" required>
-                <option value="">- Role -</option>
-                <option value="3">Administrator</option>
-                <option value="2">Technician</option>
-                <option value="1">Accountant</option>
-              </select>
-            </div>
-          </div>
+                    <div class="form-group">
+                        <label>Company <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                            </div>
+                            <select class="form-control select2" name="default_company" required>
+                                <option value="">- Company -</option>
+                                <?php
 
+                                $sql_companies_select = mysqli_query($mysqli, "SELECT * FROM companies ORDER BY company_name ASC");
+                                while ($row = mysqli_fetch_array($sql_companies_select)) {
+                                    $company_id = $row['company_id'];
+                                    $company_name = htmlentities($row['company_name']);
+                                    ?>
+                                    <option value="<?php echo $company_id; ?>"><?php echo $company_name; ?></option>
+
+                                <?php } ?>
+
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Role <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
+                            </div>
+                            <select class="form-control select2" name="role" required>
+                                <option value="">- Role -</option>
+                                <option value="3">Administrator</option>
+                                <option value="2">Technician</option>
+                                <option value="1">Accountant</option>
+                            </select>
+                        </div>
+                    </div>
+
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="invite_user" class="btn btn-primary"><strong><i class="fas fa-paper-plane"></i> Send Invite</strong></button>
+                </div>
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="invite_user" class="btn btn-primary"><strong><i class="fas fa-paper-plane"></i> Send Invite</strong></button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/user_profile.php b/user_profile.php
index 01fa2805..03ea5692 100644
--- a/user_profile.php
+++ b/user_profile.php
@@ -112,7 +112,7 @@ $sql_recent_logs = mysqli_query($mysqli, "SELECT * FROM logs
                         if (!empty($session_token)) {
 
                             //Generate QR Code based off the generated key
-                            print sprintf('<img src="%s"/>',TokenAuth6238::getBarCodeUrl($session_name,' ',$session_token,$_SERVER['SERVER_NAME']));
+                            print sprintf('<img src="%s"/>', TokenAuth6238::getBarCodeUrl($session_name, ' ', $session_token, $_SERVER['SERVER_NAME']));
 
                             echo "<p class='text-secondary'>$session_token</p>";
                         }
diff --git a/users.php b/users.php
index 1b1f558e..c66361c4 100644
--- a/users.php
+++ b/users.php
@@ -1,13 +1,13 @@
 <?php require_once("inc_all_settings.php");
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "user_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
 $sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM users, user_settings
     WHERE users.user_id = user_settings.user_id
@@ -87,11 +87,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         while ($row = mysqli_fetch_array($user_company_access_sql)) {
                             $user_company_access_array[] = $row['company_id'];
                         }
-                        $user_company_access = implode(',',$user_company_access_array);
+                        $user_company_access = implode(',', $user_company_access_array);
 
                         $user_initials = htmlentities(initials($user_name));
 
-                        $sql_last_login = mysqli_query($mysqli, "SELECT * FROM logs 
+                        $sql_last_login = mysqli_query(
+                            $mysqli,
+                            "SELECT * FROM logs 
               WHERE log_user_id = $user_id AND log_type = 'Login'
               ORDER BY log_id DESC LIMIT 1"
                         );
diff --git a/vendor_add_from_template_modal.php b/vendor_add_from_template_modal.php
index e611cb49..0af4928c 100644
--- a/vendor_add_from_template_modal.php
+++ b/vendor_add_from_template_modal.php
@@ -22,7 +22,7 @@
                             <select class="form-control" name="vendor_template_id" required>
                                 <option value="">- Select Template -</option>
                                 <?php
-                                $sql_vendor_templates = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_template = 1 AND company_id = $session_company_id AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
+                                $sql_vendor_templates = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_template = 1 AND company_id = $session_company_id AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
                                 while ($row = mysqli_fetch_array($sql_vendor_templates)) {
                                     $vendor_template_id = $row['vendor_id'];
                                     $vendor_template_name = htmlentities($row['vendor_name']);
diff --git a/vendor_edit_modal.php b/vendor_edit_modal.php
index e55b3543..ce98f268 100644
--- a/vendor_edit_modal.php
+++ b/vendor_edit_modal.php
@@ -79,7 +79,7 @@
                           <option value="0">- None -</option>
                           <?php
 
-                          $sql_vendor_templates = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_template = 1 AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
+                          $sql_vendor_templates = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_template = 1 AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
                           while ($row = mysqli_fetch_array($sql_vendor_templates)) {
                               $vendor_template_id_select = $row['vendor_id'];
                               $vendor_template_name_select = htmlentities($row['vendor_name']); ?>
diff --git a/vendors.php b/vendors.php
index 1ffe6c98..2eb48a7b 100644
--- a/vendors.php
+++ b/vendors.php
@@ -1,204 +1,193 @@
-<?php include("inc_all.php");
+<?php
+
+require_once("inc_all.php");
 
 if (isset($_GET['q'])) {
-  $q = strip_tags(mysqli_real_escape_string($mysqli,$_GET['q']));
-  //Phone Numbers
-  $phone_query = preg_replace("/[^0-9]/", '',$q);
-  if (empty($phone_query)) {
-    $phone_query = $q;
-  }
-}else{
-  $q = "";
-  $phone_query = "";
+    $q = strip_tags(mysqli_real_escape_string($mysqli, $_GET['q']));
+    //Phone Numbers
+    $phone_query = preg_replace("/[^0-9]/", '', $q);
+    if (empty($phone_query)) {
+        $phone_query = $q;
+    }
+} else {
+    $q = "";
+    $phone_query = "";
 }
 
 //Column Filter
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
-  $sb = "vendor_name";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
+    $sb = "vendor_name";
 }
 
 //Date From and Date To Filter
 if (!empty($_GET['dtf'])) {
-  $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf']));
-  $dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt']));
-}else{
-  $dtf = "0000-00-00";
-  $dtt = "9999-00-00";
+    $dtf = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtf']));
+    $dtt = strip_tags(mysqli_real_escape_string($mysqli, $_GET['dtt']));
+} else {
+    $dtf = "0000-00-00";
+    $dtt = "9999-00-00";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM vendors 
-  WHERE vendor_client_id = 0
-  AND vendor_template = 0 
-  AND DATE(vendor_created_at) BETWEEN '$dtf' AND '$dtt'
-  AND (vendor_name LIKE '%$q%' OR vendor_description LIKE '%$q%' OR vendor_account_number LIKE '%$q%' OR vendor_website LIKE '%$q%' OR vendor_contact_name LIKE '%$q%' OR vendor_email LIKE '%$q%' OR vendor_phone LIKE '%$phone_query%')
-  AND vendor_archived_at IS NULL
-  AND company_id = $session_company_id
-  ORDER BY $sb $o LIMIT $record_from, $record_to");
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM vendors 
+    WHERE vendor_client_id = 0
+    AND vendor_template = 0 
+    AND DATE(vendor_created_at) BETWEEN '$dtf' AND '$dtt'
+    AND (vendor_name LIKE '%$q%' OR vendor_description LIKE '%$q%' OR vendor_account_number LIKE '%$q%' OR vendor_website LIKE '%$q%' OR vendor_contact_name LIKE '%$q%' OR vendor_email LIKE '%$q%' OR vendor_phone LIKE '%$phone_query%')
+    AND vendor_archived_at IS NULL
+    AND company_id = $session_company_id
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
+);
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
-<div class="card card-dark">
-  <div class="card-header py-2">
-    <h3 class="card-title mt-2"><i class="fa fa-fw fa-building"></i> Vendors</h3>
-    <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addVendorModal"><i class="fas fa-fw fa-plus"></i> New Vendor</button>
-    </div>
-  </div>
-  
-  <div class="card-body">
-    <form class="mb-4" autocomplete="off">
-      <div class="row">
-        <div class="col-sm-4">
-          <div class="input-group">
-            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo strip_tags(htmlentities($q));} ?>" placeholder="Search Vendors">
-            <div class="input-group-append">
-              <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
-              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+    <div class="card card-dark">
+        <div class="card-header py-2">
+            <h3 class="card-title mt-2"><i class="fa fa-fw fa-building"></i> Vendors</h3>
+            <div class="card-tools">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addVendorModal"><i class="fas fa-fw fa-plus"></i> New Vendor</button>
             </div>
-          </div>
         </div>
-      </div>
-      <div class="collapse mt-3 <?php if (!empty($_GET['dtf'])) { echo "show"; } ?>" id="advancedFilter">
-        <div class="row">
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Date From</label>
-              <input type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo htmlentities($dtf); ?>">
-            </div>
-          </div>
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Date To</label>
-              <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo htmlentities($dtt); ?>">
-            </div>
-          </div>
-        </div>    
-      </div>
-    </form>
-    <hr>
-    <div class="table-responsive">
-      <table class="table table-striped table-hover table-borderless">
-        <thead class="<?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-          <tr>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_name&o=<?php echo $disp; ?>">Vendor</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_description&o=<?php echo $disp; ?>">Description</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_contact_name&o=<?php echo $disp; ?>">Contact</a></th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $vendor_id = $row['vendor_id'];
-            $vendor_name = htmlentities($row['vendor_name']);
-            $vendor_description = htmlentities($row['vendor_description']);
-            if (empty($vendor_description)) {
-              $vendor_description_display = "-";
-            }else{
-              $vendor_description_display = $vendor_description;
-            }
-            $vendor_account_number = htmlentities($row['vendor_account_number']);
-            $vendor_contact_name = htmlentities($row['vendor_contact_name']);
-            if (empty($vendor_contact_name)) {
-              $vendor_contact_name_display = "-";
-            }else{
-              $vendor_contact_name_display = $vendor_contact_name;
-            }
-            $vendor_phone = formatPhoneNumber($row['vendor_phone']);
-            $vendor_extension = htmlentities($row['vendor_extension']);
-            $vendor_email = htmlentities($row['vendor_email']);
-            $vendor_website = htmlentities($row['vendor_website']);
-            $vendor_hours = htmlentities($row['vendor_hours']);
-            $vendor_sla = htmlentities($row['vendor_sla']);
-            $vendor_code = htmlentities($row['vendor_code']);
-            $vendor_notes = htmlentities($row['vendor_notes']);
-            $vendor_template_id = intval($row['vendor_template_id']);
-            
-          ?>
 
-          <tr>
-            <th>
-              <a class="text-dark" href="#" data-toggle="modal" data-target="#editVendorModal<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?><a>
-              <?php
-              if (!empty($vendor_account_number)) {
-              ?>
-              <br>
-              <small class="text-secondary"><?php echo $vendor_account_number; ?></small>
-              <?php
-              }
-              ?>
-
-            </th>
-            <td><?php echo $vendor_description_display; ?></td>
-            <td>
-              <?php
-              if (!empty($vendor_contact_name)) {
-              ?>
-              <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><?php echo $vendor_contact_name; ?>
-              <br>
-              <?php
-              }else{
-                echo $vendor_contact_name_display;
-              }
-              ?>
-              <?php
-              if (!empty($vendor_phone)) {
-              ?>
-              <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $vendor_phone; ?> <?php if (!empty($vendor_extension)) { echo "x$vendor_extension"; } ?>
-              <br>
-              <?php
-              }
-              ?>
-              <?php
-              if (!empty($vendor_email)) {
-              ?>
-              <i class="fa fa-fw fa-envelope text-secondary mr-2 mb-2"></i><?php echo $vendor_email; ?>
-              <br>
-              <?php
-              }
-              ?>
-            </td>
-            <td>
-              <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                  <i class="fas fa-ellipsis-h"></i>
-                </button>
-                <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editVendorModal<?php echo $vendor_id; ?>">Edit</a>
-                  <div class="dropdown-divider"></div>
-                  <a class="dropdown-item text-danger" href="post.php?archive_vendor=<?php echo $vendor_id; ?>">Archive</a>
+        <div class="card-body">
+            <form class="mb-4" autocomplete="off">
+                <div class="row">
+                    <div class="col-sm-4">
+                        <div class="input-group">
+                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo strip_tags(htmlentities($q));} ?>" placeholder="Search Vendors">
+                            <div class="input-group-append">
+                                <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
+                                <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-              </div>      
-            </td>
-          </tr>
+                <div class="collapse mt-3 <?php if (!empty($_GET['dtf'])) { echo "show"; } ?>" id="advancedFilter">
+                    <div class="row">
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label>Date From</label>
+                                <input type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo htmlentities($dtf); ?>">
+                            </div>
+                        </div>
+                        <div class="col-md-2">
+                            <div class="form-group">
+                                <label>Date To</label>
+                                <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo htmlentities($dtt); ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </form>
+            <hr>
+            <div class="table-responsive">
+                <table class="table table-striped table-hover table-borderless">
+                    <thead class="<?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                    <tr>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_name&o=<?php echo $disp; ?>">Vendor</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_description&o=<?php echo $disp; ?>">Description</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_contact_name&o=<?php echo $disp; ?>">Contact</a></th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
 
-          <?php
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $vendor_id = $row['vendor_id'];
+                        $vendor_name = htmlentities($row['vendor_name']);
+                        $vendor_description = htmlentities($row['vendor_description']);
+                        if (empty($vendor_description)) {
+                            $vendor_description_display = "-";
+                        } else {
+                            $vendor_description_display = $vendor_description;
+                        }
+                        $vendor_account_number = htmlentities($row['vendor_account_number']);
+                        $vendor_contact_name = htmlentities($row['vendor_contact_name']);
+                        if (empty($vendor_contact_name)) {
+                            $vendor_contact_name_display = "-";
+                        } else {
+                            $vendor_contact_name_display = $vendor_contact_name;
+                        }
+                        $vendor_phone = formatPhoneNumber($row['vendor_phone']);
+                        $vendor_extension = htmlentities($row['vendor_extension']);
+                        $vendor_email = htmlentities($row['vendor_email']);
+                        $vendor_website = htmlentities($row['vendor_website']);
+                        $vendor_hours = htmlentities($row['vendor_hours']);
+                        $vendor_sla = htmlentities($row['vendor_sla']);
+                        $vendor_code = htmlentities($row['vendor_code']);
+                        $vendor_notes = htmlentities($row['vendor_notes']);
+                        $vendor_template_id = intval($row['vendor_template_id']);
 
-            include("vendor_edit_modal.php");
-  
-          }
-          
-          ?>
+                        ?>
 
-        </tbody>
-      </table>
+                        <tr>
+                            <th>
+                                <a class="text-dark" href="#" data-toggle="modal" data-target="#editVendorModal<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?><a>
+                                        <?php if (!empty($vendor_account_number)) { ?>
+                                            <br>
+                                            <small class="text-secondary"><?php echo $vendor_account_number; ?></small>
+                                        <?php } ?>
+
+                            </th>
+                            <td><?php echo $vendor_description_display; ?></td>
+                            <td>
+                                <?php
+                                if (!empty($vendor_contact_name)) { ?>
+                                    <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><?php echo $vendor_contact_name; ?>
+                                    <br>
+                                <?php } else {
+                                    echo $vendor_contact_name_display;
+                                }
+
+                                if (!empty($vendor_phone)) { ?>
+                                    <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $vendor_phone; ?> <?php if (!empty($vendor_extension)) { echo "x$vendor_extension"; } ?>
+                                    <br>
+                                <?php }
+
+                                if (!empty($vendor_email)) { ?>
+                                    <i class="fa fa-fw fa-envelope text-secondary mr-2 mb-2"></i><?php echo $vendor_email; ?>
+                                    <br>
+                                <?php } ?>
+
+                            </td>
+                            <td>
+                                <div class="dropdown dropleft text-center">
+                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                        <i class="fas fa-ellipsis-h"></i>
+                                    </button>
+                                    <div class="dropdown-menu">
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editVendorModal<?php echo $vendor_id; ?>">Edit</a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger" href="post.php?archive_vendor=<?php echo $vendor_id; ?>">Archive</a>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                        <?php
+
+                        require("vendor_edit_modal.php");
+
+                    }
+
+                    ?>
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once("pagination.php"); ?>
+        </div>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
-</div>
 
-<?php 
-  
-  include("vendor_add_modal.php");
-
-  include("footer.php");
-
-?>
\ No newline at end of file
+<?php
+require_once("vendor_add_modal.php");
+require_once("footer.php");