From f92dc108e2c6a25c236f5119c84f1aea42ff2c99 Mon Sep 17 00:00:00 2001
From: Marcus Hill <bcf8c9f2@opayq.com>
Date: Sat, 4 Feb 2023 22:09:56 +0000
Subject: [PATCH] Tidy

- Move some scripts to their own js files
- Move some duplicate code blocks to functions
- General tidy & spacing cleanups (#538)
---
 account_add_modal.php                         |  104 +-
 account_edit_modal.php                        |   64 +-
 accounts.php                                  |   13 +-
 calendar_add_modal.php                        |   72 +-
 calendar_event_add_modal.php                  |  302 +-
 calendar_event_edit_modal.php                 |  299 +-
 calendar_events.php                           |  253 +-
 categories.php                                |   14 +-
 category_add_modal.php                        |   82 +-
 category_edit_modal.php                       |   97 +-
 category_quick_add_modal.php                  |  146 +-
 check_login.php                               |    4 +-
 client_add_modal.php                          |  600 ++--
 client_asset_add_modal.php                    |  633 ++--
 client_asset_copy_modal.php                   |  625 ++--
 client_asset_documents_modal.php              |   54 +-
 client_asset_edit_modal.php                   |  628 ++--
 client_asset_import_modal.php                 |   52 +-
 client_asset_interface_add_modal.php          |  231 +-
 client_asset_tickets_modal.php                |   66 +-
 client_assets.php                             |   52 +-
 client_certificates.php                       |    4 +-
 client_contact_add_modal.php                  |  392 ++-
 client_contact_details.php                    |  139 +-
 client_contact_details_modal.php              |  198 +-
 client_contact_edit_modal.php                 |  458 ++-
 client_contact_import_modal.php               |   52 +-
 client_contact_invite_modal.php               |  148 +-
 client_contacts.php                           |  406 ++-
 client_delete_modal.php                       |   44 +-
 client_document_details.php                   |    4 +-
 client_document_edit_modal.php                |   94 +-
 client_document_folder_add_modal.php          |   52 +-
 client_document_folder_rename_modal.php       |   52 +-
 client_document_template_add_modal.php        |   52 +-
 client_document_template_details.php          |    4 +-
 client_document_template_edit_modal.php       |   54 +-
 client_document_templates.php                 |    4 +-
 client_document_view_modal.php                |   26 +-
 client_documents.php                          |  356 ++-
 client_domain_add_modal.php                   |  164 +-
 client_domain_edit_modal.php                  |  258 +-
 client_domains.php                            |  266 +-
 client_edit_modal.php                         |  327 +-
 client_events.php                             |    4 +-
 client_file_add_modal.php                     |   58 +-
 client_file_view_modal.php                    |   30 +-
 client_files.php                              |   11 +-
 client_invoices.php                           |    4 +-
 client_location_add_modal.php                 |  322 +-
 client_location_edit_modal.php                |  340 ++-
 client_locations.php                          |    4 +-
 client_login_add_modal.php                    |  408 +--
 client_login_edit_modal.php                   |  415 ++-
 client_logins.php                             |    2 +-
 client_logs.php                               |    2 +-
 client_networks.php                           |    4 +-
 client_payments.php                           |    4 +-
 client_quotes.php                             |  248 +-
 client_recurring_invoices.php                 |    4 +-
 client_scheduled_tickets.php                  |  176 +-
 client_services.php                           |  300 +-
 client_shared_items.php                       |    4 +-
 client_software.php                           |    4 +-
 client_software_add_from_template_modal.php   |   84 +-
 client_software_add_modal.php                 |  444 ++-
 client_software_edit_modal.php                |  444 ++-
 client_software_template_add_modal.php        |  132 +-
 client_software_template_edit_modal.php       |  132 +-
 client_software_templates.php                 |    4 +-
 client_tickets.php                            |    2 +-
 client_trips.php                              |  228 +-
 client_vendor_templates.php                   |    4 +-
 client_vendors.php                            |  318 +-
 clients.php                                   |  638 ++--
 companies.php                                 |  195 +-
 company_add_modal.php                         |  360 +--
 company_edit_modal.php                        |  364 +--
 cron.php                                      |   47 +-
 dashboard_technical.php                       |   21 +-
 database_updates.php                          |   88 +-
 expense_add_modal.php                         |  316 +-
 expense_copy_modal.php                        |  294 +-
 expense_edit_modal.php                        |  328 +-
 expense_export_modal.php                      |   78 +-
 expense_refund_modal.php                      |  124 +-
 expenses.php                                  |  365 ++-
 footer.php                                    |   48 +-
 functions.php                                 |   52 +
 get_credential.php                            |    4 +-
 get_settings.php                              |  274 +-
 global_search.php                             |   41 +-
 guest_download_file.php                       |    9 +-
 guest_header.php                              |   86 +-
 guest_post.php                                |   12 +-
 guest_view_invoice.php                        |   14 +-
 guest_view_item.php                           |   20 +-
 inc_all.php                                   |   16 +-
 inc_all_client.php                            |   62 +-
 invoice.php                                   |   14 +-
 invoice_add_modal.php                         |  180 +-
 invoices.php                                  |   44 +-
 js/client_delete_confirm.js                   |    9 +
 js/domain_edit_modal.js                       |   74 +
 ...ets.js => scheduled_tickets_edit_modal.js} |    0
 logs.php                                      |   13 +-
 notifications.php                             |   12 +-
 notifications_dismissed.php                   |  195 +-
 post.php                                      |   24 +-
 quote_add_modal.php                           |  183 +-
 revenues.php                                  |  337 ++-
 scheduled_tickets.php                         |    4 +-
 settings_api.php                              |  174 +-
 settings_backup.php                           |    6 +-
 settings_defaults.php                         |  373 ++-
 settings_modules.php                          |   69 +-
 settings_online_payment.php                   |   92 +-
 settings_ticket.php                           |    6 +-
 setup.php                                     | 2648 ++++++++---------
 transfer_add_modal.php                        |  243 +-
 transfer_edit_modal.php                       |  254 +-
 trip_add_modal.php                            |  250 +-
 trip_copy_modal.php                           |  242 +-
 trip_edit_modal.php                           |  249 +-
 trip_export_modal.php                         |   78 +-
 trips.php                                     |  341 ++-
 user_profile.php                              |   10 +-
 vendor_add_from_template_modal.php            |   88 +-
 vendor_template_add_modal.php                 |  310 +-
 vendor_template_edit_modal.php                |  320 +-
 130 files changed, 11265 insertions(+), 11514 deletions(-)
 create mode 100644 js/client_delete_confirm.js
 create mode 100644 js/domain_edit_modal.js
 rename js/{scheduledTickets.js => scheduled_tickets_edit_modal.js} (100%)

diff --git a/account_add_modal.php b/account_add_modal.php
index 9e728716..fb8db55f 100644
--- a/account_add_modal.php
+++ b/account_add_modal.php
@@ -1,61 +1,61 @@
 <div class="modal" id="addAccountModal" 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-piggy-bank"></i> New Account</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>Account 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-piggy-bank"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" placeholder="Account 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-piggy-bank"></i> New Account</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <div class="modal-body bg-white">
 
-          <div class="form-group">
-            <label>Opening Balance</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" name="opening_balance" placeholder="Opening Balance" required>
-            </div>
-          </div>
+                    <div class="form-group">
+                        <label>Account 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-piggy-bank"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="name" placeholder="Account name" required autofocus>
+                        </div>
+                    </div>
 
-          <div class="form-group">
-            <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">
+                        <label>Opening Balance</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" name="opening_balance" placeholder="Opening Balance" required>
+                        </div>
+                    </div>
 
-          <div class="form-group">
-            <label>Notes</label>
-            <textarea class="form-control" rows="5" placeholder="Enter some notes" name="notes"></textarea>
-          </div>
+                    <div class="form-group">
+                        <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">
+                        <label>Notes</label>
+                        <textarea class="form-control" rows="5" placeholder="Enter some notes" name="notes"></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_account" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Create</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_account" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/account_edit_modal.php b/account_edit_modal.php
index 729e8dcf..cdac0780 100644
--- a/account_edit_modal.php
+++ b/account_edit_modal.php
@@ -1,37 +1,37 @@
 <div class="modal" id="editAccountModal<?php echo $account_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-piggy-bank"></i> Editing account: <strong><?php echo $account_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="account_id" value="<?php echo $account_id; ?>">
-        <div class="modal-body bg-white">
-          
-          <div class="form-group">
-            <label>Account 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-piggy-bank"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" value="<?php echo $account_name; ?>" placeholder="Account 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-piggy-bank"></i> Editing account: <strong><?php echo $account_name; ?></strong></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
-        
-          <div class="form-group">
-            <label>Notes</label>
-            <textarea class="form-control" rows="5" placeholder="Enter some notes" name="notes"><?php echo $account_notes; ?></textarea>
-          </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="account_id" value="<?php echo $account_id; ?>">
+                <div class="modal-body bg-white">
 
+                    <div class="form-group">
+                        <label>Account 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-piggy-bank"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="name" value="<?php echo $account_name; ?>" placeholder="Account name" required>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Notes</label>
+                        <textarea class="form-control" rows="5" placeholder="Enter some notes" name="notes"><?php echo $account_notes; ?></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_account" 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_account" 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/accounts.php b/accounts.php
index b4fbae9e..6b6413e8 100644
--- a/accounts.php
+++ b/accounts.php
@@ -1,4 +1,6 @@
-<?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']));
@@ -97,14 +99,11 @@ $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("account_add_modal.php");
-
-include("footer.php");
-
-?>
+require_once("account_add_modal.php");
+require_once("footer.php");
diff --git a/calendar_add_modal.php b/calendar_add_modal.php
index e90c3852..c9a4dd6c 100644
--- a/calendar_add_modal.php
+++ b/calendar_add_modal.php
@@ -1,41 +1,41 @@
 <div class="modal" id="addCalendarModal" 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-calendar-plus"></i> New Calendar</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</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="text" class="form-control" name="name" placeholder="Name your calendar" 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-calendar-plus"></i> New Calendar</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Color</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-palette"></i></span>
-              </div>
-              <input type="color" class="form-control" name="color" required>
-            </div>
-          </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <div class="modal-body bg-white">
 
+                    <div class="form-group">
+                        <label>Name</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="text" class="form-control" name="name" placeholder="Name your calendar" required autofocus>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Color</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-palette"></i></span>
+                            </div>
+                            <input type="color" class="form-control" name="color" required>
+                        </div>
+                    </div>
+
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_calendar" class="btn btn-primary">Save</button>
+                </div>
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_calendar" class="btn btn-primary">Save</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/calendar_event_add_modal.php b/calendar_event_add_modal.php
index eff6307a..a3428a52 100644
--- a/calendar_event_add_modal.php
+++ b/calendar_event_add_modal.php
@@ -1,162 +1,156 @@
 <div class="modal" id="addCalendarEventModal" 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-calendar-plus"></i> New Event</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">
-
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-event"><i class="fa fa-fw fa-calendar"></i> Event</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-more"><i class="fa fa-fw fa-info-circle"></i> More</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-attendees"><i class="fa fa-fw fa-users"></i> Attendees</a>
-            </li>
-          </ul>
-
-          <hr>
-          
-          <div class="tab-content">
-
-            <div class="tab-pane fade show active" id="pills-event">
-              
-              <div class="form-group">
-                <label>Title <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-day"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="title" placeholder="Title of the event" required autofocus>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Calendar <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>
-                  <select class="form-control select2" name="calendar" required>
-                    <option value="">- Calendar -</option>
-                    <?php 
-                    
-                    $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']);
-                      $calendar_color = htmlentities($row['calendar_color']);
-                    ?>
-                      <option <?php if ($config_default_calendar == $calendar_id) { echo "selected"; } ?> data-content="<i class='fa fa-circle mr-2' style='color:<?php echo $calendar_color; ?>;'></i> <?php echo $calendar_name; ?>" value="<?php echo $calendar_id; ?>"><?php echo $calendar_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                  <div class="input-group-append">
-                    <button type="button" class="btn btn-dark" data-toggle="modal" data-target="#addQuickCalendarModal"><i class="fas fa-fw fa-plus"></i></button>
-                  </div>
-                </div>
-              </div>
-              
-              <label>Start / End <strong class="text-danger">*</strong></label>
-              <div class="form-row">
-                <div class="col-md-6 mb-3">
-                  <input type="datetime-local" class="form-control form-control-sm" id="event_add_start" name="start" required onblur="updateIncrementEndTime()">
-                </div>
-                <div class="col-md-6 mb-3">
-                  <input type="datetime-local" class="form-control form-control-sm" id="event_add_end" name="end" required>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Description</label>
-                <textarea class="form-control" rows="4" name="description" placeholder="Enter a description"></textarea>
-              </div>
-
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-calendar-plus"></i> New Event</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="tab-pane fade" id="pills-more">
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-event"><i class="fa fa-fw fa-calendar"></i> Event</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-more"><i class="fa fa-fw fa-info-circle"></i> More</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-attendees"><i class="fa fa-fw fa-users"></i> Attendees</a>
+                        </li>
+                    </ul>
+
+                    <hr>
+
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-event">
+
+                            <div class="form-group">
+                                <label>Title <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-day"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="title" placeholder="Title of the event" required autofocus>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Calendar <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>
+                                    <select class="form-control select2" name="calendar" required>
+                                        <option value="">- Calendar -</option>
+                                        <?php
+
+                                        $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']);
+                                            $calendar_color = htmlentities($row['calendar_color']);
+                                            ?>
+                                            <option <?php if ($config_default_calendar == $calendar_id) { echo "selected"; } ?> data-content="<i class='fa fa-circle mr-2' style='color:<?php echo $calendar_color; ?>;'></i> <?php echo $calendar_name; ?>" value="<?php echo $calendar_id; ?>"><?php echo $calendar_name; ?></option>
+                                        <?php } ?>
+
+                                    </select>
+                                    <div class="input-group-append">
+                                        <button type="button" class="btn btn-dark" data-toggle="modal" data-target="#addQuickCalendarModal"><i class="fas fa-fw fa-plus"></i></button>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <label>Start / End <strong class="text-danger">*</strong></label>
+                            <div class="form-row">
+                                <div class="col-md-6 mb-3">
+                                    <input type="datetime-local" class="form-control form-control-sm" id="event_add_start" name="start" required onblur="updateIncrementEndTime()">
+                                </div>
+                                <div class="col-md-6 mb-3">
+                                    <input type="datetime-local" class="form-control form-control-sm" id="event_add_end" name="end" required>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Description</label>
+                                <textarea class="form-control" rows="4" name="description" placeholder="Enter a description"></textarea>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-more">
+
+                            <div class="form-group">
+                                <label>Repeat</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-recycle"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="repeat">
+                                        <option value="">Never</option>
+                                        <option>Day</option>
+                                        <option>Week</option>
+                                        <option>Month</option>
+                                        <option>Year</option>
+                                    </select>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-attendees">
+
+                            <?php if (isset($client_id)) { ?>
+                                <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+                            <?php } else{ ?>
+
+                                <div class="form-group">
+                                    <label>Client</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>
+                                        <select class="form-control select2" name="client">
+                                            <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");
+                                            while ($row = mysqli_fetch_array($sql)) {
+                                                $client_id = $row['client_id'];
+                                                $client_name = htmlentities($row['client_name']);
+                                                $contact_email = htmlentities($row['contact_email']);
+                                                ?>
+                                                <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+
+                                            <?php } ?>
+                                        </select>
+                                    </div>
+                                </div>
+
+                            <?php } ?>
+
+                            <?php if (!empty($config_smtp_host)) { ?>
+                                <div class="form-group">
+                                    <div class="custom-control custom-checkbox">
+                                        <input type="checkbox" class="custom-control-input" id="emailEventCheckbox" name="email_event" value="1" >
+                                        <label class="custom-control-label" for="emailEventCheckbox">Email Event</label>
+                                    </div>
+                                </div>
+                            <?php } ?>
+
+                        </div>
+
+                    </div>
 
-              <div class="form-group">
-                <label>Repeat</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-recycle"></i></span>
-                  </div>
-                  <select class="form-control select2" name="repeat">
-                    <option value="">Never</option>
-                    <option>Day</option>
-                    <option>Week</option>
-                    <option>Month</option>
-                    <option>Year</option>
-                  </select>
                 </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-attendees">
-
-              <?php if (isset($client_id)) { ?>
-
-              <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-
-              <?php }else{ ?>
-
-              <div class="form-group">
-                <label>Client</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>
-                  <select class="form-control select2" name="client">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql)) {
-                      $client_id = $row['client_id'];
-                      $client_name = htmlentities($row['client_name']);
-                      $contact_email = htmlentities($row['contact_email']);
-                    ?>
-                      <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_event" class="btn btn-primary"><strong><i class="fa fa-check"></i> Create</strong></button>
                 </div>
-              </div>
-                
-              <?php } ?>
-
-              <?php if (!empty($config_smtp_host)) { ?>
-              <div class="form-group">
-                <div class="custom-control custom-checkbox">
-                  <input type="checkbox" class="custom-control-input" id="emailEventCheckbox" name="email_event" value="1" >
-                  <label class="custom-control-label" for="emailEventCheckbox">Email Event</label>
-                </div>
-              </div>
-              <?php } ?>
-
-            </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_event" class="btn btn-primary"><strong><i class="fa fa-check"></i> Create</strong></button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/calendar_event_edit_modal.php b/calendar_event_edit_modal.php
index c387e5ea..3bb800c0 100644
--- a/calendar_event_edit_modal.php
+++ b/calendar_event_edit_modal.php
@@ -1,160 +1,155 @@
 <div class="modal" id="editEventModal<?php echo $event_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-calendar"></i> <?php echo $event_title; ?></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="event_id" value="<?php echo $event_id; ?>">
-        
-        <div class="modal-body bg-white">
-
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-event<?php echo $event_id; ?>"><i class="fa fa-fw fa-calendar"></i> Event</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-more<?php echo $event_id; ?>"><i class="fa fa-fw fa-info-circle"></i> More</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-attendees<?php echo $event_id; ?>"><i class="fa fa-fw fa-users"></i> Attendees</a>
-            </li>
-          </ul>
-
-          <hr>
-          
-          <div class="tab-content">
-
-            <div class="tab-pane fade show active" id="pills-event<?php echo $event_id; ?>">
-
-              <div class="form-group">
-                <label>Title <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-day"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="title" value="<?php echo $event_title; ?>" placeholder="Title of the event" required>
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Calendar <strong class="text-danger">*</strong></label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-calendar"></i></span>
-                  </div>
-                  <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"); 
-                    while ($row = mysqli_fetch_array($sql_calendars_select)) {
-                      $calendar_id_select = $row['calendar_id'];
-                      $calendar_name_select = htmlentities($row['calendar_name']);
-                      $calendar_color_select = htmlentities($row['calendar_color']);
-                    ?>
-                      <option data-content="<i class='fa fa-circle mr-2' style='color:<?php echo $calendar_color_select; ?>;'></i> <?php echo $calendar_name_select; ?>"<?php if ($calendar_id == $calendar_id_select) { echo "selected"; } ?> value="<?php echo $calendar_id_select; ?>"><?php echo $calendar_name_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-              
-              <label>Start / End <strong class="text-danger">*</strong></label>
-              <div class="form-row">
-                <div class="col-md-6 mb-3">
-                  <input type="datetime-local" class="form-control form-control-sm" name="start" value="<?php echo date('Y-m-d\TH:i:s', strtotime($event_start)); ?>" required>
-                </div>
-                <div class="col-md-6 mb-3">
-                  <input type="datetime-local" class="form-control form-control-sm" name="end" value="<?php echo date('Y-m-d\TH:i:s', strtotime($event_end)); ?>"required>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Description</label>
-                <textarea class="form-control" rows="4" name="description" placeholder="Enter a description"><?php echo $event_description; ?></textarea>
-              </div>
-
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-calendar"></i> <?php echo $event_title; ?></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
 
-            <div class="tab-pane fade" id="pills-more<?php echo $event_id; ?>">
-            
-              <div class="form-group">
-                <label>Repeat</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-recycle"></i></span>
-                  </div>
-                  <select class="form-control select2" name="repeat">
-                    <option <?php if (empty($event_repeat)) { echo "selected"; } ?> value="">Never</option>
-                    <option <?php if ($event_repeat == "Day") { echo "selected"; } ?>>Day</option>
-                    <option <?php if ($event_repeat == "Week") { echo "selected"; } ?>>Week</option>
-                    <option <?php if ($event_repeat == "Month") { echo "selected"; } ?>>Month</option>
-                    <option <?php if ($event_repeat == "Year") { echo "selected"; } ?>>Year</option>
-                  </select>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="event_id" value="<?php echo $event_id; ?>">
+
+                <div class="modal-body bg-white">
+
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-event<?php echo $event_id; ?>"><i class="fa fa-fw fa-calendar"></i> Event</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-more<?php echo $event_id; ?>"><i class="fa fa-fw fa-info-circle"></i> More</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-attendees<?php echo $event_id; ?>"><i class="fa fa-fw fa-users"></i> Attendees</a>
+                        </li>
+                    </ul>
+
+                    <hr>
+
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-event<?php echo $event_id; ?>">
+
+                            <div class="form-group">
+                                <label>Title <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-day"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="title" value="<?php echo $event_title; ?>" placeholder="Title of the event" required>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Calendar <strong class="text-danger">*</strong></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+                                    </div>
+                                    <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");
+                                        while ($row = mysqli_fetch_array($sql_calendars_select)) {
+                                            $calendar_id_select = $row['calendar_id'];
+                                            $calendar_name_select = htmlentities($row['calendar_name']);
+                                            $calendar_color_select = htmlentities($row['calendar_color']);
+                                            ?>
+                                            <option data-content="<i class='fa fa-circle mr-2' style='color:<?php echo $calendar_color_select; ?>;'></i> <?php echo $calendar_name_select; ?>"<?php if ($calendar_id == $calendar_id_select) { echo "selected"; } ?> value="<?php echo $calendar_id_select; ?>"><?php echo $calendar_name_select; ?></option>
+
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <label>Start / End <strong class="text-danger">*</strong></label>
+                            <div class="form-row">
+                                <div class="col-md-6 mb-3">
+                                    <input type="datetime-local" class="form-control form-control-sm" name="start" value="<?php echo date('Y-m-d\TH:i:s', strtotime($event_start)); ?>" required>
+                                </div>
+                                <div class="col-md-6 mb-3">
+                                    <input type="datetime-local" class="form-control form-control-sm" name="end" value="<?php echo date('Y-m-d\TH:i:s', strtotime($event_end)); ?>"required>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Description</label>
+                                <textarea class="form-control" rows="4" name="description" placeholder="Enter a description"><?php echo $event_description; ?></textarea>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-more<?php echo $event_id; ?>">
+
+                            <div class="form-group">
+                                <label>Repeat</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-recycle"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="repeat">
+                                        <option <?php if (empty($event_repeat)) { echo "selected"; } ?> value="">Never</option>
+                                        <option <?php if ($event_repeat == "Day") { echo "selected"; } ?>>Day</option>
+                                        <option <?php if ($event_repeat == "Week") { echo "selected"; } ?>>Week</option>
+                                        <option <?php if ($event_repeat == "Month") { echo "selected"; } ?>>Month</option>
+                                        <option <?php if ($event_repeat == "Year") { echo "selected"; } ?>>Year</option>
+                                    </select>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-attendees<?php echo $event_id; ?>">
+
+                            <?php if (isset($_GET['client_id'])) { ?>
+                                <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+                            <?php } else { ?>
+
+                                <div class="form-group">
+                                    <label>Client</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>
+                                        <select class="form-control select2" name="client">
+                                            <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");
+                                            while ($row = mysqli_fetch_array($sql_clients)) {
+                                                $client_id_select = $row['client_id'];
+                                                $client_name_select = htmlentities($row['client_name']);
+                                                $contact_email_select = htmlentities($row['contact_email']);
+                                                ?>
+                                                <option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
+
+                                            <?php } ?>
+
+                                        </select>
+                                    </div>
+                                </div>
+
+                            <?php } ?>
+
+                            <?php if (!empty($config_smtp_host)) { ?>
+                                <div class="custom-control custom-checkbox">
+                                    <input type="checkbox" class="custom-control-input" id="customControlAutosizing<?php echo $event_id; ?>" name="email_event" value="1" >
+                                    <label class="custom-control-label" for="customControlAutosizing<?php echo $event_id; ?>">Email Event</label>
+                                </div>
+                            <?php } ?>
+
+                        </div>
+
+                    </div>
+
                 </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-attendees<?php echo $event_id; ?>">
-
-              <?php if (isset($_GET['client_id'])) { ?>
-
-              <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-
-              <?php }else{ ?>
-
-              <div class="form-group">
-                <label>Client</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>
-                  <select class="form-control select2" name="client">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql_clients)) {
-                      $client_id_select = $row['client_id'];
-                      $client_name_select = htmlentities($row['client_name']);
-                      $contact_email_select = htmlentities($row['contact_email']);
-                    ?>
-                      <option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
+                <div class="modal-footer bg-white">
+                    <a href="post.php?delete_event=<?php echo $event_id; ?>" class="btn btn-danger mr-auto"><i class="fa fa-trash"></i> Delete</a>
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="edit_event" class="btn btn-primary"><strong><i class="fa fa-check"></i> Update</button>
                 </div>
-              </div>
-
-              <?php } ?>
-
-              <?php if (!empty($config_smtp_host)) { ?>
-              <div class="custom-control custom-checkbox">
-                <input type="checkbox" class="custom-control-input" id="customControlAutosizing<?php echo $event_id; ?>" name="email_event" value="1" >
-                <label class="custom-control-label" for="customControlAutosizing<?php echo $event_id; ?>">Email Event</label>
-              </div>
-              <?php } ?>
-
-            </div>
-
-          </div>
-
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <a href="post.php?delete_event=<?php echo $event_id; ?>" class="btn btn-danger mr-auto"><i class="fa fa-trash"></i> Delete</a>
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_event" class="btn btn-primary"><strong><i class="fa fa-check"></i> Update</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/calendar_events.php b/calendar_events.php
index 64d52050..a43d255e 100644
--- a/calendar_events.php
+++ b/calendar_events.php
@@ -1,166 +1,151 @@
-<?php include("inc_all.php"); ?>
+<?php
 
-<link href='plugins/fullcalendar/main.min.css' rel='stylesheet' />
-
-<?php 
+require_once("inc_all.php");
 
 if (isset($_GET['calendar_id'])) {
-  $calendar_selected_id = intval($_GET['calendar_id']);
+    $calendar_selected_id = intval($_GET['calendar_id']);
 }
 
 ?>
+<link href='plugins/fullcalendar/main.min.css' rel='stylesheet' />
 
 <div id='calendar'></div>
-  
-<?php 
-  
-  include("calendar_event_add_modal.php");
-  include("calendar_add_modal.php");
-  include("category_quick_add_modal.php");
-
-?>
 
 <?php
+
+require_once("calendar_event_add_modal.php");
+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");
 while ($row = mysqli_fetch_array($sql)) {
-  $event_id = $row['event_id'];
-  $event_title = htmlentities($row['event_title']);
-  $event_description = htmlentities($row['event_description']);
-  $event_start = htmlentities($row['event_start']);
-  $event_end = htmlentities($row['event_end']);
-  $event_repeat = htmlentities($row['event_repeat']);
-  $calendar_id = $row['calendar_id'];
-  $calendar_name = htmlentities($row['calendar_name']);
-  $calendar_color = htmlentities($row['calendar_color']);
-  $client_id = $row['event_client_id'];
+    $event_id = $row['event_id'];
+    $event_title = htmlentities($row['event_title']);
+    $event_description = htmlentities($row['event_description']);
+    $event_start = htmlentities($row['event_start']);
+    $event_end = htmlentities($row['event_end']);
+    $event_repeat = htmlentities($row['event_repeat']);
+    $calendar_id = $row['calendar_id'];
+    $calendar_name = htmlentities($row['calendar_name']);
+    $calendar_color = htmlentities($row['calendar_color']);
+    $client_id = $row['event_client_id'];
 
-  include("calendar_event_edit_modal.php");
+    require("calendar_event_edit_modal.php");
 
 }
 
 ?>
 
-<?php include("footer.php"); ?>
+<?php require_once("footer.php"); ?>
 
 <script src='plugins/fullcalendar/main.min.js'></script>
 
 <script>
 
     document.addEventListener('DOMContentLoaded', function() {
-      var calendarEl = document.getElementById('calendar');
+        var calendarEl = document.getElementById('calendar');
 
-      var calendar = new FullCalendar.Calendar(calendarEl, {
-        themeSystem: 'bootstrap',
-        defaultView: 'dayGridMonth',
-        customButtons: {
-          addEvent: {
-            bootstrapFontAwesome: 'fa fa-plus',
-            click: function() {
-              $("#addCalendarEventModal").modal();
+        var calendar = new FullCalendar.Calendar(calendarEl, {
+            themeSystem: 'bootstrap',
+            defaultView: 'dayGridMonth',
+            customButtons: {
+                addEvent: {
+                    bootstrapFontAwesome: 'fa fa-plus',
+                    click: function() {
+                        $("#addCalendarEventModal").modal();
+                    }
+                },
+                addCalendar: {
+                    bootstrapFontAwesome: 'fa fa-calendar-plus',
+                    click: function() {
+                        $("#addCalendarModal").modal();
+                    }
+                }
+            },
+            headerToolbar: {
+                left: 'prev,next today',
+                center: 'title',
+                right: 'dayGridMonth,timeGridWeek,timeGridDay,listMonth addEvent addCalendar'
+            },
+            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");
+                while ($row = mysqli_fetch_array($sql)) {
+                    $event_id = json_encode($row['event_id']);
+                    $event_title = json_encode($row['event_title']);
+                    $event_start = json_encode($row['event_start']);
+                    $event_end = json_encode($row['event_end']);
+                    $calendar_id = json_encode($row['calendar_id']);
+                    $calendar_name = json_encode($row['calendar_name']);
+                    $calendar_color = json_encode($row['calendar_color']);
+
+                    echo "{ id: $event_id, title: $event_title, start: $event_start, end: $event_end, color: $calendar_color },";
+                }
+
+                //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");
+                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']);
+                    $event_start = json_encode($row['invoice_date']);
+
+                    echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'blue', url: 'invoice.php?invoice_id=$event_id' },";
+                }
+
+                //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");
+                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']);
+                    $event_start = json_encode($row['quote_date']);
+
+                    echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'purple', url: 'quote.php?quote_id=$event_id' },";
+                }
+
+                //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");
+                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']);
+                    $event_start = json_encode($row['ticket_created_at']);
+
+                    echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'orange', url: 'ticket.php?ticket_id=$event_id' },";
+
+                }
+
+                //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");
+                while ($row = mysqli_fetch_array($sql)) {
+                    $event_id = json_encode($row['vendor_id']);
+                    $event_title = json_encode($row['vendor_name']);
+                    $event_start = json_encode($row['vendor_created_at']);
+
+                    echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'brown', url: 'client_vendors.php?client_id=$event_id' },";
+                }
+
+                //Clients Added
+                $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']);
+                    $event_start = json_encode($row['client_created_at']);
+
+                    echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'green', url: 'client.php?client_id=$event_id' },";
+                }
+                ?>
+
+
+            ],
+            eventClick: function(editEvent) {
+                $('#editEventModal'+editEvent.event.id).modal();
             }
-          },
-          addCalendar: {
-            bootstrapFontAwesome: 'fa fa-calendar-plus',
-            click: function() {
-              $("#addCalendarModal").modal();
-            }
-          }
-        },
-        headerToolbar: {
-          left: 'prev,next today',
-          center: 'title',
-          right: 'dayGridMonth,timeGridWeek,timeGridDay,listMonth addEvent addCalendar'
-        },
-        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");
-          while ($row = mysqli_fetch_array($sql)) {
-            $event_id = json_encode($row['event_id']);
-            $event_title = json_encode($row['event_title']);
-            $event_start = json_encode($row['event_start']);
-            $event_end = json_encode($row['event_end']);
-            $calendar_id = json_encode($row['calendar_id']);
-            $calendar_name = json_encode($row['calendar_name']);
-            $calendar_color = json_encode($row['calendar_color']);
-            
-            echo "{ id: $event_id, title: $event_title, start: $event_start, end: $event_end, color: $calendar_color },";
-          }
-          ?>
-          
-          <?php
-          //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");
-          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']);
-            $event_start = json_encode($row['invoice_date']);
-            
-            echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'blue', url: 'invoice.php?invoice_id=$event_id' },";
-          }
-          ?>
+        });
 
-          <?php
-          //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");
-          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']);
-            $event_start = json_encode($row['quote_date']);
-            
-            echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'purple', url: 'quote.php?quote_id=$event_id' },";
-          }
-          ?>
-
-          <?php
-          //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");
-          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']);
-            $event_start = json_encode($row['ticket_created_at']);
-            
-            echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'orange', url: 'ticket.php?ticket_id=$event_id' },";
-         
-          }
-          
-          ?>
-
-          <?php
-          //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");
-          while ($row = mysqli_fetch_array($sql)) {
-            $event_id = json_encode($row['vendor_id']);
-            $event_title = json_encode($row['vendor_name']);
-            $event_start = json_encode($row['vendor_created_at']);
-            
-            echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'brown', url: 'client_vendors.php?client_id=$event_id' },";
-          }
-          ?>
-
-          <?php
-          //Clients Added
-          $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']);
-            $event_start = json_encode($row['client_created_at']);
-            
-            echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'green', url: 'client.php?client_id=$event_id' },";
-          }
-          ?>
-
-
-        ],
-        eventClick: function(editEvent) {
-          $('#editEventModal'+editEvent.event.id).modal();
-        }
-      });
-
-      calendar.render();
+        calendar.render();
     });
 
-  </script>
+</script>
 
 <!-- Automatically set new event end date to 1 hr after start date -->
 <script>
@@ -185,4 +170,4 @@ while ($row = mysqli_fetch_array($sql)) {
 
     }
 
-</script>
\ No newline at end of file
+</script>
diff --git a/categories.php b/categories.php
index 73005b98..fd24b2e5 100644
--- a/categories.php
+++ b/categories.php
@@ -1,4 +1,6 @@
-<?php require_once("inc_all_settings.php");
+<?php
+
+require_once("inc_all_settings.php");
 
 if (isset($_GET['category'])) {
     $category = strip_tags(mysqli_real_escape_string($mysqli,$_GET['category']));
@@ -119,14 +121,10 @@ $colors_diff = array_diff($colors_array, $colors_used_array);
                     </tbody>
                 </table>
             </div>
-            <?php include("pagination.php"); ?>
+            <?php require_once("pagination.php"); ?>
         </div>
     </div>
 
 <?php
-
-include("category_add_modal.php");
-
-include("footer.php");
-
-?>
+require_once("category_add_modal.php");
+require_once("footer.php");
diff --git a/category_add_modal.php b/category_add_modal.php
index fbb85f4b..82341c32 100644
--- a/category_add_modal.php
+++ b/category_add_modal.php
@@ -1,49 +1,47 @@
 <div class="modal" id="addCategoryModal" 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-list"></i> New <?php echo $category; ?> Category</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="type" value="<?php echo $category; ?>">
-
-        <div class="modal-body bg-white">
-
-          <div class="form-group">
-            <label>Name <strong class="text-danger">*</strong></label>
-            <input type="text" class="form-control" name="name" placeholder="Category name" required autofocus>
-          </div>
-
-          <label>Color <strong class="text-danger">*</strong></label>
-          <div class="form-row">
-
-            <?php
-
-            foreach ($colors_diff as $color) {
-
-            ?>
-
-            <div class="col-3 mb-3">
-              <div class="form-check">
-                <input class="form-check-input" type="radio" name="color" value="<?php echo $color; ?>">
-                <label class="form-check-label">
-                  <i class="fa fa-fw fa-3x fa-circle" style="color:<?php echo $color; ?>"></i>
-                </label>
-              </div>
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-list"></i> New <?php echo $category; ?> Category</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="type" value="<?php echo $category; ?>">
 
-            <?php } ?>
-          </div>
+                <div class="modal-body bg-white">
 
+                    <div class="form-group">
+                        <label>Name <strong class="text-danger">*</strong></label>
+                        <input type="text" class="form-control" name="name" placeholder="Category name" required autofocus>
+                    </div>
+
+                    <label>Color <strong class="text-danger">*</strong></label>
+                    <div class="form-row">
+
+                        <?php
+
+                        foreach ($colors_diff as $color) { ?>
+
+                            <div class="col-3 mb-3">
+                                <div class="form-check">
+                                    <input class="form-check-input" type="radio" name="color" value="<?php echo $color; ?>">
+                                    <label class="form-check-label">
+                                        <i class="fa fa-fw fa-3x fa-circle" style="color:<?php echo $color; ?>"></i>
+                                    </label>
+                                </div>
+                            </div>
+                        <?php } ?>
+
+                    </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_category" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</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_category" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/category_edit_modal.php b/category_edit_modal.php
index 520a3ef5..c8d34098 100644
--- a/category_edit_modal.php
+++ b/category_edit_modal.php
@@ -1,55 +1,54 @@
 <div class="modal" id="editCategoryModal<?php echo $category_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-list"></i> Editing category: <strong><?php echo $category_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="category_id" value="<?php echo $category_id; ?>">
-        <input type="hidden" name="type" value="<?php echo $category; ?>">
-        <div class="modal-body bg-white">
-          
-          <div class="form-group">
-            <label>Name <strong class="text-danger">*</strong></label>
-            <input type="text" class="form-control" name="name" value="<?php echo $category_name; ?>" required>
-          </div>
-          
-          <label>Color <strong class="text-danger">*</strong></label>
-          <div class="mb-3">
-              <div class="form-check">
-                <input class="form-check-input" type="radio" name="color" value="<?php echo $category_color; ?>" checked>
-                <label class="form-check-label">
-                  <i class="fa fa-fw fa-4x fa-circle" style="color:<?php echo $category_color; ?>"></i>
-                </label>
-              </div>
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-list"></i> Editing category: <strong><?php echo $category_name; ?></strong></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          <div class="form-row">
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="category_id" value="<?php echo $category_id; ?>">
+                <input type="hidden" name="type" value="<?php echo $category; ?>">
+                <div class="modal-body bg-white">
 
-            <?php 
+                    <div class="form-group">
+                        <label>Name <strong class="text-danger">*</strong></label>
+                        <input type="text" class="form-control" name="name" value="<?php echo $category_name; ?>" required>
+                    </div>
 
-            foreach($colors_diff as $color) { 
-            ?>
-            <div class="col-3 mb-3">
-              <div class="form-check">
-                <input class="form-check-input" type="radio" name="color" value="<?php echo $color; ?>">
-                <label class="form-check-label">
-                  <i class="fa fa-fw fa-3x fa-circle" style="color:<?php echo $color; ?>"></i>
-                </label>
-              </div>
-            </div>
-           
-            <?php } ?>
-          </div>
-        
+                    <label>Color <strong class="text-danger">*</strong></label>
+                    <div class="mb-3">
+                        <div class="form-check">
+                            <input class="form-check-input" type="radio" name="color" value="<?php echo $category_color; ?>" checked>
+                            <label class="form-check-label">
+                                <i class="fa fa-fw fa-4x fa-circle" style="color:<?php echo $category_color; ?>"></i>
+                            </label>
+                        </div>
+                    </div>
+                    <div class="form-row">
+
+                        <?php
+
+                        foreach($colors_diff as $color) { ?>
+                            <div class="col-3 mb-3">
+                                <div class="form-check">
+                                    <input class="form-check-input" type="radio" name="color" value="<?php echo $color; ?>">
+                                    <label class="form-check-label">
+                                        <i class="fa fa-fw fa-3x fa-circle" style="color:<?php echo $color; ?>"></i>
+                                    </label>
+                                </div>
+                            </div>
+                        <?php } ?>
+
+                    </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_category" 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_category" 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/category_quick_add_modal.php b/category_quick_add_modal.php
index 7d50289b..e8eee6f2 100644
--- a/category_quick_add_modal.php
+++ b/category_quick_add_modal.php
@@ -1,96 +1,96 @@
 <div class="modal" id="addQuickCategoryExpenseModal" tabindex="-1">
-  <div class="modal-dialog modal-sm">
-    <div class="modal-content bg-light">
-      <div class="modal-body">
-        <form action="post.php" method="post" autocomplete="off">      
-          <input type="hidden" name="type" value="Expense">
-          <input type="hidden" name="color" value="#000000">
-          <div class="input-group">
-            <input type="text" class="form-control" name="name" placeholder="Category name" required autofocus>
-            <div class="input-group-append">
-              <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-fw fa-times"></i></button>
-              <button type="submit" name="add_category" class="btn btn-primary"><i class="fa fa-fw fa-check"></i></button> 
+    <div class="modal-dialog modal-sm">
+        <div class="modal-content bg-light">
+            <div class="modal-body">
+                <form action="post.php" method="post" autocomplete="off">
+                    <input type="hidden" name="type" value="Expense">
+                    <input type="hidden" name="color" value="#000000">
+                    <div class="input-group">
+                        <input type="text" class="form-control" name="name" placeholder="Category name" required autofocus>
+                        <div class="input-group-append">
+                            <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-fw fa-times"></i></button>
+                            <button type="submit" name="add_category" class="btn btn-primary"><i class="fa fa-fw fa-check"></i></button>
+                        </div>
+                    </div>
+                </form>
             </div>
-          </div>
-        </form>
-      </div>
+        </div>
     </div>
-  </div>
 </div>
 
 <div class="modal" id="addQuickCategoryIncomeModal" tabindex="-1">
-  <div class="modal-dialog modal-sm">
-    <div class="modal-content bg-light">
-      <div class="modal-body">
-        <form action="post.php" method="post" autocomplete="off">      
-          <input type="hidden" name="type" value="Income">
-          <input type="hidden" name="color" value="#000000">
-          <div class="input-group">
-            <input type="text" class="form-control" name="name" placeholder="Category name" required autofocus>
-            <div class="input-group-append">
-              <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-fw fa-times"></i></button>
-              <button type="submit" name="add_category" class="btn btn-primary"><i class="fa fa-fw fa-check"></i></button> 
+    <div class="modal-dialog modal-sm">
+        <div class="modal-content bg-light">
+            <div class="modal-body">
+                <form action="post.php" method="post" autocomplete="off">
+                    <input type="hidden" name="type" value="Income">
+                    <input type="hidden" name="color" value="#000000">
+                    <div class="input-group">
+                        <input type="text" class="form-control" name="name" placeholder="Category name" required autofocus>
+                        <div class="input-group-append">
+                            <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-fw fa-times"></i></button>
+                            <button type="submit" name="add_category" class="btn btn-primary"><i class="fa fa-fw fa-check"></i></button>
+                        </div>
+                    </div>
+                </form>
             </div>
-          </div>
-        </form>
-      </div>
+        </div>
     </div>
-  </div>
 </div>
 
 <div class="modal" id="addQuickVendorModal" tabindex="-1">
-  <div class="modal-dialog modal-sm">
-    <div class="modal-content bg-light">
-      <div class="modal-body">
-        <form action="post.php" method="post" autocomplete="off">
-          <div class="input-group">
-            <input type="text" class="form-control" name="name" placeholder="Vendor name" required autofocus>
-            <div class="input-group-append">
-              <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-fw fa-times"></i></button>
-              <button type="submit" name="add_vendor" class="btn btn-primary"><i class="fa fa-fw fa-check"></i></button> 
+    <div class="modal-dialog modal-sm">
+        <div class="modal-content bg-light">
+            <div class="modal-body">
+                <form action="post.php" method="post" autocomplete="off">
+                    <div class="input-group">
+                        <input type="text" class="form-control" name="name" placeholder="Vendor name" required autofocus>
+                        <div class="input-group-append">
+                            <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-fw fa-times"></i></button>
+                            <button type="submit" name="add_vendor" class="btn btn-primary"><i class="fa fa-fw fa-check"></i></button>
+                        </div>
+                    </div>
+                </form>
             </div>
-          </div>
-        </form>
-      </div>
+        </div>
     </div>
-  </div>
 </div>
 
 <div class="modal" id="addQuickReferralModal" tabindex="-1">
-  <div class="modal-dialog modal-sm">
-    <div class="modal-content bg-light">
-      <div class="modal-body">
-        <form action="post.php" method="post" autocomplete="off">
-          <input type="hidden" name="type" value="Referral">
-          <input type="hidden" name="color" value="#000000">
-          <div class="input-group">
-            <input type="text" class="form-control" name="name" placeholder="Referral name" required autofocus>
-            <div class="input-group-append">
-              <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-fw fa-times"></i></button>
-              <button type="submit" name="add_category" class="btn btn-primary"><i class="fa fa-fw fa-check"></i></button> 
+    <div class="modal-dialog modal-sm">
+        <div class="modal-content bg-light">
+            <div class="modal-body">
+                <form action="post.php" method="post" autocomplete="off">
+                    <input type="hidden" name="type" value="Referral">
+                    <input type="hidden" name="color" value="#000000">
+                    <div class="input-group">
+                        <input type="text" class="form-control" name="name" placeholder="Referral name" required autofocus>
+                        <div class="input-group-append">
+                            <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-fw fa-times"></i></button>
+                            <button type="submit" name="add_category" class="btn btn-primary"><i class="fa fa-fw fa-check"></i></button>
+                        </div>
+                    </div>
+                </form>
             </div>
-          </div>
-        </form>
-      </div>
+        </div>
     </div>
-  </div>
 </div>
 
 <div class="modal" id="addQuickCalendarModal" tabindex="-1">
-  <div class="modal-dialog modal-sm">
-    <div class="modal-content bg-light">
-      <div class="modal-body">
-        <form action="post.php" method="post" autocomplete="off">
-          <input type="hidden" name="color" value="#000000">
-          <div class="input-group">
-            <input type="text" class="form-control" name="name" placeholder="Calendar name" required autofocus>
-            <div class="input-group-append">
-              <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-fw fa-times"></i></button>
-              <button type="submit" name="add_calendar" class="btn btn-primary"><i class="fa fa-fw fa-check"></i></button> 
+    <div class="modal-dialog modal-sm">
+        <div class="modal-content bg-light">
+            <div class="modal-body">
+                <form action="post.php" method="post" autocomplete="off">
+                    <input type="hidden" name="color" value="#000000">
+                    <div class="input-group">
+                        <input type="text" class="form-control" name="name" placeholder="Calendar name" required autofocus>
+                        <div class="input-group-append">
+                            <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-fw fa-times"></i></button>
+                            <button type="submit" name="add_calendar" class="btn btn-primary"><i class="fa fa-fw fa-check"></i></button>
+                        </div>
+                    </div>
+                </form>
             </div>
-          </div>
-        </form>
-      </div>
+        </div>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/check_login.php b/check_login.php
index ed30cb4d..da7ba6de 100644
--- a/check_login.php
+++ b/check_login.php
@@ -22,10 +22,8 @@ if (!isset($_SESSION['logged']) || !$_SESSION['logged']) {
     exit;
 }
 
-// SESSION FINGERPRINT
+// User IP & UA
 $session_ip = strip_tags(mysqli_real_escape_string($mysqli, getIP()));
-
-// User agent
 $session_user_agent = strip_tags(mysqli_real_escape_string($mysqli, $_SERVER['HTTP_USER_AGENT']));
 
 $session_user_id = $_SESSION['user_id'];
diff --git a/client_add_modal.php b/client_add_modal.php
index 3316f81f..c1db4453 100644
--- a/client_add_modal.php
+++ b/client_add_modal.php
@@ -1,317 +1,311 @@
 <div class="modal" id="addClientModal" 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-plus mr-2"></i>New Client</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">
-
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-location">Location</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-contact" id="contactNavPill">Contact</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-additional">Additional</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-tag">Tag</a>
-            </li>
-          </ul>
-
-          <hr>
-          
-          <div class="tab-content">
-
-            <div class="tab-pane fade show active" id="pills-details">
-
-              <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="Name or Company" required autofocus>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Industry</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-briefcase"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="type" placeholder="Company Type">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Referral</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-smile-wink"></i></span>
-                  </div>
-                  <select class="form-control select2" name="referral">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($referral_sql)) {
-                      $referral = htmlentities($row['category_name']);
-                    ?>
-                      <option><?php echo $referral; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                  <div class="input-group-append">
-                    <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickReferralModal"><i class="fas fa-fw fa-plus"></i></button>
-                  </div>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Website</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="website" placeholder="ex. google.com">
-                </div>
-              </div>
-
-
+    <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-plus mr-2"></i>New Client</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          
-            <div class="tab-pane fade" id="pills-location">
-  
-              <label>Location Phone</label>
-        
-              <div class="form-group">
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="location_phone" placeholder="Location's Phone Number"> 
-                </div>
-              </div>
-            
-              <div class="form-group">
-                <label>Address</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="address" placeholder="Street Address">
-                </div>
-              </div>
-          
-              <div class="form-group">
-                <label>City</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="city" placeholder="City">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>State / Province</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                  </div>
-                 <input type="text" class="form-control" name="state" placeholder="State or Province">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Zip / Postal Code</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code">
-                </div>
-              </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <div class="modal-body bg-white">
 
-              <div class="form-group">
-                <label>Country</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                  </div>
-                  <select class="form-control select2" name="country">
-                    <option value="">- Country -</option>
-                    <?php foreach($countries_array as $country_name) { ?>
-                    <option <?php if ($session_company_country == $country_name) { echo "selected"; } ?> ><?php echo $country_name; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-            
-            </div>
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-location">Location</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-contact" id="contactNavPill">Contact</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-additional">Additional</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-tag">Tag</a>
+                        </li>
+                    </ul>
 
-            <div class="tab-pane fade" id="pills-contact">
+                    <hr>
 
-              <div class="form-group">
-                <label>Primary Contact <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" id="primaryContact" name="contact" placeholder="Primary Contact Person" required autofocus>
-                </div>
-              </div>
+                    <div class="tab-content">
 
-              <div class="form-group">
-                <label>Title</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="title" placeholder="Title">
-                </div>
-              </div>
+                        <div class="tab-pane fade show active" id="pills-details">
+
+                            <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="Name or Company" required autofocus>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Industry</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-briefcase"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="type" placeholder="Company Type">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Referral</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-smile-wink"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="referral">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($referral_sql)) {
+                                            $referral = htmlentities($row['category_name']); ?>
+                                            <option><?php echo $referral; ?></option>
+                                        <?php } ?>
+
+                                    </select>
+                                    <div class="input-group-append">
+                                        <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickReferralModal"><i class="fas fa-fw fa-plus"></i></button>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Website</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="website" placeholder="ex. google.com">
+                                </div>
+                            </div>
+
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-location">
+
+                            <label>Location Phone</label>
+
+                            <div class="form-group">
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="location_phone" placeholder="Location's Phone Number">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Address</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="address" placeholder="Street Address">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>City</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="city" placeholder="City">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>State / Province</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="state" placeholder="State or Province">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Zip / Postal Code</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Country</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="country">
+                                        <option value="">- Country -</option>
+                                        <?php foreach($countries_array as $country_name) { ?>
+                                            <option <?php if ($session_company_country == $country_name) { echo "selected"; } ?> ><?php echo $country_name; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-contact">
+
+                            <div class="form-group">
+                                <label>Primary Contact <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" id="primaryContact" name="contact" placeholder="Primary Contact Person" required autofocus>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Title</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="title" placeholder="Title">
+                                </div>
+                            </div>
+
+                            <label>Contact Phone</label>
+                            <div class="form-row">
+                                <div class="col-8">
+                                    <div class="form-group">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                            </div>
+                                            <input type="text" class="form-control" name="contact_phone" placeholder="Contact's Phone Number">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-4">
+                                    <input type="text" class="form-control" name="contact_extension" placeholder="Extension">
+                                </div>
+                            </div>
+
+                            <label>Contact Mobile</label>
+
+                            <div class="form-group">
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="contact_mobile" placeholder="Contact's Mobile Number">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Contact Email</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="contact_email" placeholder="Contact's Email Address">
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-additional">
+
+                            <?php if ($config_module_enable_accounting) { ?>
+                                <div class="form-group">
+                                    <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">
+                                    <label>Payment Terms</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>
+                                        <select class="form-control select2" name="net_terms">
+                                            <?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
+                                                <option <?php if ($config_default_net_terms == $net_term_value) { echo "selected"; } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
+                                </div>
+
+                            <?php } else { ?>
+                                <input type="hidden" name="currency_code" value="<?php echo $session_company_currency; ?>">
+                                <input type="hidden" name="net_terms" value="0">
+                            <?php } ?>
+
+                            <div class="form-group">
+                                <label>Notes</label>
+                                <textarea class="form-control" rows="6" name="notes" placeholder="Enter some notes"></textarea>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-tag">
+
+                            <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");
+
+                                while ($row = mysqli_fetch_array($sql_tags_select)) {
+                                    $tag_id_select = $row['tag_id'];
+                                    $tag_name_select = htmlentities($row['tag_name']);
+                                    $tag_color_select = htmlentities($row['tag_color']);
+                                    $tag_icon_select = htmlentities($row['tag_icon']);
+
+                                    ?>
+                                    <li class="list-group-item">
+                                        <div class="custom-control custom-checkbox">
+                                            <input class="custom-control-input" type="checkbox" id="tagCheckbox<?php echo $tag_id_select; ?>" name="tags[]" value="<?php echo $tag_id_select; ?>">
+                                            <label for="tagCheckbox<?php echo $tag_id_select; ?>" class="custom-control-label">
+                                            <span class="badge bg-<?php echo $tag_color_select; ?>">
+                                                <?php echo "<i class='fa fw fa-$tag_icon_select'></i>"; ?> <?php echo $tag_name_select; ?>
+                                            </span>
+                                            </label>
+                                        </div>
+                                    </li>
+
+                                <?php } ?>
+
+                            </ul>
+
+                        </div>
 
-              <label>Contact Phone</label>
-              <div class="form-row">
-                <div class="col-8">
-                  <div class="form-group">
-                    <div class="input-group">
-                      <div class="input-group-prepend">
-                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                      </div>
-                      <input type="text" class="form-control" name="contact_phone" placeholder="Contact's Phone Number"> 
                     </div>
-                  </div>
                 </div>
-                <div class="col-4">
-                  <input type="text" class="form-control" name="contact_extension" placeholder="Extension">
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_client" class="btn btn-primary text-bold" onclick="promptPrimaryContact()"><i class="fa fa-check"></i> Create</button>
                 </div>
-              </div>
-
-              <label>Contact Mobile</label>
-          
-              <div class="form-group">
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="contact_mobile" placeholder="Contact's Mobile Number"> 
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Contact Email</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="contact_email" placeholder="Contact's Email Address">
-                </div>
-              </div>
-            
-            </div>
-
-            <div class="tab-pane fade" id="pills-additional">
-
-              <?php if ($config_module_enable_accounting) { ?>
-              <div class="form-group">
-                <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">
-                <label>Payment Terms</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>
-                  <select class="form-control select2" name="net_terms">
-                    <?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
-                    <option <?php if ($config_default_net_terms == $net_term_value) { echo "selected"; } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-              
-              <?php }else{ ?>
-              
-              <input type="hidden" name="currency_code" value="<?php echo $session_company_currency; ?>">
-              <input type="hidden" name="net_terms" value="0">
-              <?php } ?>
-
-              <div class="form-group">
-                <label>Notes</label>
-                <textarea class="form-control" rows="6" name="notes" placeholder="Enter some notes"></textarea>
-              </div>
-            
-            </div>
-
-            <div class="tab-pane fade" id="pills-tag">
-
-              <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");
-
-                while ($row = mysqli_fetch_array($sql_tags_select)) {
-                  $tag_id_select = $row['tag_id'];
-                  $tag_name_select = htmlentities($row['tag_name']);
-                  $tag_color_select = htmlentities($row['tag_color']);
-                  $tag_icon_select = htmlentities($row['tag_icon']);
-
-                ?>
-                  <li class="list-group-item">
-                    <div class="custom-control custom-checkbox">
-                      <input class="custom-control-input" type="checkbox" id="tagCheckbox<?php echo $tag_id_select; ?>" name="tags[]" value="<?php echo $tag_id_select; ?>">
-                      <label for="tagCheckbox<?php echo $tag_id_select; ?>" class="custom-control-label">
-                        <span class="badge bg-<?php echo $tag_color_select; ?>">
-                          <?php echo "<i class='fa fw fa-$tag_icon_select'></i>"; ?> <?php echo $tag_name_select; ?>    
-                        </span>
-                      </label>
-                    </div>
-                  </li>
-
-                <?php
-                }
-                ?>
-
-              </ul>
-
-            </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_client" class="btn btn-primary text-bold" onclick="promptPrimaryContact()"><i class="fa fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
 
 <script>
@@ -322,4 +316,4 @@
             document.getElementById("contactNavPill").click();
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/client_asset_add_modal.php b/client_asset_add_modal.php
index d7f35508..6ad4b808 100644
--- a/client_asset_add_modal.php
+++ b/client_asset_add_modal.php
@@ -1,328 +1,321 @@
 <div class="modal" id="addAssetModal" 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-desktop"></i> New <?php if (!empty($_GET['type'])) { echo ucwords(strip_tags($_GET['type'])); }else{ echo "Asset"; } ?></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="client_id" value="<?php echo $client_id; ?>">
-        
-        <div class="modal-body bg-white">
-          
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-assignment">Assignment</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-purchase">Purchase</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-login">Login</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
-            </li>
-          </ul>
-          
-          <hr>
-          
-          <div class="tab-content">
-            
-            <div class="tab-pane fade show active" id="pills-details">
-              
-              <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-tag"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="name" placeholder="Name the asset" required autofocus>
-                </div>
-              </div>
-    
-              <div class="form-group">
-                <label>Type <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-tags"></i></span>
-                  </div>
-                  <select class="form-control select2" name="type" required>
-                    <option value="">- Type -</option>
-                    <?php foreach($asset_types_array as $asset_type => $asset_icon) { ?>
-                    <option><?php echo $asset_type; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-              
-              <?php //Do not display Make Model or Serial if Virtual is selected 
-              if ($_GET['type'] !== 'virtual') { ?>
-              <div class="form-group">
-                <label>Make </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>
-                  <input type="text" class="form-control" name="make" placeholder="Manufacturer">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Model</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>
-                  <input type="text" class="form-control" name="model" placeholder="Model Number">
-                </div>
-              </div>              
-              
-              <div class="form-group">
-                <label>Serial Number</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="serial" placeholder="Serial number">
-                </div>
-              </div>
-              <?php } ?>
-
-              <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other') { ?>
-              <div class="form-group">
-                <label>Operating System</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fab fa-fw fa-windows"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="os" placeholder="ex Windows 10 Pro">
-                </div>
-              </div>
-              <?php } ?>
-
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-desktop"></i> New <?php if (!empty($_GET['type'])) { echo ucwords(strip_tags($_GET['type'])); }else{ echo "Asset"; } ?></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
 
-            <div class="tab-pane fade" id="pills-assignment">
-              
-              <div class="form-group">
-                <label>Location</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                  </div>
-                  <select class="form-control select2" name="location">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql)) {
-                      $location_id = $row['location_id'];
-                      $location_name = htmlentities($row['location_name']);
-                    ?>
-                    <option value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
+            <form action="post.php" method="post" autocomplete="off">
+
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+
+                <div class="modal-body bg-white">
+
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-assignment">Assignment</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-purchase">Purchase</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-login">Login</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
+                        </li>
+                    </ul>
+
+                    <hr>
+
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-details">
+
+                            <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-tag"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Name the asset" required autofocus>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Type <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-tags"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="type" required>
+                                        <option value="">- Type -</option>
+                                        <?php foreach($asset_types_array as $asset_type => $asset_icon) { ?>
+                                            <option><?php echo $asset_type; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <?php //Do not display Make Model or Serial if Virtual is selected
+                            if ($_GET['type'] !== 'virtual') { ?>
+                                <div class="form-group">
+                                    <label>Make </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>
+                                        <input type="text" class="form-control" name="make" placeholder="Manufacturer">
+                                    </div>
+                                </div>
+
+                                <div class="form-group">
+                                    <label>Model</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>
+                                        <input type="text" class="form-control" name="model" placeholder="Model Number">
+                                    </div>
+                                </div>
+
+                                <div class="form-group">
+                                    <label>Serial Number</label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
+                                        </div>
+                                        <input type="text" class="form-control" name="serial" placeholder="Serial number">
+                                    </div>
+                                </div>
+                            <?php } ?>
+
+                            <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other') { ?>
+                                <div class="form-group">
+                                    <label>Operating System</label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fab fa-fw fa-windows"></i></span>
+                                        </div>
+                                        <input type="text" class="form-control" name="os" placeholder="ex Windows 10 Pro">
+                                    </div>
+                                </div>
+                            <?php } ?>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-assignment">
+
+                            <div class="form-group">
+                                <label>Location</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="location">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($sql)) {
+                                            $location_id = $row['location_id'];
+                                            $location_name = htmlentities($row['location_name']);
+                                            ?>
+                                            <option value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
+                                        <?php } ?>
+
+                                    </select>
+                                </div>
+                            </div>
+
+                            <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'servers' && $_GET['type'] !== 'other') { ?>
+                                <div class="form-group">
+                                    <label>Assigned To</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>
+                                        <select class="form-control select2" name="contact">
+                                            <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");
+                                            while ($row = mysqli_fetch_array($sql)) {
+                                                $contact_id = $row['contact_id'];
+                                                $contact_name = htmlentities($row['contact_name']);
+                                                ?>
+                                                <option value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?></option>
+
+                                            <?php } ?>
+
+                                        </select>
+                                    </div>
+                                </div>
+                            <?php } ?>
+
+                            <div class="form-group">
+                                <label>Status</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="status">
+                                        <option value="">- Status -</option>
+                                        <?php foreach($asset_status_array as $asset_status) { ?>
+                                            <option><?php echo $asset_status; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Network</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="network">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($sql)) {
+                                            $network_id = $row['network_id'];
+                                            $network_name = htmlentities($row['network_name']);
+                                            $network = htmlentities($row['network']);
+
+                                            ?>
+                                            <option value="<?php echo $network_id; ?>"><?php echo $network_name; ?> - <?php echo $network; ?></option>
+
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>IP</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="ip" placeholder="IP Address" data-inputmask="'alias': 'ip'" data-mask>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>MAC Address</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" data-mask>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-purchase">
+
+                            <div class="form-group">
+                                <label>Vendor</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="vendor">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($sql)) {
+                                            $vendor_id = $row['vendor_id'];
+                                            $vendor_name = htmlentities($row['vendor_name']);
+                                            ?>
+                                            <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
+
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Install Date</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="install_date" max="2999-12-31">
+                                </div>
+                            </div>
+
+                            <?php if ($_GET['type'] !== 'virtual') { ?>
+                                <div class="form-group">
+                                    <label>Purchase Date</label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                                        </div>
+                                        <input type="date" class="form-control" name="purchase_date" max="2999-12-31">
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label>Warranty Expire</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="warranty_expire" max="2999-12-31">
+                                    </div>
+                                </div>
+                            <?php } ?>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-login">
+
+                            <div class="form-group">
+                                <label>Username</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="username" placeholder="Username">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>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="text" class="form-control" name="password" placeholder="Password" autocomplete="new-password">
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-notes">
+
+                            <div class="form-group">
+                                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
+                            </div>
+
+                        </div>
+
+                    </div>
                 </div>
-              </div>
-
-              <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'servers' && $_GET['type'] !== 'other') { ?>
-              <div class="form-group">
-                <label>Assigned To</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>
-                  <select class="form-control select2" name="contact">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql)) {
-                      $contact_id = $row['contact_id'];
-                      $contact_name = htmlentities($row['contact_name']);
-                    ?>
-                    <option value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_asset" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
                 </div>
-              </div>
-              <?php } ?>
-
-              <div class="form-group">
-                <label>Status</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
-                  </div>
-                  <select class="form-control select2" name="status">
-                    <option value="">- Status -</option>
-                    <?php foreach($asset_status_array as $asset_status) { ?>
-                    <option><?php echo $asset_status; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Network</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
-                  </div>
-                  <select class="form-control select2" name="network">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql)) {
-                      $network_id = $row['network_id'];
-                      $network_name = htmlentities($row['network_name']);
-                      $network = htmlentities($row['network']);
-
-                    ?>
-                    <option value="<?php echo $network_id; ?>"><?php echo $network_name; ?> - <?php echo $network; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>IP</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="ip" placeholder="IP Address" data-inputmask="'alias': 'ip'" data-mask>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>MAC Address</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" data-mask>
-                </div>
-              </div>
-            
-            </div>
-            
-            <div class="tab-pane fade" id="pills-purchase">
-              
-              <div class="form-group">
-                <label>Vendor</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="vendor">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql)) {
-                      $vendor_id = $row['vendor_id'];
-                      $vendor_name = htmlentities($row['vendor_name']);
-                    ?>
-                    <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Install Date</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="install_date" max="2999-12-31">
-                </div>
-              </div>
-
-              <?php if ($_GET['type'] !== 'virtual') { ?>
-              <div class="form-group">
-                <label>Purchase Date</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-                  </div>
-                  <input type="date" class="form-control" name="purchase_date" max="2999-12-31">
-                </div>
-              </div>
-              <div class="form-group">
-                <label>Warranty Expire</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="warranty_expire" max="2999-12-31">
-                </div>
-              </div>
-              <?php } ?>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-login">
-
-              <div class="form-group">
-                <label>Username</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="username" placeholder="Username">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>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="text" class="form-control" name="password" placeholder="Password" autocomplete="new-password">
-                </div>
-              </div>
-
-            </div>
-          
-            <div class="tab-pane fade" id="pills-notes">
-
-              <div class="form-group">
-                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
-              </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_asset" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/client_asset_copy_modal.php b/client_asset_copy_modal.php
index 76f4e491..df33a44d 100644
--- a/client_asset_copy_modal.php
+++ b/client_asset_copy_modal.php
@@ -1,326 +1,317 @@
-
 <div class="modal" id="copyAssetModal<?php echo $asset_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-<?php echo $device_icon; ?>"></i> Copying asset: <strong><?php echo $asset_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="client_id" value="<?php echo $client_id; ?>">
-        
-        <div class="modal-body bg-white">
-          
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pillsDetailsCopy<?php echo $asset_id; ?>">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pillsAssignmentCopy<?php echo $asset_id; ?>">Assignment</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pillsPurchaseCopy<?php echo $asset_id; ?>">Purchase</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pillsLoginCopy<?php echo $asset_id; ?>">Login</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pillsNotesCopy<?php echo $asset_id; ?>">Notes</a>
-            </li>
-          </ul>
-          
-          <hr>
-          
-          <div class="tab-content">
-
-            <div class="tab-pane fade show active" id="pillsDetailsCopy<?php echo $asset_id; ?>">
-          
-              <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-tag"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="name" placeholder="Name the asset" value="<?php echo $asset_name; ?>" required>
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Type <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-tags"></i></span>
-                  </div>
-                  <select class="form-control select2" name="type" required>
-                    <?php foreach($asset_types_array as $asset_type_select => $asset_icon_select) { ?>
-                    <option <?php if ($asset_type_select == $asset_type) { echo "selected"; } ?>><?php echo $asset_type_select; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>        
-              
-              <?php //Do not display Make Model or Serial if Virtual is selected 
-              if ($asset_type !== 'virtual') { ?>
-              <div class="form-group">
-                <label>Make </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>
-                  <input type="text" class="form-control" name="make" placeholder="Manufacturer" value="<?php echo $asset_make; ?>">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Model</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>
-                  <input type="text" class="form-control" name="model" placeholder="Model Number" value="<?php echo $asset_model; ?>">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Serial Number</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="serial" placeholder="Serial number">
-                </div>
-              </div>
-              <?php } ?>
-
-              <?php if ($asset_type !== 'Phone' && $asset_type !== 'Mobile Phone' && $asset_type !== 'Tablet' && $asset_type !== 'Access Point' && $asset_type !== 'Printer' && $asset_type !== 'Camera' && $asset_type !== 'TV' && $asset_type !== 'Other') { ?>
-              <div class="form-group">
-                <label>Operating System</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fab fa-fw fa-windows"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="os" placeholder="ex Windows 10 Pro" value="<?php echo $asset_os; ?>">
-                </div>
-              </div>
-              <?php } ?>
-            
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-<?php echo $device_icon; ?>"></i> Copying asset: <strong><?php echo $asset_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="client_id" value="<?php echo $client_id; ?>">
 
-            <div class="tab-pane fade" id="pillsAssignmentCopy<?php echo $asset_id; ?>">
+                <div class="modal-body bg-white">
 
-              <div class="form-group">
-                <label>Location</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                  </div>
-                  <select class="form-control select2" name="location">
-                    <option value="">- Location -</option>
-                    <?php 
-                    
-                    $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']);
-                    ?>
-                    <option <?php if ($asset_location_id == $location_id_select) { echo "selected"; } ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pillsDetailsCopy<?php echo $asset_id; ?>">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pillsAssignmentCopy<?php echo $asset_id; ?>">Assignment</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pillsPurchaseCopy<?php echo $asset_id; ?>">Purchase</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pillsLoginCopy<?php echo $asset_id; ?>">Login</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pillsNotesCopy<?php echo $asset_id; ?>">Notes</a>
+                        </li>
+                    </ul>
+
+                    <hr>
+
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pillsDetailsCopy<?php echo $asset_id; ?>">
+
+                            <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-tag"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Name the asset" value="<?php echo $asset_name; ?>" required>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Type <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-tags"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="type" required>
+                                        <?php foreach($asset_types_array as $asset_type_select => $asset_icon_select) { ?>
+                                            <option <?php if ($asset_type_select == $asset_type) { echo "selected"; } ?>><?php echo $asset_type_select; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <?php //Do not display Make Model or Serial if Virtual is selected
+                            if ($asset_type !== 'virtual') { ?>
+                                <div class="form-group">
+                                    <label>Make </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>
+                                        <input type="text" class="form-control" name="make" placeholder="Manufacturer" value="<?php echo $asset_make; ?>">
+                                    </div>
+                                </div>
+
+                                <div class="form-group">
+                                    <label>Model</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>
+                                        <input type="text" class="form-control" name="model" placeholder="Model Number" value="<?php echo $asset_model; ?>">
+                                    </div>
+                                </div>
+
+                                <div class="form-group">
+                                    <label>Serial Number</label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
+                                        </div>
+                                        <input type="text" class="form-control" name="serial" placeholder="Serial number">
+                                    </div>
+                                </div>
+                            <?php } ?>
+
+                            <?php if ($asset_type !== 'Phone' && $asset_type !== 'Mobile Phone' && $asset_type !== 'Tablet' && $asset_type !== 'Access Point' && $asset_type !== 'Printer' && $asset_type !== 'Camera' && $asset_type !== 'TV' && $asset_type !== 'Other') { ?>
+                                <div class="form-group">
+                                    <label>Operating System</label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fab fa-fw fa-windows"></i></span>
+                                        </div>
+                                        <input type="text" class="form-control" name="os" placeholder="ex Windows 10 Pro" value="<?php echo $asset_os; ?>">
+                                    </div>
+                                </div>
+                            <?php } ?>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pillsAssignmentCopy<?php echo $asset_id; ?>">
+
+                            <div class="form-group">
+                                <label>Location</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="location">
+                                        <option value="">- Location -</option>
+                                        <?php
+
+                                        $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']);
+                                            ?>
+                                            <option <?php if ($asset_location_id == $location_id_select) { echo "selected"; } ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name_select; ?></option>
+                                        <?php } ?>
+
+                                    </select>
+                                </div>
+                            </div>
+
+                            <?php if ($asset_type !== 'Firewall/Router' && $asset_type !== 'Switch' && $asset_type !== 'Access Point' && $asset_type !== 'Printer' && $asset_type !== 'Server' && $asset_type !== 'Virtual Machine') { ?>
+                                <div class="form-group">
+                                    <label>Assigned To</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>
+                                        <select class="form-control select2" name="contact">
+                                            <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");
+                                            while ($row = mysqli_fetch_array($sql_contacts)) {
+                                                $contact_id = $row['contact_id'];
+                                                $contact_name = htmlentities($row['contact_name']);
+                                                ?>
+                                                <option value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?></option>
+                                            <?php } ?>
+
+                                        </select>
+                                    </div>
+                                </div>
+                            <?php } ?>
+
+                            <div class="form-group">
+                                <label>Status</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="status">
+                                        <?php foreach($asset_status_array as $asset_status_select) { ?>
+                                            <option <?php if ($asset_status_select == $asset_status) { echo "selected"; } ?>><?php echo $asset_status_select; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Network</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="network">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($sql_networks)) {
+                                            $network_id_select = $row['network_id'];
+                                            $network_name_select = htmlentities($row['network_name']);
+                                            $network_select = htmlentities($row['network']);
+
+                                            ?>
+                                            <option <?php if ($asset_network_id == $network_id_select) { echo "selected"; } ?> value="<?php echo $network_id_select; ?>"><?php echo $network_name_select; ?> - <?php echo $network_select; ?></option>
+
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>IP</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="ip" placeholder="IP Address" data-inputmask="'alias': 'ip'" data-mask>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>MAC Address</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" data-mask>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pillsPurchaseCopy<?php echo $asset_id; ?>">
+
+                            <div class="form-group">
+                                <label>Vendor</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="vendor">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($sql_vendors)) {
+                                            $vendor_id_select = $row['vendor_id'];
+                                            $vendor_name_select = htmlentities($row['vendor_name']);
+                                            ?>
+                                            <option <?php if ($asset_vendor_id == $vendor_id_select) { echo "selected"; } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
+
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Install Date</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="install_date" max="2999-12-31" value="<?php echo $asset_install_date; ?>">
+                                </div>
+                            </div>
+
+                            <?php if ($asset_type !== 'Virtual Machine') { ?>
+                                <div class="form-group">
+                                    <label>Purchase Date</label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                                        </div>
+                                        <input type="date" class="form-control" name="purchase_date" max="2999-12-31" value="<?php echo $asset_purchase_date; ?>">
+                                    </div>
+                                </div>
+
+                                <div class="form-group">
+                                    <label>Warranty Expire</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="warranty_expire" max="2999-12-31" value="<?php echo $asset_warranty_expire; ?>">
+                                    </div>
+                                </div>
+                            <?php } ?>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pillsLoginCopy<?php echo $asset_id; ?>">
+
+                            <div class="form-group">
+                                <label>Username</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="username" placeholder="Username">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>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="text" class="form-control" name="password" placeholder="Password" autocomplete="new-password">
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pillsNotesCopy<?php echo $asset_id; ?>">
+
+                            <div class="form-group">
+                                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $asset_notes; ?></textarea>
+                            </div>
+
+                        </div>
+
+                    </div>
                 </div>
-              </div>
-
-              <?php if ($asset_type !== 'Firewall/Router' && $asset_type !== 'Switch' && $asset_type !== 'Access Point' && $asset_type !== 'Printer' && $asset_type !== 'Server' && $asset_type !== 'Virtual Machine') { ?>
-              <div class="form-group">
-                <label>Assigned To</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>
-                  <select class="form-control select2" name="contact">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql_contacts)) {
-                      $contact_id = $row['contact_id'];
-                      $contact_name = htmlentities($row['contact_name']);
-                    ?>
-                    <option value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_asset" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Copy</button>
                 </div>
-              </div>
-              <?php } ?>
-
-              <div class="form-group">
-                <label>Status</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
-                  </div>
-                  <select class="form-control select2" name="status">
-                    <?php foreach($asset_status_array as $asset_status_select) { ?>
-                    <option <?php if ($asset_status_select == $asset_status) { echo "selected"; } ?>><?php echo $asset_status_select; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Network</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
-                  </div>
-                  <select class="form-control select2" name="network">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql_networks)) {
-                      $network_id_select = $row['network_id'];
-                      $network_name_select = htmlentities($row['network_name']);
-                      $network_select = htmlentities($row['network']);
-
-                    ?>
-                    <option <?php if ($asset_network_id == $network_id_select) { echo "selected"; } ?> value="<?php echo $network_id_select; ?>"><?php echo $network_name_select; ?> - <?php echo $network_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>IP</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="ip" placeholder="IP Address" data-inputmask="'alias': 'ip'" data-mask>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>MAC Address</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" data-mask>
-                </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pillsPurchaseCopy<?php echo $asset_id; ?>">
-
-              <div class="form-group">
-                <label>Vendor</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="vendor">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql_vendors)) {
-                      $vendor_id_select = $row['vendor_id'];
-                      $vendor_name_select = htmlentities($row['vendor_name']);
-                    ?>
-                    <option <?php if ($asset_vendor_id == $vendor_id_select) { echo "selected"; } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Install Date</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="install_date" max="2999-12-31" value="<?php echo $asset_install_date; ?>">
-                </div>
-              </div>
-
-              <?php if ($asset_type !== 'Virtual Machine') { ?>
-              <div class="form-group">
-                <label>Purchase Date</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-                  </div>
-                  <input type="date" class="form-control" name="purchase_date" max="2999-12-31" value="<?php echo $asset_purchase_date; ?>">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Warranty Expire</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="warranty_expire" max="2999-12-31" value="<?php echo $asset_warranty_expire; ?>">
-                </div>
-              </div>
-              <?php } ?>
-            
-            </div>
-
-            <div class="tab-pane fade" id="pillsLoginCopy<?php echo $asset_id; ?>">
-              
-              <div class="form-group">
-                <label>Username</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="username" placeholder="Username">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>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="text" class="form-control" name="password" placeholder="Password" autocomplete="new-password">
-                </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pillsNotesCopy<?php echo $asset_id; ?>">
-
-              <div class="form-group">
-                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $asset_notes; ?></textarea>
-              </div>
-
-            </div>
-
-          </div>
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_asset" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Copy</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/client_asset_documents_modal.php b/client_asset_documents_modal.php
index 17c0f672..6abe904b 100644
--- a/client_asset_documents_modal.php
+++ b/client_asset_documents_modal.php
@@ -1,31 +1,29 @@
 <div class="modal" id="assetDocumentsModal<?php echo $asset_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="fa fa-fw fa-<?php echo $device_icon; ?>"></i> <?php echo $asset_name; ?> Documents</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-        
-      <div class="modal-body bg-white">
-        <?php
-        while ($row = mysqli_fetch_array($sql_related_documents)) {
-          $related_document_id = $row['document_id'];
-          $related_document_name = htmlentities($row['document_name']);
-        ?>
-          <p>
-            <i class="fas fa-fw fa-document text-secondary"></i>
-            <?php echo $related_document_name; ?> <a href="client_documents.php?q=<?php echo $related_document_name; ?>"><?php echo $related_document_name; ?></a>
-          </p>
-        <?php 
-        }
-        ?>
-      </div>
-      <div class="modal-footer bg-white">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-      </div>
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-<?php echo $device_icon; ?>"></i> <?php echo $asset_name; ?> Documents</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
 
+            <div class="modal-body bg-white">
+                <?php
+                while ($row = mysqli_fetch_array($sql_related_documents)) {
+                    $related_document_id = $row['document_id'];
+                    $related_document_name = htmlentities($row['document_name']);
+                    ?>
+                    <p>
+                        <i class="fas fa-fw fa-document text-secondary"></i>
+                        <?php echo $related_document_name; ?> <a href="client_documents.php?q=<?php echo $related_document_name; ?>"><?php echo $related_document_name; ?></a>
+                    </p>
+                <?php } ?>
+            </div>
+            <div class="modal-footer bg-white">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+            </div>
+
+        </div>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/client_asset_edit_modal.php b/client_asset_edit_modal.php
index 2c5e8bf2..a2bc1180 100644
--- a/client_asset_edit_modal.php
+++ b/client_asset_edit_modal.php
@@ -1,327 +1,319 @@
 <div class="modal" id="editAssetModal<?php echo $asset_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-<?php echo $device_icon; ?>"></i> Editing asset: <strong><?php echo $asset_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="asset_id" value="<?php echo $asset_id; ?>">
-        <input type="hidden" name="login_id" value="<?php echo $login_id; ?>">
-        <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        
-        <div class="modal-body bg-white">
-          
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $asset_id; ?>">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-assignment<?php echo $asset_id; ?>">Assignment</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-purchase<?php echo $asset_id; ?>">Purchase</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-login<?php echo $asset_id; ?>">Login</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $asset_id; ?>">Notes</a>
-            </li>
-          </ul>
-          
-          <hr>
-          
-          <div class="tab-content">
-
-            <div class="tab-pane fade show active" id="pills-details<?php echo $asset_id; ?>">
-          
-              <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-tag"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="name" placeholder="Name the asset" value="<?php echo $asset_name; ?>" required>
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Type <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-tags"></i></span>
-                  </div>
-                  <select class="form-control select2" name="type" required>
-                    <?php foreach($asset_types_array as $asset_type_select => $asset_icon_select) { ?>
-                    <option <?php if ($asset_type_select == $asset_type) { echo "selected"; } ?>><?php echo $asset_type_select; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>        
-              
-              <?php //Do not display Make Model or Serial if Virtual is selected 
-              if ($asset_type !== 'virtual') { ?>
-              <div class="form-group">
-                <label>Make </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>
-                  <input type="text" class="form-control" name="make" placeholder="Manufacturer" value="<?php echo $asset_make; ?>">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Model</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>
-                  <input type="text" class="form-control" name="model" placeholder="Model Number" value="<?php echo $asset_model; ?>">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Serial Number</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="serial" placeholder="Serial number" value="<?php echo $asset_serial; ?>">
-                </div>
-              </div>
-              <?php } ?>
-
-              <?php if ($asset_type !== 'Phone' && $asset_type !== 'Mobile Phone' && $asset_type !== 'Tablet' && $asset_type !== 'Access Point' && $asset_type !== 'Printer' && $asset_type !== 'Camera' && $asset_type !== 'TV' && $asset_type !== 'Other') { ?>
-              <div class="form-group">
-                <label>Operating System</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fab fa-fw fa-windows"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="os" placeholder="ex Windows 10 Pro" value="<?php echo $asset_os; ?>">
-                </div>
-              </div>
-              <?php } ?>
-            
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-<?php echo $device_icon; ?>"></i> Editing asset: <strong><?php echo $asset_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="asset_id" value="<?php echo $asset_id; ?>">
+                <input type="hidden" name="login_id" value="<?php echo $login_id; ?>">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 
-            <div class="tab-pane fade" id="pills-assignment<?php echo $asset_id; ?>">
+                <div class="modal-body bg-white">
 
-              <div class="form-group">
-                <label>Location</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                  </div>
-                  <select class="form-control select2" name="location">
-                    <option value="">- Location -</option>
-                    <?php 
-                    
-                    $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']);
-                    ?>
-                    <option <?php if ($asset_location_id == $location_id_select) { echo "selected"; } ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $asset_id; ?>">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-assignment<?php echo $asset_id; ?>">Assignment</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-purchase<?php echo $asset_id; ?>">Purchase</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-login<?php echo $asset_id; ?>">Login</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $asset_id; ?>">Notes</a>
+                        </li>
+                    </ul>
+
+                    <hr>
+
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-details<?php echo $asset_id; ?>">
+
+                            <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-tag"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Name the asset" value="<?php echo $asset_name; ?>" required>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Type <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-tags"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="type" required>
+                                        <?php foreach($asset_types_array as $asset_type_select => $asset_icon_select) { ?>
+                                            <option <?php if ($asset_type_select == $asset_type) { echo "selected"; } ?>><?php echo $asset_type_select; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <?php //Do not display Make Model or Serial if Virtual is selected
+                            if ($asset_type !== 'virtual') { ?>
+                                <div class="form-group">
+                                    <label>Make </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>
+                                        <input type="text" class="form-control" name="make" placeholder="Manufacturer" value="<?php echo $asset_make; ?>">
+                                    </div>
+                                </div>
+
+                                <div class="form-group">
+                                    <label>Model</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>
+                                        <input type="text" class="form-control" name="model" placeholder="Model Number" value="<?php echo $asset_model; ?>">
+                                    </div>
+                                </div>
+
+                                <div class="form-group">
+                                    <label>Serial Number</label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
+                                        </div>
+                                        <input type="text" class="form-control" name="serial" placeholder="Serial number" value="<?php echo $asset_serial; ?>">
+                                    </div>
+                                </div>
+                            <?php } ?>
+
+                            <?php if ($asset_type !== 'Phone' && $asset_type !== 'Mobile Phone' && $asset_type !== 'Tablet' && $asset_type !== 'Access Point' && $asset_type !== 'Printer' && $asset_type !== 'Camera' && $asset_type !== 'TV' && $asset_type !== 'Other') { ?>
+                                <div class="form-group">
+                                    <label>Operating System</label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fab fa-fw fa-windows"></i></span>
+                                        </div>
+                                        <input type="text" class="form-control" name="os" placeholder="ex Windows 10 Pro" value="<?php echo $asset_os; ?>">
+                                    </div>
+                                </div>
+                            <?php } ?>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-assignment<?php echo $asset_id; ?>">
+
+                            <div class="form-group">
+                                <label>Location</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="location">
+                                        <option value="">- Location -</option>
+                                        <?php
+
+                                        $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']);
+                                            ?>
+                                            <option <?php if ($asset_location_id == $location_id_select) { echo "selected"; } ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name_select; ?></option>
+
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Assigned To</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>
+                                    <select class="form-control select2" name="contact">
+                                        <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");
+                                        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'])) .")"; } ?>
+                                            </option>
+
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Status</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="status">
+                                        <?php foreach($asset_status_array as $asset_status_select) { ?>
+                                            <option <?php if ($asset_status_select == $asset_status) { echo "selected"; } ?>><?php echo $asset_status_select; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Network</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="network">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($sql_networks)) {
+                                            $network_id_select = $row['network_id'];
+                                            $network_name_select = htmlentities($row['network_name']);
+                                            $network_select = htmlentities($row['network']);
+
+                                            ?>
+                                            <option <?php if ($asset_network_id == $network_id_select) { echo "selected"; } ?> value="<?php echo $network_id_select; ?>"><?php echo $network_name_select; ?> - <?php echo $network_select; ?></option>
+
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>IP</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="ip" value="<?php echo $asset_ip; ?>" placeholder="IP Address" data-inputmask="'alias': 'ip'" data-mask>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>MAC Address</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="mac" value="<?php echo $asset_mac; ?>" placeholder="MAC Address" data-inputmask="'alias': 'mac'" data-mask>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-purchase<?php echo $asset_id; ?>">
+
+                            <div class="form-group">
+                                <label>Vendor</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="vendor">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($sql_vendors)) {
+                                            $vendor_id_select = $row['vendor_id'];
+                                            $vendor_name_select = htmlentities($row['vendor_name']);
+                                            ?>
+                                            <option <?php if ($asset_vendor_id == $vendor_id_select) { echo "selected"; } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
+
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Install Date</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="install_date" max="2999-12-31" value="<?php echo $asset_install_date; ?>">
+                                </div>
+                            </div>
+
+                            <?php if ($asset_type !== 'Virtual Machine') { ?>
+                                <div class="form-group">
+                                    <label>Purchase Date</label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                                        </div>
+                                        <input type="date" class="form-control" name="purchase_date" max="2999-12-31" value="<?php echo $asset_purchase_date; ?>">
+                                    </div>
+                                </div>
+
+                                <div class="form-group">
+                                    <label>Warranty Expire</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="warranty_expire" max="2999-12-31" value="<?php echo $asset_warranty_expire; ?>">
+                                    </div>
+                                </div>
+                            <?php } ?>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-login<?php echo $asset_id; ?>">
+
+                            <div class="form-group">
+                                <label>Username</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="username" placeholder="Username" value="<?php echo $login_username; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>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="text" class="form-control" name="password" placeholder="Password" value="<?php echo $login_password; ?>" autocomplete="new-password">
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-notes<?php echo $asset_id; ?>">
+
+                            <div class="form-group">
+                                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $asset_notes; ?></textarea>
+                            </div>
+
+                        </div>
+
+                    </div>
                 </div>
-              </div>
-
-              <div class="form-group">
-                <label>Assigned To</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>
-                  <select class="form-control select2" name="contact">
-                    <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"); 
-                    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'])) .")"; } ?>
-                    </option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="edit_asset" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
                 </div>
-              </div>
-
-              <div class="form-group">
-                <label>Status</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
-                  </div>
-                  <select class="form-control select2" name="status">
-                    <?php foreach($asset_status_array as $asset_status_select) { ?>
-                    <option <?php if ($asset_status_select == $asset_status) { echo "selected"; } ?>><?php echo $asset_status_select; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Network</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
-                  </div>
-                  <select class="form-control select2" name="network">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql_networks)) {
-                      $network_id_select = $row['network_id'];
-                      $network_name_select = htmlentities($row['network_name']);
-                      $network_select = htmlentities($row['network']);
-
-                    ?>
-                    <option <?php if ($asset_network_id == $network_id_select) { echo "selected"; } ?> value="<?php echo $network_id_select; ?>"><?php echo $network_name_select; ?> - <?php echo $network_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>IP</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="ip" value="<?php echo $asset_ip; ?>" placeholder="IP Address" data-inputmask="'alias': 'ip'" data-mask>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>MAC Address</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="mac" value="<?php echo $asset_mac; ?>" placeholder="MAC Address" data-inputmask="'alias': 'mac'" data-mask>
-                </div>
-              </div>
-            
-            </div>
-
-            <div class="tab-pane fade" id="pills-purchase<?php echo $asset_id; ?>">
-
-              <div class="form-group">
-                <label>Vendor</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="vendor">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql_vendors)) {
-                      $vendor_id_select = $row['vendor_id'];
-                      $vendor_name_select = htmlentities($row['vendor_name']);
-                    ?>
-                    <option <?php if ($asset_vendor_id == $vendor_id_select) { echo "selected"; } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Install Date</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="install_date" max="2999-12-31" value="<?php echo $asset_install_date; ?>">
-                </div>
-              </div>
-
-              <?php if ($asset_type !== 'Virtual Machine') { ?>
-              <div class="form-group">
-                <label>Purchase Date</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-                  </div>
-                  <input type="date" class="form-control" name="purchase_date" max="2999-12-31" value="<?php echo $asset_purchase_date; ?>">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Warranty Expire</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="warranty_expire" max="2999-12-31" value="<?php echo $asset_warranty_expire; ?>">
-                </div>
-              </div>
-              <?php } ?>
-            
-            </div>
-
-            <div class="tab-pane fade" id="pills-login<?php echo $asset_id; ?>">
-              
-              <div class="form-group">
-                <label>Username</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="username" placeholder="Username" value="<?php echo $login_username; ?>">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>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="text" class="form-control" name="password" placeholder="Password" value="<?php echo $login_password; ?>" autocomplete="new-password">
-                </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-notes<?php echo $asset_id; ?>">
-
-              <div class="form-group">
-                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $asset_notes; ?></textarea>
-              </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_asset" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/client_asset_import_modal.php b/client_asset_import_modal.php
index a155259e..81ce6148 100644
--- a/client_asset_import_modal.php
+++ b/client_asset_import_modal.php
@@ -1,27 +1,27 @@
 <div class="modal" id="importAssetModal" 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-desktop"></i> Import Assets</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="client_id" value="<?php echo $client_id; ?>">
-				<div class="modal-body bg-white">
-					<p><strong>Format csv file with headings & data:</strong><br>Name, Type, Make, Model, Serial, OS, Assigned To, Location</p>
-					<hr>
-					<div class="form-group my-4">
-						<input type="file" class="form-control-file" name="file" accept=".csv">
-					</div>
-					<hr>
-					<div>Download <a href="post.php?download_client_assets_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
-				</div>
-				<div class="modal-footer bg-white">
-					<button type="submit" name="import_client_assets_csv" class="btn btn-primary">Import</button>
-				</div>
-			</form>
-		</div>
-	</div>
-</div>
\ No newline at end of file
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-desktop"></i> Import Assets</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="client_id" value="<?php echo $client_id; ?>">
+                <div class="modal-body bg-white">
+                    <p><strong>Format csv file with headings & data:</strong><br>Name, Type, Make, Model, Serial, OS, Assigned To, Location</p>
+                    <hr>
+                    <div class="form-group my-4">
+                        <input type="file" class="form-control-file" name="file" accept=".csv">
+                    </div>
+                    <hr>
+                    <div>Download <a href="post.php?download_client_assets_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="import_client_assets_csv" class="btn btn-primary">Import</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/client_asset_interface_add_modal.php b/client_asset_interface_add_modal.php
index eadbfbc6..48873d5b 100644
--- a/client_asset_interface_add_modal.php
+++ b/client_asset_interface_add_modal.php
@@ -1,125 +1,122 @@
 <div class="modal" id="addAssetInterfaceModal<?php echo $asset_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-ethernet"></i> <i class="fa fa-fw fa-<?php echo $device_icon; ?>"></i> <?php echo $asset_name; ?></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="client_id" value="<?php echo $client_id; ?>">
-        <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
-        
-        <div class="modal-body bg-white">
-          
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-interfaces<?php echo $asset_id; ?>">Interfaces</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-create<?php echo $asset_id; ?>">Create</a>
-            </li>
-          </ul>
-          
-          <hr>
-          
-          <div class="tab-content">
-
-            <div class="tab-pane fade" id="pills-interfaces<?php echo $asset_id; ?>">
-            
-
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-ethernet"></i> <i class="fa fa-fw fa-<?php echo $device_icon; ?>"></i> <?php echo $asset_name; ?></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-            
-            <div class="tab-pane fade" id="pills-create<?php echo $asset_id; ?>">
 
-              <div class="form-group">
-                <label>Interface Number</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="interface_number" placeholder="Port number">
+            <form action="post.php" method="post" autocomplete="off">
+
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
+
+                <div class="modal-body bg-white">
+
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-interfaces<?php echo $asset_id; ?>">Interfaces</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-create<?php echo $asset_id; ?>">Create</a>
+                        </li>
+                    </ul>
+
+                    <hr>
+
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade" id="pills-interfaces<?php echo $asset_id; ?>">
+
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-create<?php echo $asset_id; ?>">
+
+                            <div class="form-group">
+                                <label>Interface Number</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="interface_number" placeholder="Port number">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Description</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>
+                                    <input type="text" class="form-control" name="interface_description" placeholder="Description">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Connected Asset</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="interface_connected_asset" placeholder="Connected Device">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Network</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="interface_network">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($sql_network_select)) {
+                                            $network_id = $row['network_id'];
+                                            $network_name = htmlentities($row['network_name']);
+                                            $network = htmlentities($row['network']);
+
+                                            ?>
+                                            <option value="<?php echo $network_id; ?>"><?php echo $network_name; ?> - <?php echo $network; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>IP</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="interface_ip" placeholder="IP Address" data-inputmask="'alias': 'ip'" data-mask>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>MAC Address</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="interface_mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" data-mask>
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </div>
                 </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Description</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>
-                  <input type="text" class="form-control" name="interface_description" placeholder="Description">
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_asset_interface" class="btn btn-primary"><i class="fa fa-check"></i> Create</button>
                 </div>
-              </div>
-
-              <div class="form-group">
-                <label>Connected Asset</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="interface_connected_asset" placeholder="Connected Device">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Network</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
-                  </div>
-                  <select class="form-control select2" name="interface_network">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql_network_select)) {
-                      $network_id = $row['network_id'];
-                      $network_name = htmlentities($row['network_name']);
-                      $network = htmlentities($row['network']);
-
-                    ?>
-                    <option value="<?php echo $network_id; ?>"><?php echo $network_name; ?> - <?php echo $network; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>IP</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="interface_ip" placeholder="IP Address" data-inputmask="'alias': 'ip'" data-mask>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>MAC Address</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="interface_mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" data-mask>
-                </div>
-              </div>
-
-            </div>
-              
-          </div>
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_asset_interface" class="btn btn-primary"><i class="fa fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/client_asset_tickets_modal.php b/client_asset_tickets_modal.php
index b5a75cf4..05ccf2b3 100644
--- a/client_asset_tickets_modal.php
+++ b/client_asset_tickets_modal.php
@@ -1,37 +1,35 @@
 <div class="modal" id="assetTicketsModal<?php echo $asset_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="fa fa-fw fa-<?php echo $device_icon; ?>"></i> <?php echo $asset_name; ?></h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-        
-      <div class="modal-body bg-white">
-        <?php
-        // Query is run from client_assets.php
-        while ($row = mysqli_fetch_array($sql_tickets)) {
-          $ticket_id = $row['ticket_id'];
-          $ticket_prefix = htmlentities($row['ticket_prefix']);
-          $ticket_number = htmlentities($row['ticket_number']);
-          $ticket_subject = htmlentities($row['ticket_subject']);
-          $ticket_status = htmlentities($row['ticket_status']);
-          $ticket_created_at = $row['ticket_created_at'];
-          $ticket_updated_at = $row['ticket_updated_at'];
-          ?>
-        <p>
-          <i class="fas fa-fw fa-ticket-alt"></i>
-          Ticket: <a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo "$ticket_prefix$ticket_number" ?></a> on <?php echo $ticket_created_at; ?> <?php echo $ticket_subject; ?>
-        </p>
-        <?php 
-        }
-        ?>
-      </div>
-      <div class="modal-footer bg-white">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-      </div>
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-<?php echo $device_icon; ?>"></i> <?php echo $asset_name; ?></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
 
+            <div class="modal-body bg-white">
+                <?php
+                // Query is run from client_assets.php
+                while ($row = mysqli_fetch_array($sql_tickets)) {
+                    $ticket_id = $row['ticket_id'];
+                    $ticket_prefix = htmlentities($row['ticket_prefix']);
+                    $ticket_number = htmlentities($row['ticket_number']);
+                    $ticket_subject = htmlentities($row['ticket_subject']);
+                    $ticket_status = htmlentities($row['ticket_status']);
+                    $ticket_created_at = $row['ticket_created_at'];
+                    $ticket_updated_at = $row['ticket_updated_at'];
+                    ?>
+                    <p>
+                        <i class="fas fa-fw fa-ticket-alt"></i>
+                        Ticket: <a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo "$ticket_prefix$ticket_number" ?></a> on <?php echo $ticket_created_at; ?> <?php echo $ticket_subject; ?>
+                    </p>
+                <?php } ?>
+            </div>
+            <div class="modal-footer bg-white">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+            </div>
+
+        </div>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/client_assets.php b/client_assets.php
index 91977480..5fed8ed1 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -97,23 +97,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             if ($workstation_count > 0) { ?>
                                 <a href="?<?php echo $url_query_strings_sb; ?>&type=workstation" class="btn <?php if ($_GET['type'] == 'workstation') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-desktop"></i> Workstations <span class="right badge badge-light"><?php echo $workstation_count; ?></span></a>
                                 <?php
-                            } ?>
-                            <?php
+                            }
                             if ($server_count > 0) { ?>
                                 <a href="?<?php echo $url_query_strings_sb; ?>&type=server" class="btn <?php if ($_GET['type'] == 'server') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-server"></i> Servers <span class="right badge badge-light"><?php echo $server_count; ?></span></a>
                                 <?php
-                            } ?>
-                            <?php
+                            }
                             if ($virtual_count > 0) { ?>
                                 <a href="?<?php echo $url_query_strings_sb; ?>&type=virtual" class="btn <?php if ($_GET['type'] == 'virtual') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-cloud"></i> Virtual <span class="right badge badge-light"><?php echo $virtual_count; ?></span></a>
                                 <?php
-                            } ?>
-                            <?php
+                            }
                             if ($network_count > 0) { ?>
                                 <a href="?<?php echo $url_query_strings_sb; ?>&type=network" class="btn <?php if ($_GET['type'] == 'network') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-network-wired"></i> Network <span class="right badge badge-light"><?php echo $network_count; ?></span></a>
                                 <?php
-                            } ?>
-                            <?php
+                            }
                             if ($network_count > 0) { ?>
                                 <a href="?<?php echo $url_query_strings_sb; ?>&type=other" class="btn <?php if ($_GET['type'] == 'other') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-tag"></i> Other <span class="right badge badge-light"><?php echo $other_count; ?></span></a>
                                 <?php
@@ -138,14 +134,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=asset_name&o=<?php echo $disp; ?>">Name</a></th>
                         <?php if ($_GET['type'] !== 'virtual' && $_GET['type'] !== 'servers') { ?>
                             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=asset_type&o=<?php echo $disp; ?>">Type</a></th>
-                        <?php } ?>
-                        <?php if ($_GET['type'] !== 'virtual') { ?>
+                        <?php }
+                        if ($_GET['type'] !== 'virtual') { ?>
                             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=asset_make&o=<?php echo $disp; ?>">Make/Model</a></th>
-                        <?php } ?>
-                        <?php if ($_GET['type'] !== 'virtual') { ?>
+                        <?php }
+                        if ($_GET['type'] !== 'virtual') { ?>
                             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=asset_serial&o=<?php echo $disp; ?>">Serial Number</a></th>
-                        <?php } ?>
-                        <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other') { ?>
+                        <?php }
+                        if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other') { ?>
                             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=asset_os&o=<?php echo $disp; ?>">Operating System</a></th>
                         <?php } ?>
                         <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=asset_install_date&o=<?php echo $disp; ?>">Install Date</a></th>
@@ -201,33 +197,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         $asset_contact_id = $row['asset_contact_id'];
                         $asset_network_id = $row['asset_network_id'];
 
-                        if ($asset_type == 'Laptop') {
-                            $device_icon = "laptop";
-                        } elseif ($asset_type == 'Desktop') {
-                            $device_icon = "desktop";
-                        } elseif ($asset_type == 'Server') {
-                            $device_icon = "server";
-                        } elseif ($asset_type == 'Printer') {
-                            $device_icon = "print";
-                        } elseif ($asset_type == 'Camera') {
-                            $device_icon = "video";
-                        } elseif ($asset_type == 'Switch' || $asset_type == 'Firewall/Router') {
-                            $device_icon = "network-wired";
-                        } elseif ($asset_type == 'Access Point') {
-                            $device_icon = "wifi";
-                        } elseif ($asset_type == 'Phone') {
-                            $device_icon = "phone";
-                        } elseif ($asset_type == 'Mobile Phone') {
-                            $device_icon = "mobile-alt";
-                        } elseif ($asset_type == 'Tablet') {
-                            $device_icon = "tablet-alt";
-                        } elseif ($asset_type == 'TV') {
-                            $device_icon = "tv";
-                        } elseif ($asset_type == 'Virtual Machine') {
-                            $device_icon = "cloud";
-                        } else {
-                            $device_icon = "tag";
-                        }
+                        $device_icon = getAssetIcon($asset_type);
 
                         $contact_name = $row['contact_name'];
                         if (empty($contact_name)) {
diff --git a/client_certificates.php b/client_certificates.php
index 1932bcc1..7a7d6315 100644
--- a/client_certificates.php
+++ b/client_certificates.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <?php 
 
@@ -198,4 +198,4 @@ include("client_certificate_add_modal.php");
     }
 </script>
 
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php include("footer.php"); ?>
diff --git a/client_contact_add_modal.php b/client_contact_add_modal.php
index b3f08d35..26f76ba7 100644
--- a/client_contact_add_modal.php
+++ b/client_contact_add_modal.php
@@ -1,207 +1,205 @@
 <div class="modal" id="addContactModal" 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-plus"></i> New Contact</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="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body bg-white">   
-          
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-photo">Photo</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-portal">Portal</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
-            </li>
-          </ul>
-
-          <hr>
-          
-          <div class="tab-content">
-
-            <div class="tab-pane fade show active" id="pills-details"> 
-          
-              <div class="form-group">
-                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary Contact</span></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" required autofocus>
-                  <div class="input-group-append">
-                    <div class="input-group-text">
-                      <input type="checkbox" name="primary_contact" value="1" <?php if ($primary_contact == 0) { echo "checked"; } ?>>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Title</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="title" placeholder="Title">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Department</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>
-                  <input type="text" class="form-control" name="department" placeholder="Department">
-                </div>
-              </div>
-            
-              <label>Phone</label>
-              <div class="form-row">
-                <div class="col-8">
-                  <div class="form-group">
-                    <div class="input-group">
-                      <div class="input-group-prepend">
-                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                      </div>
-                      <input type="text" class="form-control" name="phone" placeholder="Phone Number"> 
-                    </div>
-                  </div>
-                </div>
-                <div class="col-4">
-                  <input type="text" class="form-control" name="extension" placeholder="Extension">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Mobile</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="mobile" placeholder="Mobile Phone Number"> 
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Email</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">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Location</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                  </div>
-                  <select class="form-control select2" name="location">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql)) {
-                      $location_id = $row['location_id'];
-                      $location_name = htmlentities($row['location_name']);
-                    ?>
-                    <option value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-row">
-                
-                <div class="col-md-4">
-                  <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                      <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox" name="contact_important" value="1" >
-                      <label class="custom-control-label" for="contactImportantCheckbox">Important</label>
-                    </div>
-                  </div>
-                </div>
-                <div class="col-md-4">
-                  <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                      <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox" name="contact_billing" value="1" >
-                      <label class="custom-control-label" for="contactBillingCheckbox">Billing</label>
-                    </div>
-                  </div>
-                </div>
-                <div class="col-md-4">
-                  <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                      <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox" name="contact_technical" value="1" >
-                      <label class="custom-control-label" for="contactTechnicalCheckbox">Technical</label>
-                    </div>
-                  </div>
-                </div>
-              
-              </div>
-
+    <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-plus"></i> New Contact</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="client_id" value="<?php echo $client_id; ?>">
+                <div class="modal-body bg-white">
 
-            <div class="tab-pane fade" id="pills-photo">
-              
-              <div class="form-group">
-                <label>Upload Photo</label>
-                <input type="file" class="form-control-file" name="file">
-              </div>
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-photo">Photo</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-portal">Portal</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
+                        </li>
+                    </ul>
 
-            </div>
+                    <hr>
 
-            <div class="tab-pane fade" id="pills-portal"> 
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-details">
+
+                            <div class="form-group">
+                                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary Contact</span></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" required autofocus>
+                                    <div class="input-group-append">
+                                        <div class="input-group-text">
+                                            <input type="checkbox" name="primary_contact" value="1" <?php if ($primary_contact == 0) { echo "checked"; } ?>>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Title</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="title" placeholder="Title">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Department</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>
+                                    <input type="text" class="form-control" name="department" placeholder="Department">
+                                </div>
+                            </div>
+
+                            <label>Phone</label>
+                            <div class="form-row">
+                                <div class="col-8">
+                                    <div class="form-group">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                            </div>
+                                            <input type="text" class="form-control" name="phone" placeholder="Phone Number">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-4">
+                                    <input type="text" class="form-control" name="extension" placeholder="Extension">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Mobile</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="mobile" placeholder="Mobile Phone Number">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Email</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">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Location</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="location">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($sql)) {
+                                            $location_id = $row['location_id'];
+                                            $location_name = htmlentities($row['location_name']);
+                                            ?>
+                                            <option value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
+
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-row">
+
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox" name="contact_important" value="1" >
+                                            <label class="custom-control-label" for="contactImportantCheckbox">Important</label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox" name="contact_billing" value="1" >
+                                            <label class="custom-control-label" for="contactBillingCheckbox">Billing</label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox" name="contact_technical" value="1" >
+                                            <label class="custom-control-label" for="contactTechnicalCheckbox">Technical</label>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-photo">
+
+                            <div class="form-group">
+                                <label>Upload Photo</label>
+                                <input type="file" class="form-control-file" name="file">
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-portal">
+
+                            <div class="form-group">
+                                <label>Login</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-user-circle"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="auth_method">
+                                        <option value="">- None -</option>
+                                        <option value="local">Local</option>
+                                        <option value="azure">Azure</option>
+                                    </select>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-notes">
+
+                            <div class="form-group">
+                                <textarea class="form-control" rows="8" name="notes" placeholder="Enter some notes"></textarea>
+                            </div>
+
+                        </div>
+
+                    </div>
 
-              <div class="form-group">
-                <label>Login</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-user-circle"></i></span>
-                  </div>
-                  <select class="form-control select2" name="auth_method">
-                    <option value="">- None -</option>
-                    <option value="local">Local</option>
-                    <option value="azure">Azure</option>
-                  </select>
                 </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-notes">
-              
-              <div class="form-group">
-                <textarea class="form-control" rows="8" name="notes" placeholder="Enter some notes"></textarea>
-              </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="add_contact" class="btn btn-primary text-bold"><i class="fas fa-check"></i> Create</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_contact" class="btn btn-primary text-bold"><i class="fas fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/client_contact_details.php b/client_contact_details.php
index b14377cf..475b17b0 100644
--- a/client_contact_details.php
+++ b/client_contact_details.php
@@ -1,4 +1,6 @@
-<?php include("inc_all_client.php");
+<?php
+
+require_once("inc_all_client.php");
 
 if (isset($_GET['contact_id'])) {
     $contact_id = intval($_GET['contact_id']);
@@ -39,7 +41,7 @@ if (isset($_GET['contact_id'])) {
     $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_name DESC");
+    $sql_related_assets = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN logins ON logins.login_asset_id = assets.asset_id WHERE asset_contact_id = $contact_id AND assets.company_id = $session_company_id ORDER BY asset_name DESC");
     $asset_count = mysqli_num_rows($sql_related_assets);
 
     // Related Logins Query
@@ -82,14 +84,14 @@ if (isset($_GET['contact_id'])) {
                     <hr>
                     <?php if (!empty($location_name)) { ?>
                         <div class="mb-1"><i class="fa fa-fw fa-map-marker-alt text-secondary mr-3"></i><?php echo $location_name_display; ?></div>
-                    <?php } ?>
-                    <?php if (!empty($contact_email)) { ?>
+                    <?php }
+                    if (!empty($contact_email)) { ?>
                         <div><i class="fa fa-fw fa-envelope text-secondary mr-3"></i><a href='mailto:<?php echo $contact_email; ?>'><?php echo $contact_email; ?></a><button class='btn btn-sm clipboardjs' data-clipboard-text='<?php echo $contact_email; ?>'><i class='far fa-copy text-secondary'></i></button></div>
-                    <?php } ?>
-                    <?php if (!empty($contact_phone)) { ?>
+                    <?php }
+                    if (!empty($contact_phone)) { ?>
                         <div class="mb-2"><i class="fa fa-fw fa-phone text-secondary mr-3"></i><?php echo "$contact_phone $contact_extension"; ?></div>
-                    <?php } ?>
-                    <?php if (!empty($contact_mobile)) { ?>
+                    <?php }
+                    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>
@@ -98,7 +100,7 @@ if (isset($_GET['contact_id'])) {
                         <i class="fas fa-fw fa-user-edit"></i> Edit
                     </button>
 
-                    <?php include("client_contact_edit_modal.php"); ?>
+                    <?php require_once("client_contact_edit_modal.php"); ?>
 
                 </div>
             </div>
@@ -195,33 +197,12 @@ if (isset($_GET['contact_id'])) {
                                 $asset_location_id = $row['asset_location_id'];
                                 $asset_network_id = $row['asset_network_id'];
                                 $asset_contact_id = $row['asset_contact_id'];
-                                if ($asset_type == 'Laptop') {
-                                    $device_icon = "laptop";
-                                } elseif ($asset_type == 'Desktop') {
-                                    $device_icon = "desktop";
-                                } elseif ($asset_type == 'Server') {
-                                    $device_icon = "server";
-                                } elseif ($asset_type == 'Printer') {
-                                    $device_icon = "print";
-                                } elseif ($asset_type == 'Camera') {
-                                    $device_icon = "video";
-                                } elseif ($asset_type == 'Switch' || $asset_type == 'Firewall/Router') {
-                                    $device_icon = "network-wired";
-                                } elseif ($asset_type == 'Access Point') {
-                                    $device_icon = "wifi";
-                                } elseif ($asset_type == 'Phone') {
-                                    $device_icon = "phone";
-                                } elseif ($asset_type == 'Mobile Phone') {
-                                    $device_icon = "mobile-alt";
-                                } elseif ($asset_type == 'Tablet') {
-                                    $device_icon = "tablet-alt";
-                                } elseif ($asset_type == 'TV') {
-                                    $device_icon = "tv";
-                                } elseif ($asset_type == 'Virtual Machine') {
-                                    $device_icon = "cloud";
-                                } else {
-                                    $device_icon = "tag";
-                                }
+
+                                $login_id = $row['login_id'];
+                                $login_username = htmlentities(decryptLoginEntry($row['login_username']));
+                                $login_password = htmlentities(decryptLoginEntry($row['login_password']));
+
+                                $device_icon = getAssetIcon($asset_type);
 
                                 ?>
                                 <tr>
@@ -254,10 +235,9 @@ if (isset($_GET['contact_id'])) {
 
                                 <?php
 
-                                include("client_asset_edit_modal.php");
-                                include("client_asset_copy_modal.php");
-                                //include("client_asset_tickets_modal.php");
-                                include("client_asset_interface_add_modal.php");
+                                require("client_asset_edit_modal.php");
+                                require("client_asset_copy_modal.php");
+                                require("client_asset_interface_add_modal.php");
 
                             }
 
@@ -352,7 +332,7 @@ if (isset($_GET['contact_id'])) {
 
                                 <?php
 
-                                include("client_login_edit_modal.php");
+                                require("client_login_edit_modal.php");
                             }
 
                             ?>
@@ -372,13 +352,13 @@ if (isset($_GET['contact_id'])) {
                     <div class="table-responsive">
                         <table class="table table-striped table-borderless table-hover">
                             <thead class="text-dark">
-                                <tr>
+                            <tr>
                                 <th>Software</th>
                                 <th>Type</th>
                                 <th>License Type</th>
                                 <th>Seats</th>
                                 <th class="text-center">Action</th>
-                              </tr>
+                            </tr>
                             </thead>
                             <tbody>
                             <?php
@@ -406,8 +386,8 @@ if (isset($_GET['contact_id'])) {
                                 $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_array[] = $row['asset_id'];
+                                    $seat_count = $seat_count + 1;
                                 }
                                 $asset_licenses = implode(',',$asset_licenses_array);
 
@@ -415,12 +395,12 @@ if (isset($_GET['contact_id'])) {
                                 $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_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>
@@ -434,20 +414,20 @@ if (isset($_GET['contact_id'])) {
                                             <div class="dropdown-menu">
                                                 <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editSoftwareModal<?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>
+                                                    <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
+                                <?php
 
-                              include("client_software_edit_modal.php");
-                              }
+                                require("client_software_edit_modal.php");
+                            }
 
-                              ?>
+                            ?>
 
                             </tbody>
                         </table>
@@ -463,15 +443,15 @@ if (isset($_GET['contact_id'])) {
                     <div class="table-responsive">
                         <table class="table table-striped table-borderless table-hover">
                             <thead class="text-dark">
-                                <tr>
-                                    <th>Number</th>
-                                    <th>Subject</th>
-                                    <th>Priority</th>
-                                    <th>Status</th>
-                                    <th>Assigned</th>
-                                    <th>Last Response</th>
-                                    <th>Created</th>
-                                </tr>
+                            <tr>
+                                <th>Number</th>
+                                <th>Subject</th>
+                                <th>Priority</th>
+                                <th>Status</th>
+                                <th>Assigned</th>
+                                <th>Last Response</th>
+                                <th>Created</th>
+                            </tr>
                             </thead>
                             <tbody>
                             <?php
@@ -524,7 +504,7 @@ if (isset($_GET['contact_id'])) {
                                     $ticket_assigned_to_display = htmlentities($row['user_name']);
                                 }
 
-                              ?>
+                                ?>
 
                                 <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>
@@ -536,7 +516,7 @@ if (isset($_GET['contact_id'])) {
                                     <td><?php echo $ticket_created_at; ?></td>
                                 </tr>
 
-                            <?php
+                                <?php
 
                             }
 
@@ -554,26 +534,27 @@ if (isset($_GET['contact_id'])) {
 
     <?php
 
-    include("share_modal.php");
+    require_once("share_modal.php");
 
     ?>
 
 <?php } ?>
 
 <script>
-function updateContactNotes(contact_id) {
-    var notes = document.getElementById("contactNotes").value;
+    function updateContactNotes(contact_id) {
+        var notes = document.getElementById("contactNotes").value;
 
-    // Send a POST request to ajax.php as ajax.php with data client_set_notes=true, client_id=NUM, notes=NOTES
-    jQuery.post(
-        "ajax.php",
-        {
-            contact_set_notes: 'TRUE',
-            contact_id: contact_id,
-            notes: notes
-        }
-    )
-}
+        // Send a POST request to ajax.php as ajax.php with data contact_set_notes=true, contact_id=NUM, notes=NOTES
+        jQuery.post(
+            "ajax.php",
+            {
+                contact_set_notes: 'TRUE',
+                contact_id: contact_id,
+                notes: notes
+            }
+        )
+    }
 </script>
 
-<?php include("footer.php"); ?>
+<?php
+require_once("footer.php");
diff --git a/client_contact_details_modal.php b/client_contact_details_modal.php
index 48a3c649..bba28ff4 100644
--- a/client_contact_details_modal.php
+++ b/client_contact_details_modal.php
@@ -1,129 +1,121 @@
 <div class="modal" id="contactDetailsModal<?php echo $contact_id; ?>" tabindex="-1">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-user mr-2"></i><?php echo $contact_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="modal-dialog modal-lg">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title text-white"><i class="fa fa-fw fa-user mr-2"></i><?php echo $contact_name; ?></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <div class="modal-body bg-white">
 
-        <ul class="nav nav-pills nav-justified mb-3">
-          <li class="nav-item">
-            <a class="nav-link active" data-toggle="pill" href="#pillsRelatedAssets<?php echo $contact_id; ?>">Assets</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" data-toggle="pill" href="#pillsRelatedLogins<?php echo $contact_id; ?>">Logins</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" data-toggle="pill" href="#pillsRelatedSoftware<?php echo $contact_id; ?>">Software</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" data-toggle="pill" href="#pillsRelatedTickets<?php echo $contact_id; ?>">Tickets</a>
-          </li>
-        </ul>
+                <ul class="nav nav-pills nav-justified mb-3">
+                    <li class="nav-item">
+                        <a class="nav-link active" data-toggle="pill" href="#pillsRelatedAssets<?php echo $contact_id; ?>">Assets</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" data-toggle="pill" href="#pillsRelatedLogins<?php echo $contact_id; ?>">Logins</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" data-toggle="pill" href="#pillsRelatedSoftware<?php echo $contact_id; ?>">Software</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" data-toggle="pill" href="#pillsRelatedTickets<?php echo $contact_id; ?>">Tickets</a>
+                    </li>
+                </ul>
 
-        <hr>
-        
-        <div class="tab-content">
-          <div class="tab-pane fade show active" id="pillsRelatedAssets<?php echo $contact_id; ?>">
-        
-            <ul>
+                <hr>
 
-              <?php
+                <div class="tab-content">
+                    <div class="tab-pane fade show active" id="pillsRelatedAssets<?php echo $contact_id; ?>">
 
-              while ($row = mysqli_fetch_array($sql_related_assets)) {
-                $asset_id = $row['asset_id'];
-                $asset_type = htmlentities($row['asset_type']);
-                $asset_name = htmlentities($row['asset_name']);
-                $asset_make = htmlentities($row['asset_make']);
-                $asset_model = htmlentities($row['asset_model']);
-                $asset_serial = htmlentities($row['asset_serial']);
+                        <ul>
 
-              ?>
-              
-              <li><?php echo $asset_name; ?></li>
+                            <?php
 
-              <?php
-              }
-              ?>
-            </ul>
-           
-          </div>
+                            while ($row = mysqli_fetch_array($sql_related_assets)) {
+                                $asset_id = $row['asset_id'];
+                                $asset_type = htmlentities($row['asset_type']);
+                                $asset_name = htmlentities($row['asset_name']);
+                                $asset_make = htmlentities($row['asset_make']);
+                                $asset_model = htmlentities($row['asset_model']);
+                                $asset_serial = htmlentities($row['asset_serial']);
 
-          <div class="tab-pane fade" id="pillsRelatedLogins<?php echo $contact_id; ?>">
-            <ul>
-              <?php
+                                ?>
 
-              while ($row = mysqli_fetch_array($sql_related_logins)) {
-                $login_id = $row['login_id'];
-                $login_name = htmlentities($row['login_name']);
-                $login_uri = htmlentities($row['login_uri']);
-                $login_username = htmlentities($row['login_username']);
-                $login_password = htmlentities($row['login_password']);
-                $login_note = htmlentities($row['login_note']);
-                $vendor_id = $row['vendor_id'];
-                $asset_id = $row['asset_id'];
-                $software_id = $row['software_id'];
+                                <li><?php echo $asset_name; ?></li>
 
-              ?>
-              
-              <li><?php echo "$login_name - $login_username"; ?></li>
+                            <?php } ?>
+                        </ul>
 
-              <?php
-              }
-              ?>
-            </ul>
+                    </div>
 
-          </div>
+                    <div class="tab-pane fade" id="pillsRelatedLogins<?php echo $contact_id; ?>">
+                        <ul>
+                            <?php
 
-          <div class="tab-pane fade" id="pillsRelatedSoftware<?php echo $contact_id; ?>">
-            <ul>
-              <?php
+                            while ($row = mysqli_fetch_array($sql_related_logins)) {
+                                $login_id = $row['login_id'];
+                                $login_name = htmlentities($row['login_name']);
+                                $login_uri = htmlentities($row['login_uri']);
+                                $login_username = htmlentities($row['login_username']);
+                                $login_password = htmlentities($row['login_password']);
+                                $login_note = htmlentities($row['login_note']);
+                                $vendor_id = $row['vendor_id'];
+                                $asset_id = $row['asset_id'];
+                                $software_id = $row['software_id'];
 
-              while ($row = mysqli_fetch_array($sql_related_software)) {
-                $software_id = $row['software_id'];
-                $software_name = htmlentities($row['software_name']);
-                $software_type = htmlentities($row['software_type']);
-                $software_notes = htmlentities($row['software_notes']);
+                                ?>
 
-              ?>
-              
-              <li><?php echo "$software_name - $software_type"; ?></li>
+                                <li><?php echo "$login_name - $login_username"; ?></li>
 
-              <?php
-              }
-              ?>
-            </ul>
-      
-          </div>
+                            <?php } ?>
+                        </ul>
 
-          <div class="tab-pane fade" id="pillsRelatedTickets<?php echo $contact_id; ?>">
-            <ul>
-              <?php
+                    </div>
 
-              while ($row = mysqli_fetch_array($sql_related_tickets)) {
-                $ticket_id = $row['ticket_id'];
-                $ticket_prefix = htmlentities($row['ticket_prefix']);
-                $ticket_number = $row['ticket_number'];
-                $ticket_subject = htmlentities($row['ticket_subject']);
+                    <div class="tab-pane fade" id="pillsRelatedSoftware<?php echo $contact_id; ?>">
+                        <ul>
+                            <?php
 
-                ?>
+                            while ($row = mysqli_fetch_array($sql_related_software)) {
+                                $software_id = $row['software_id'];
+                                $software_name = htmlentities($row['software_name']);
+                                $software_type = htmlentities($row['software_type']);
+                                $software_notes = htmlentities($row['software_notes']);
 
-                <li><a href="ticket.php?ticket_id=<?=$ticket_id ?>"><?php echo "[$ticket_prefix$ticket_number] - $ticket_subject"; ?></a></li>
+                                ?>
 
-                <?php
-              }
-              ?>
-            </ul>
+                                <li><?php echo "$software_name - $software_type"; ?></li>
 
-          </div>
+                            <?php } ?>
+                        </ul>
+
+                    </div>
+
+                    <div class="tab-pane fade" id="pillsRelatedTickets<?php echo $contact_id; ?>">
+                        <ul>
+                            <?php
+
+                            while ($row = mysqli_fetch_array($sql_related_tickets)) {
+                                $ticket_id = $row['ticket_id'];
+                                $ticket_prefix = htmlentities($row['ticket_prefix']);
+                                $ticket_number = $row['ticket_number'];
+                                $ticket_subject = htmlentities($row['ticket_subject']);
+
+                                ?>
+
+                                <li><a href="ticket.php?ticket_id=<?=$ticket_id ?>"><?php echo "[$ticket_prefix$ticket_number] - $ticket_subject"; ?></a></li>
+
+                            <?php } ?>
+                        </ul>
+
+                    </div>
+
+                </div>
+
+            </div>
 
         </div>
-
-      </div>
-
     </div>
-  </div>
 </div>
diff --git a/client_contact_edit_modal.php b/client_contact_edit_modal.php
index 80cbe29a..81047b99 100644
--- a/client_contact_edit_modal.php
+++ b/client_contact_edit_modal.php
@@ -1,241 +1,239 @@
 <div class="modal" id="editContactModal<?php echo $contact_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: <strong><?php echo $contact_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="contact_id" value="<?php echo $contact_id; ?>">
-        <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <input type="hidden" name="existing_file_name" value="<?php echo $contact_photo; ?>">
-        <div class="modal-body bg-white">
-
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $contact_id; ?>">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-photo<?php echo $contact_id; ?>">Photo</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-portal<?php echo $contact_id; ?>">Portal</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $contact_id; ?>">Notes</a>
-            </li>
-          </ul>
-
-          <hr>
-          
-          <div class="tab-content">
-
-            <div class="tab-pane fade show active" id="pills-details<?php echo $contact_id; ?>">
-
-              <div class="form-group">
-                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary Contact</span></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 $contact_name; ?>" required>
-                  <div class="input-group-append">
-                    <div class="input-group-text">
-                      <input type="checkbox" name="primary_contact" value="1" <?php if ($contact_id == $primary_contact) { echo "checked"; } ?>>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Title</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="title" placeholder="Title" value="<?php echo $contact_title; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Department</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>
-                  <input type="text" class="form-control" name="department" placeholder="Department" value="<?php echo $contact_department; ?>">
-                </div>
-              </div>
-
-              <label>Phone</label>
-              <div class="form-row">
-                <div class="col-8">
-                  <div class="form-group">
-                    <div class="input-group">
-                      <div class="input-group-prepend">
-                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                      </div>
-                      <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $contact_phone; ?>"> 
-                    </div>
-                  </div>
-                </div>
-                <div class="col-4">
-                  <input type="text" class="form-control" name="extension" placeholder="Extension" value="<?php echo $contact_extension; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Mobile</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="mobile" placeholder="Mobile Phone Number" value="<?php echo $contact_mobile; ?>"> 
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Email</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 $contact_email; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Location</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                  </div>
-                  <select class="form-control select2" name="location">
-                    <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");
-                    while ($row = mysqli_fetch_array($sql_locations)) {
-                      $location_id_select = $row['location_id'];
-                      $location_name_select = htmlentities($row['location_name']);
-                    ?>
-                    <option <?php if ($contact_location_id == $location_id_select) { echo "selected"; } ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-row">
-                
-                <div class="col-md-4">
-                  <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                      <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox<?php echo $contact_id; ?>" name="contact_important" value="1" <?php if ($contact_important == 1) { echo "checked"; } ?> >
-                      <label class="custom-control-label" for="contactImportantCheckbox<?php echo $contact_id; ?>">Important</label>
-                    </div>
-                  </div>
-                </div>
-                <div class="col-md-4">
-                  <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                      <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox<?php echo $contact_id; ?>" name="contact_billing" value="1" <?php if ($contact_billing == 1) { echo "checked"; } ?> >
-                      <label class="custom-control-label" for="contactBillingCheckbox<?php echo $contact_id; ?>">Billing</label>
-                    </div>
-                  </div>
-                </div>
-                <div class="col-md-4">
-                  <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                      <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox<?php echo $contact_id; ?>" name="contact_technical" value="1" <?php if ($contact_technical == 1) { echo "checked"; } ?> >
-                      <label class="custom-control-label" for="contactTechnicalCheckbox<?php echo $contact_id; ?>">Technical</label>
-                    </div>
-                  </div>
-                </div>
-              
-              </div>
-
+    <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: <strong><?php echo $contact_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="contact_id" value="<?php echo $contact_id; ?>">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <input type="hidden" name="existing_file_name" value="<?php echo $contact_photo; ?>">
+                <div class="modal-body bg-white">
 
-            <div class="tab-pane fade" id="pills-portal<?php echo $contact_id; ?>">
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $contact_id; ?>">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-photo<?php echo $contact_id; ?>">Photo</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-portal<?php echo $contact_id; ?>">Portal</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $contact_id; ?>">Notes</a>
+                        </li>
+                    </ul>
 
-              <div class="form-group">
-                <label>Login</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-user-circle"></i></span>
-                  </div>
-                  <select class="form-control select2" name="auth_method">
-                    <option value="">- None -</option>
-                    <option value="local" <?php if ($auth_method == "local") {echo "selected";} ?>>Local</option>
-                    <option value="azure" <?php if ($auth_method == "azure") {echo "selected";} ?>>Azure</option>
-                  </select>
-                </div>
-              </div>
+                    <hr>
 
-              <?php if ($auth_method == "local") { ?>
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-details<?php echo $contact_id; ?>">
+
+                            <div class="form-group">
+                                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary Contact</span></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 $contact_name; ?>" required>
+                                    <div class="input-group-append">
+                                        <div class="input-group-text">
+                                            <input type="checkbox" name="primary_contact" value="1" <?php if ($contact_id == $primary_contact) { echo "checked"; } ?>>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Title</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="title" placeholder="Title" value="<?php echo $contact_title; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Department</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>
+                                    <input type="text" class="form-control" name="department" placeholder="Department" value="<?php echo $contact_department; ?>">
+                                </div>
+                            </div>
+
+                            <label>Phone</label>
+                            <div class="form-row">
+                                <div class="col-8">
+                                    <div class="form-group">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                            </div>
+                                            <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $contact_phone; ?>">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-4">
+                                    <input type="text" class="form-control" name="extension" placeholder="Extension" value="<?php echo $contact_extension; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Mobile</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="mobile" placeholder="Mobile Phone Number" value="<?php echo $contact_mobile; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Email</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 $contact_email; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Location</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="location">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($sql_locations)) {
+                                            $location_id_select = $row['location_id'];
+                                            $location_name_select = htmlentities($row['location_name']);
+                                            ?>
+                                            <option <?php if ($contact_location_id == $location_id_select) { echo "selected"; } ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name_select; ?></option>
+
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-row">
+
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox<?php echo $contact_id; ?>" name="contact_important" value="1" <?php if ($contact_important == 1) { echo "checked"; } ?> >
+                                            <label class="custom-control-label" for="contactImportantCheckbox<?php echo $contact_id; ?>">Important</label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox<?php echo $contact_id; ?>" name="contact_billing" value="1" <?php if ($contact_billing == 1) { echo "checked"; } ?> >
+                                            <label class="custom-control-label" for="contactBillingCheckbox<?php echo $contact_id; ?>">Billing</label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox<?php echo $contact_id; ?>" name="contact_technical" value="1" <?php if ($contact_technical == 1) { echo "checked"; } ?> >
+                                            <label class="custom-control-label" for="contactTechnicalCheckbox<?php echo $contact_id; ?>">Technical</label>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-portal<?php echo $contact_id; ?>">
+
+                            <div class="form-group">
+                                <label>Login</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-user-circle"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="auth_method">
+                                        <option value="">- None -</option>
+                                        <option value="local" <?php if ($auth_method == "local") {echo "selected";} ?>>Local</option>
+                                        <option value="azure" <?php if ($auth_method == "azure") {echo "selected";} ?>>Azure</option>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <?php if ($auth_method == "local") { ?>
+
+                                <div class="form-group">
+                                    <label>Password</label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                                        </div>
+                                        <input type="password" class="form-control" data-toggle="password" name="contact_password" placeholder="Leave blank for no 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>
+
+                            <?php } ?>
+
+                            <div class="form-check">
+                                <input type="checkbox" class="form-check-input" name="send_email" value=""/>
+                                <label class="form-check-label">Send user e-mail with login details?</label>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-photo<?php echo $contact_id; ?>">
+
+                            <div class="mb-3 text-center">
+                                <?php if (!empty($contact_photo)) { ?>
+                                    <img class="img-fluid" alt="contact_photo" src="<?php echo "uploads/clients/$session_company_id/$client_id/$contact_photo"; ?>">
+                                <?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 $contact_initials; ?></span>
+                                    </span>
+                                <?php } ?>
+                            </div>
+
+                            <div class="form-group">
+                                <input type="file" class="form-control-file" name="file">
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-notes<?php echo $contact_id; ?>">
+
+                            <div class="form-group">
+                                <textarea class="form-control" rows="8" name="notes" placeholder="Enter some notes"><?php echo $contact_notes; ?></textarea>
+                            </div>
+
+                        </div>
 
-                <div class="form-group">
-                  <label>Password</label>
-                  <div class="input-group">
-                    <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
                     </div>
-                    <input type="password" class="form-control" data-toggle="password" name="contact_password" placeholder="Leave blank for no 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>
-
-              <?php } ?>
-
-              <div class="form-check">
-                <input type="checkbox" class="form-check-input" name="send_email" value=""/>
-                <label class="form-check-label">Send user e-mail with login details?</label>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-photo<?php echo $contact_id; ?>">
-
-              <div class="mb-3 text-center">
-                <?php if (!empty($contact_photo)) { ?>
-                <img class="img-fluid" alt="contact_photo" src="<?php echo "uploads/clients/$session_company_id/$client_id/$contact_photo"; ?>">
-                <?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 $contact_initials; ?></span>
-                </span>
-                <?php } ?>
-              </div>
-
-              <div class="form-group">
-                <input type="file" class="form-control-file" name="file">
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-notes<?php echo $contact_id; ?>">
-              
-              <div class="form-group">
-                <textarea class="form-control" rows="8" name="notes" placeholder="Enter some notes"><?php echo $contact_notes; ?></textarea>
-              </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="edit_contact" class="btn btn-primary"><i class="fas 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_contact" class="btn btn-primary"><i class="fas fa-check"></i> Save</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/client_contact_import_modal.php b/client_contact_import_modal.php
index 29c745bf..ec4fc98d 100644
--- a/client_contact_import_modal.php
+++ b/client_contact_import_modal.php
@@ -1,27 +1,27 @@
 <div class="modal" id="importContactModal" 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-users"></i> Import Contacts</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="client_id" value="<?php echo $client_id; ?>">
-				<div class="modal-body bg-white">
-					<p><strong>Format csv file with headings & data:</strong><br>Name, Title, Department, Email, Phone, Extension, Mobile, Location</p>
-					<hr>
-					<div class="form-group my-4">
-						<input type="file" class="form-control-file" name="file" accept=".csv">
-					</div>
-					<hr>
-					<div>Download <a href="post.php?download_client_contacts_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
-				</div>
-				<div class="modal-footer bg-white">
-					<button type="submit" name="import_client_contacts_csv" class="btn btn-primary">Import</button>
-				</div>
-			</form>
-		</div>
-	</div>
-</div>
\ No newline at end of file
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-users"></i> Import Contacts</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="client_id" value="<?php echo $client_id; ?>">
+                <div class="modal-body bg-white">
+                    <p><strong>Format csv file with headings & data:</strong><br>Name, Title, Department, Email, Phone, Extension, Mobile, Location</p>
+                    <hr>
+                    <div class="form-group my-4">
+                        <input type="file" class="form-control-file" name="file" accept=".csv">
+                    </div>
+                    <hr>
+                    <div>Download <a href="post.php?download_client_contacts_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="import_client_contacts_csv" class="btn btn-primary">Import</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/client_contact_invite_modal.php b/client_contact_invite_modal.php
index 56a6e679..3d6fb8b0 100644
--- a/client_contact_invite_modal.php
+++ b/client_contact_invite_modal.php
@@ -1,84 +1,84 @@
 <div class="modal" id="contactInviteModal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fas fa-fw fa-user-plus"></i> Invite Contact</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="client_id" value="<?php echo $client_id; ?>">
-        
-        <div class="modal-body bg-white">
-          
-          <div class="form-group">
-            <label>Email</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">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fas fa-fw fa-user-plus"></i> Invite Contact</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
 
-          <div class="form-group">
-            <label>Welcome Letter</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fas fa-fw fa-envelope-open-text"></i></span>
-              </div>
-              <select class="form-control select2" name="welcome_letter">
-                <option value="1">- Select One -</option>
-                <option value="2">Standard</option>
-                <option value="3">Big Wig</option>
-              </select>
-            </div>
-          </div>
+            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 
-          <div class="form-group">
-            <textarea class="form-control" rows="8" name="notes" placeholder="Enter some notes"><?php echo $contact_notes; ?></textarea>
-          </div>
+                <div class="modal-body bg-white">
+
+                    <div class="form-group">
+                        <label>Email</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">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Welcome Letter</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fas fa-fw fa-envelope-open-text"></i></span>
+                            </div>
+                            <select class="form-control select2" name="welcome_letter">
+                                <option value="1">- Select One -</option>
+                                <option value="2">Standard</option>
+                                <option value="3">Big Wig</option>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <textarea class="form-control" rows="8" name="notes" placeholder="Enter some notes"><?php echo $contact_notes; ?></textarea>
+                    </div>
+
+                    <div class="form-row">
+
+                        <div class="col-md-4">
+                            <div class="form-group">
+                                <div class="custom-control custom-checkbox">
+                                    <input type="checkbox" class="custom-control-input" id="contactInviteImportantCheckbox" name="contact_important" value="1" >
+                                    <label class="custom-control-label" for="contactInviteImportantCheckbox">Important</label>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-4">
+                            <div class="form-group">
+                                <div class="custom-control custom-checkbox">
+                                    <input type="checkbox" class="custom-control-input" id="contactInviteBillingCheckbox" name="contact_billing" value="1" >
+                                    <label class="custom-control-label" for="contactInviteBillingCheckbox">Billing</label>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-4">
+                            <div class="form-group">
+                                <div class="custom-control custom-checkbox">
+                                    <input type="checkbox" class="custom-control-input" id="contactInviteTechnicalCheckbox" name="contact_technical" value="1" >
+                                    <label class="custom-control-label" for="contactInviteTechnicalCheckbox">Technical</label>
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
 
-          <div class="form-row">
-                
-            <div class="col-md-4">
-              <div class="form-group">
-                <div class="custom-control custom-checkbox">
-                  <input type="checkbox" class="custom-control-input" id="contactInviteImportantCheckbox" name="contact_important" value="1" >
-                  <label class="custom-control-label" for="contactInviteImportantCheckbox">Important</label>
                 </div>
-              </div>
-            </div>
-            <div class="col-md-4">
-              <div class="form-group">
-                <div class="custom-control custom-checkbox">
-                  <input type="checkbox" class="custom-control-input" id="contactInviteBillingCheckbox" name="contact_billing" value="1" >
-                  <label class="custom-control-label" for="contactInviteBillingCheckbox">Billing</label>
+
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="invite_contact" class="btn btn-primary"><strong><i class="fas fa-paper-plane"></i> Send Invite</strong></button>
                 </div>
-              </div>
-            </div>
-            <div class="col-md-4">
-              <div class="form-group">
-                <div class="custom-control custom-checkbox">
-                  <input type="checkbox" class="custom-control-input" id="contactInviteTechnicalCheckbox" name="contact_technical" value="1" >
-                  <label class="custom-control-label" for="contactInviteTechnicalCheckbox">Technical</label>
-                </div>
-              </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="invite_contact" class="btn btn-primary"><strong><i class="fas fa-paper-plane"></i> Send Invite</strong></button>
-        </div>
-      
-      </form>
-    
     </div>
-  </div>
 </div>
diff --git a/client_contacts.php b/client_contacts.php
index 295969b4..a2a6bad5 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -1,24 +1,24 @@
-<?php include("inc_all_client.php"); ?>
+<?php
 
-<?php 
+require_once("inc_all_client.php");
 
 if (isset($_GET['q'])) {
-  $q = strip_tags(mysqli_real_escape_string($mysqli,$_GET['q']));
-  //Phone Numbers
-  $n = preg_replace("/[^0-9]/", '',$q);
-  if (empty($n)) {
-    $n = $q;
-  }
-}else{
-  $q = "";
-  //Phone Numbers
-  $n = "";
+    $q = strip_tags(mysqli_real_escape_string($mysqli,$_GET['q']));
+    //Phone Numbers
+    $n = preg_replace("/[^0-9]/", '',$q);
+    if (empty($n)) {
+        $n = $q;
+    }
+} else {
+    $q = "";
+    //Phone Numbers
+    $n = "";
 }
 
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
-  $sb = "contact_name";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+} else {
+    $sb = "contact_name";
 }
 
 //Rebuild URL
@@ -35,199 +35,197 @@ $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-users"></i> Contacts</h3>
-    <div class="card-tools">
-      <div class="btn-group">
-        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addContactModal">
-          <i class="fas fa-fw fa-plus"></i> New Contact
-        </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="#contactInviteModal"><i class="fas fa-paper-plane mr-2"></i>Invite Contact</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 Contacts">
-            <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_contacts_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
-            <button type="button" class="btn btn-default" data-toggle="modal" data-target="#importContactModal"><i class="fa fa-fw fa-upload"></i> Import</button>
-          </div>
-        </div>
-
-      </div>
-    </form>
-    <hr>
-    <div class="table-responsive">
-      <table class="table border">
-        <thead class="thead-light <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-          <tr>
-            <th class="text-center"><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_name&o=<?php echo $disp; ?>">Name</a></th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_department&o=<?php echo $disp; ?>">Department</a></th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_email&o=<?php echo $disp; ?>">Email</a></th>
-            <th>Phone</th>
-            <th>Mobile</th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=location_name&o=<?php echo $disp; ?>">Location</a></th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-
-          while ($row = mysqli_fetch_array($sql)) {
-            $contact_id = $row['contact_id'];
-            $contact_name = htmlentities($row['contact_name']);
-            $contact_title = htmlentities($row['contact_title']);
-            if (empty($contact_title)) {
-              $contact_title_display = "-";
-            }else{
-              $contact_title_display = "<small class='text-secondary'>$contact_title</small>";
-            }
-            $contact_department =htmlentities($row['contact_department']);
-            if (empty($contact_department)) {
-              $contact_department_display = "-";
-            }else{
-              $contact_department_display = $contact_department;
-            }
-            $contact_phone = formatPhoneNumber($row['contact_phone']);
-            if (empty($contact_phone)) {
-              $contact_phone_display = "-";
-            }else{
-              $contact_phone_display = "$contact_phone";
-            }
-            $contact_extension = htmlentities($row['contact_extension']);
-            $contact_mobile = formatPhoneNumber($row['contact_mobile']);
-            if (empty($contact_mobile)) {
-              $contact_mobile_display = "-";
-            }else{
-              $contact_mobile_display = "$contact_mobile";
-            }
-            $contact_email = htmlentities($row['contact_email']);
-            if (empty($contact_email)) {
-              $contact_email_display = "-";
-            }else{
-              $contact_email_display = "<a href='mailto:$contact_email'>$contact_email</a><button class='btn btn-sm clipboardjs' data-clipboard-text='$contact_email'><i class='far fa-copy text-secondary'></i></button>";
-            }
-            $contact_photo = htmlentities($row['contact_photo']);
-            $contact_initials = initials($contact_name);
-            $contact_notes = htmlentities($row['contact_notes']);
-            $contact_important = intval($row['contact_important']);
-            $contact_billing = intval($row['contact_billing']);
-            $contact_technical = intval($row['contact_technical']);
-            $contact_created_at = $row['contact_created_at'];
-            if ($contact_id == $primary_contact) {
-                $primary_contact_display = "<small class='text-success'>Primary Contact</small>";
-            }else{
-              $primary_contact_display = FALSE;
-            }
-            $contact_location_id = $row['contact_location_id'];
-            $location_name = htmlentities($row['location_name']);
-            if (empty($location_name)) {
-              $location_name_display = "-";
-            }else{
-              $location_name_display = $location_name;
-            }
-            $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");
-            $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");
-            $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");
-            $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");
-            $ticket_count = mysqli_num_rows($sql_related_tickets);
-      
-          ?>
-          <tr>
-            <th class="text-center">
-              <a class="text-dark" href="client_contact_details.php?client_id=<?php echo $client_id; ?>&contact_id=<?php echo $contact_id; ?>">
-                <?php if (!empty($contact_photo)) { ?>
-              
-                <img class="img-size-50 img-circle" src="<?php echo "uploads/clients/$session_company_id/$client_id/$contact_photo"; ?>">
-                
-                <?php }else{ ?>
-    
-                <span class="fa-stack fa-2x">
-                  <i class="fa fa-circle fa-stack-2x text-secondary"></i>
-                  <span class="fa fa-stack-1x text-white"><?php echo $contact_initials; ?></span>
-                </span>
-                <br>
-                
-                <?php } ?>
-                <div class="text-dark"><?php echo $contact_name; ?></div>
-                <div><?php echo $contact_title_display; ?></div>
-                <div><?php echo $primary_contact_display; ?></div>
-              </a>
-            </th>
-            
-            <td><?php echo $contact_department_display; ?></td>
-            <td><?php echo $contact_email_display; ?></td>
-            <td><?php echo $contact_phone_display; ?> <?php if (!empty($contact_extension)) { echo "x$contact_extension"; } ?></td>
-            <td><?php echo $contact_mobile_display; ?></td>
-            <td><?php echo $location_name_display; ?></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-header py-2">
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-users"></i> Contacts</h3>
+        <div class="card-tools">
+            <div class="btn-group">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addContactModal">
+                    <i class="fas fa-fw fa-plus"></i> New Contact
                 </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="client_contact_details.php?client_id=<?php echo $client_id; ?>&contact_id=<?php echo $contact_id; ?>">View Details</a>
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editContactModal<?php echo $contact_id; ?>">Edit</a>
-                  <?php if ($session_user_role == 3 && $contact_id !== $primary_contact) { ?>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item text-danger" href="post.php?archive_contact=<?php echo $contact_id; ?>">Archive</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item text-danger text-bold" href="post.php?delete_contact=<?php echo $contact_id; ?>">Delete</a>
-                  <?php } ?>
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#contactInviteModal"><i class="fas fa-paper-plane mr-2"></i>Invite Contact</a>
                 </div>
-              </div> 
-            </td>
-          </tr>
-
-          <?php
-          
-          include("client_contact_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 Contacts">
+                        <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_contacts_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
+                        <button type="button" class="btn btn-default" data-toggle="modal" data-target="#importContactModal"><i class="fa fa-fw fa-upload"></i> Import</button>
+                    </div>
+                </div>
+
+            </div>
+        </form>
+        <hr>
+        <div class="table-responsive">
+            <table class="table border">
+                <thead class="thead-light <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                <tr>
+                    <th class="text-center"><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_name&o=<?php echo $disp; ?>">Name</a></th>
+                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_department&o=<?php echo $disp; ?>">Department</a></th>
+                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_email&o=<?php echo $disp; ?>">Email</a></th>
+                    <th>Phone</th>
+                    <th>Mobile</th>
+                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=location_name&o=<?php echo $disp; ?>">Location</a></th>
+                    <th class="text-center">Action</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
+
+                while ($row = mysqli_fetch_array($sql)) {
+                    $contact_id = $row['contact_id'];
+                    $contact_name = htmlentities($row['contact_name']);
+                    $contact_title = htmlentities($row['contact_title']);
+                    if (empty($contact_title)) {
+                        $contact_title_display = "-";
+                    } else {
+                        $contact_title_display = "<small class='text-secondary'>$contact_title</small>";
+                    }
+                    $contact_department =htmlentities($row['contact_department']);
+                    if (empty($contact_department)) {
+                        $contact_department_display = "-";
+                    } else {
+                        $contact_department_display = $contact_department;
+                    }
+                    $contact_phone = formatPhoneNumber($row['contact_phone']);
+                    if (empty($contact_phone)) {
+                        $contact_phone_display = "-";
+                    } else {
+                        $contact_phone_display = "$contact_phone";
+                    }
+                    $contact_extension = htmlentities($row['contact_extension']);
+                    $contact_mobile = formatPhoneNumber($row['contact_mobile']);
+                    if (empty($contact_mobile)) {
+                        $contact_mobile_display = "-";
+                    } else {
+                        $contact_mobile_display = "$contact_mobile";
+                    }
+                    $contact_email = htmlentities($row['contact_email']);
+                    if (empty($contact_email)) {
+                        $contact_email_display = "-";
+                    } else {
+                        $contact_email_display = "<a href='mailto:$contact_email'>$contact_email</a><button class='btn btn-sm clipboardjs' data-clipboard-text='$contact_email'><i class='far fa-copy text-secondary'></i></button>";
+                    }
+                    $contact_photo = htmlentities($row['contact_photo']);
+                    $contact_initials = initials($contact_name);
+                    $contact_notes = htmlentities($row['contact_notes']);
+                    $contact_important = intval($row['contact_important']);
+                    $contact_billing = intval($row['contact_billing']);
+                    $contact_technical = intval($row['contact_technical']);
+                    $contact_created_at = $row['contact_created_at'];
+                    if ($contact_id == $primary_contact) {
+                        $primary_contact_display = "<small class='text-success'>Primary Contact</small>";
+                    } else {
+                        $primary_contact_display = FALSE;
+                    }
+                    $contact_location_id = $row['contact_location_id'];
+                    $location_name = htmlentities($row['location_name']);
+                    if (empty($location_name)) {
+                        $location_name_display = "-";
+                    } else {
+                        $location_name_display = $location_name;
+                    }
+                    $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");
+                    $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");
+                    $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");
+                    $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");
+                    $ticket_count = mysqli_num_rows($sql_related_tickets);
+
+                    ?>
+                    <tr>
+                        <th class="text-center">
+                            <a class="text-dark" href="client_contact_details.php?client_id=<?php echo $client_id; ?>&contact_id=<?php echo $contact_id; ?>">
+                                <?php if (!empty($contact_photo)) { ?>
+
+                                    <img class="img-size-50 img-circle" src="<?php echo "uploads/clients/$session_company_id/$client_id/$contact_photo"; ?>">
+
+                                <?php } else { ?>
+
+                                    <span class="fa-stack fa-2x">
+                                        <i class="fa fa-circle fa-stack-2x text-secondary"></i>
+                                        <span class="fa fa-stack-1x text-white"><?php echo $contact_initials; ?></span>
+                                    </span>
+
+                                    <br>
+
+                                <?php } ?>
+                                <div class="text-dark"><?php echo $contact_name; ?></div>
+                                <div><?php echo $contact_title_display; ?></div>
+                                <div><?php echo $primary_contact_display; ?></div>
+                            </a>
+                        </th>
+
+                        <td><?php echo $contact_department_display; ?></td>
+                        <td><?php echo $contact_email_display; ?></td>
+                        <td><?php echo $contact_phone_display; ?> <?php if (!empty($contact_extension)) { echo "x$contact_extension"; } ?></td>
+                        <td><?php echo $contact_mobile_display; ?></td>
+                        <td><?php echo $location_name_display; ?></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="client_contact_details.php?client_id=<?php echo $client_id; ?>&contact_id=<?php echo $contact_id; ?>">View Details</a>
+                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editContactModal<?php echo $contact_id; ?>">Edit</a>
+                                    <?php if ($session_user_role == 3 && $contact_id !== $primary_contact) { ?>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger" href="post.php?archive_contact=<?php echo $contact_id; ?>">Archive</a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger text-bold" href="post.php?delete_contact=<?php echo $contact_id; ?>">Delete</a>
+                                    <?php } ?>
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
+
+                    <?php
+
+                    require("client_contact_edit_modal.php");
+
+                }
+
+                ?>
+
+                </tbody>
+            </table>
+        </div>
+        <?php require_once("pagination.php"); ?>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
 </div>
 
-<?php 
+<?php
 
-include("client_contact_add_modal.php");
-include("client_contact_invite_modal.php");
-include("client_contact_import_modal.php");
-
-?>
-
-<?php include("footer.php"); ?>
\ No newline at end of file
+require_once("client_contact_add_modal.php");
+require_once("client_contact_invite_modal.php");
+require_once("client_contact_import_modal.php");
+require_once("footer.php");
diff --git a/client_delete_modal.php b/client_delete_modal.php
index 41d05cf6..1e2398f9 100644
--- a/client_delete_modal.php
+++ b/client_delete_modal.php
@@ -1,30 +1,20 @@
-<script>
-    function validateClientNameDelete(client_id) {
-        if (document.getElementById("clientNameProvided" + client_id).value === document.getElementById("clientName" + client_id).value) {
-            document.getElementById("clientDeleteButton" + client_id).className = "btn btn-danger btn-lg px-5";
-        }
-        else{
-            document.getElementById("clientDeleteButton" + client_id).className = "btn btn-danger btn-lg px-5 disabled";
-        }
-    }
-</script>
-
 <div class="modal" id="deleteClientModal<?php echo $client_id; ?>" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-body">
-      	<div class="mb-4" style="text-align: center;">
-      		<i class="far fa-10x fa-times-circle text-danger mb-3 mt-3"></i>
-      		<h2>Are you sure?</h2>
-          <h6 class="mb-4 text-secondary">Do you really want to <b>delete <?php echo $client_name; ?></b> and all associated data including financial data, logs, shared links etc.? This process cannot be undone.</h6>
-          <div class="form-group">
-            <input type="hidden" id="clientName<?php echo $client_id ?>" value="<?php echo $client_name; ?>">
-            <input class="form-control" type="text" id="clientNameProvided<?php echo $client_id ?>" onkeyup="validateClientNameDelete(<?php echo $client_id ?>)" placeholder="Please enter: '<?php echo $client_name; ?>'">
-          </div>
-      		<button type="button" class="btn btn-outline-secondary btn-lg px-5 mr-4" data-dismiss="modal">Cancel</button>
-      		<a class="btn btn-danger btn-lg px-5 disabled" id="clientDeleteButton<?php echo $client_id ?>" href="post.php?delete_client=<?php echo $client_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">Yes, Delete!</a>
-      	</div>
-      </div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-body">
+                <div class="mb-4" style="text-align: center;">
+                    <i class="far fa-10x fa-times-circle text-danger mb-3 mt-3"></i>
+                    <h2>Are you sure?</h2>
+                    <h6 class="mb-4 text-secondary">Do you really want to <b>delete <?php echo $client_name; ?></b> and all associated data including financial data, logs, shared links etc.? This process cannot be undone.</h6>
+                    <div class="form-group">
+                        <input type="hidden" id="clientName<?php echo $client_id ?>" value="<?php echo $client_name; ?>">
+                        <input class="form-control" type="text" id="clientNameProvided<?php echo $client_id ?>" onkeyup="validateClientNameDelete(<?php echo $client_id ?>)" placeholder="Please enter: '<?php echo $client_name; ?>'">
+                    </div>
+                    <button type="button" class="btn btn-outline-secondary btn-lg px-5 mr-4" data-dismiss="modal">Cancel</button>
+                    <a class="btn btn-danger btn-lg px-5 disabled" id="clientDeleteButton<?php echo $client_id ?>" href="post.php?delete_client=<?php echo $client_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">Yes, Delete!</a>
+                </div>
+            </div>
+        </div>
     </div>
-  </div>
 </div>
+<script src="js/client_delete_confirm.js"></script>
diff --git a/client_document_details.php b/client_document_details.php
index c6d2a616..dacdaafc 100644
--- a/client_document_details.php
+++ b/client_document_details.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <?php 
 
@@ -80,4 +80,4 @@ include("share_modal.php");
 
 ?>
 
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php include("footer.php"); ?>
diff --git a/client_document_edit_modal.php b/client_document_edit_modal.php
index 1be2c2d3..c61d45c5 100644
--- a/client_document_edit_modal.php
+++ b/client_document_edit_modal.php
@@ -1,51 +1,51 @@
 <div class="modal" id="editDocumentModal<?php echo $document_id; ?>" tabindex="-1">
-  <div class="modal-dialog modal-xl">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-file-alt"></i> Editing document: <strong><?php echo $document_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="document_id" value="<?php echo $document_id; ?>">
-        <div class="modal-body bg-white">  
-          
-          <div class="form-group">
-            <input type="text" class="form-control" name="name" value="<?php echo $document_name; ?>" placeholder="Name" required>
-          </div>
-          
-          <div class="form-group">
-            <textarea class="form-control summernote" name="content"><?php echo $document_content; ?></textarea>
-          </div>
-
-          <div class="form-group">
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
-              </div>
-              <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");
-                while ($row = mysqli_fetch_array($sql_folders_select)) {
-                  $folder_id_select = $row['folder_id'];
-                  $folder_name_select = htmlentities($row['folder_name']);
-                ?>
-                <option <?php if ($folder_id_select == $document_folder_id) echo "selected"; ?> value="<?php echo $folder_id_select ?>"><?php echo $folder_name_select; ?></option>
-                <?php
-                } 
-                ?>
-              </select>
+    <div class="modal-dialog modal-xl">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-file-alt"></i> Editing document: <strong><?php echo $document_name; ?></strong></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
-        
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
+                <div class="modal-body bg-white">
+
+                    <div class="form-group">
+                        <input type="text" class="form-control" name="name" value="<?php echo $document_name; ?>" placeholder="Name" required>
+                    </div>
+
+                    <div class="form-group">
+                        <textarea class="form-control summernote" name="content"><?php echo $document_content; ?></textarea>
+                    </div>
+
+                    <div class="form-group">
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
+                            </div>
+                            <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");
+                                while ($row = mysqli_fetch_array($sql_folders_select)) {
+                                    $folder_id_select = $row['folder_id'];
+                                    $folder_name_select = htmlentities($row['folder_name']);
+                                    ?>
+                                    <option <?php if ($folder_id_select == $document_folder_id) echo "selected"; ?> value="<?php echo $folder_id_select ?>"><?php echo $folder_name_select; ?></option>
+                                    <?php
+                                }
+                                ?>
+                            </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="edit_document" 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_document" 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/client_document_folder_add_modal.php b/client_document_folder_add_modal.php
index fcf0532b..4fe2fe79 100644
--- a/client_document_folder_add_modal.php
+++ b/client_document_folder_add_modal.php
@@ -1,32 +1,32 @@
 <div class="modal" id="addFolderModal" 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-folder-plus"></i> New Folder</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="client_id" value="<?php echo $client_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="fa fa-fw fa-folder"></i></span>
-              </div>
-              <input type="text" class="form-control" name="folder_name" placeholder="Folder 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-folder-plus"></i> New Folder</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="client_id" value="<?php echo $client_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="fa fa-fw fa-folder"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="folder_name" placeholder="Folder Name" required>
+                        </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="add_folder" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</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_folder" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/client_document_folder_rename_modal.php b/client_document_folder_rename_modal.php
index 1017b7ea..e8759a15 100644
--- a/client_document_folder_rename_modal.php
+++ b/client_document_folder_rename_modal.php
@@ -1,32 +1,32 @@
 <div class="modal" id="renameFolderModal<?php echo $folder_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-folder"></i> Renaming folder: <strong><?php echo $folder_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="folder_id" value="<?php echo $folder_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="fa fa-fw fa-folder"></i></span>
-              </div>
-              <input type="text" class="form-control" name="folder_name" placeholder="Folder Name" value="<?php echo $folder_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-folder"></i> Renaming folder: <strong><?php echo $folder_name; ?></strong></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="folder_id" value="<?php echo $folder_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="fa fa-fw fa-folder"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="folder_name" placeholder="Folder Name" value="<?php echo $folder_name; ?>" required>
+                        </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="rename_folder" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Rename</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="rename_folder" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Rename</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/client_document_template_add_modal.php b/client_document_template_add_modal.php
index c36386fc..01530fab 100644
--- a/client_document_template_add_modal.php
+++ b/client_document_template_add_modal.php
@@ -1,32 +1,32 @@
 <div class="modal" id="addDocumentTemplateModal" tabindex="-1">
-  <div class="modal-dialog modal-xl">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-file-alt"></i> New Document Template</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="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body bg-white">
+    <div class="modal-dialog modal-xl">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-file-alt"></i> New Document Template</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="client_id" value="<?php echo $client_id; ?>">
+                <div class="modal-body bg-white">
 
-          <div class="form-group">
-            <input type="text" class="form-control" name="name" placeholder="Template name" required autofocus>
-          </div>
+                    <div class="form-group">
+                        <input type="text" class="form-control" name="name" placeholder="Template name" required autofocus>
+                    </div>
 
-          <div class="form-group">
-            <textarea class="form-control summernote" name="content"></textarea>
-          </div>
+                    <div class="form-group">
+                        <textarea class="form-control summernote" name="content"></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_document_template" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</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_document_template" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
-
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/client_document_template_details.php b/client_document_template_details.php
index 97e055a3..b6c8ea47 100644
--- a/client_document_template_details.php
+++ b/client_document_template_details.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <?php 
 
@@ -60,4 +60,4 @@ include("client_document_template_edit_modal.php");
 
 ?>
 
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php include("footer.php"); ?>
diff --git a/client_document_template_edit_modal.php b/client_document_template_edit_modal.php
index 9905c839..7ffe9000 100644
--- a/client_document_template_edit_modal.php
+++ b/client_document_template_edit_modal.php
@@ -1,30 +1,30 @@
 <div class="modal" id="editDocumentTemplateModal<?php echo $document_id; ?>" tabindex="-1">
-  <div class="modal-dialog modal-xl">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-file-alt"></i> Editing template: <strong><?php echo $document_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="document_id" value="<?php echo $document_id; ?>">
-        <div class="modal-body bg-white">  
-          
-          <div class="form-group">
-            <input type="text" class="form-control" name="name" value="<?php echo $document_name; ?>" placeholder="Name" required>
-          </div>
-          
-          <div class="form-group">
-            <textarea class="form-control summernote" name="content"><?php echo $document_content; ?></textarea>
-          </div>
-        
+    <div class="modal-dialog modal-xl">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-file-alt"></i> Editing template: <strong><?php echo $document_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="document_id" value="<?php echo $document_id; ?>">
+                <div class="modal-body bg-white">
+
+                    <div class="form-group">
+                        <input type="text" class="form-control" name="name" value="<?php echo $document_name; ?>" placeholder="Name" required>
+                    </div>
+
+                    <div class="form-group">
+                        <textarea class="form-control summernote" name="content"><?php echo $document_content; ?></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_document_template" 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_document_template" 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/client_document_templates.php b/client_document_templates.php
index d419b2b1..9d259903 100644
--- a/client_document_templates.php
+++ b/client_document_templates.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <?php
 
@@ -127,4 +127,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 <?php include("client_document_template_add_modal.php"); ?>
 
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php include("footer.php"); ?>
diff --git a/client_document_view_modal.php b/client_document_view_modal.php
index fcfa2f0c..758afffc 100644
--- a/client_document_view_modal.php
+++ b/client_document_view_modal.php
@@ -1,15 +1,15 @@
 <div class="modal" id="viewDocumentModal<?php echo $document_id; ?>" tabindex="-1">
-  <div class="modal-dialog modal-xl">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-file-alt mr-2"></i><?php echo $document_name; ?></h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body bg-white">
-        <?php echo $document_content; ?>
-      </div>
+    <div class="modal-dialog modal-xl">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title text-white"><i class="fa fa-fw fa-file-alt mr-2"></i><?php echo $document_name; ?></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body bg-white">
+                <?php echo $document_content; ?>
+            </div>
+        </div>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/client_documents.php b/client_documents.php
index a8ed8e59..a103f205 100644
--- a/client_documents.php
+++ b/client_documents.php
@@ -1,26 +1,26 @@
-<?php include("inc_all_client.php"); ?>
-
 <?php
 
+require_once("inc_all_client.php");
+
 // Folder
 if (!empty($_GET['folder_id'])) {
-  $folder = intval($_GET['folder_id']);
-}else{
-  $folder = 0;
+    $folder = intval($_GET['folder_id']);
+} else {
+    $folder = 0;
 }
 
 // Sort by
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
-  $sb = "document_name";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+} else {
+    $sb = "document_name";
 }
 
 // Search query SQL snippet
 if (!empty($q)) {
-  $query_snippet = "AND (MATCH(document_content_raw) AGAINST ('$q') OR document_name LIKE '%$q%')";
-}else{
-  $query_snippet = ""; // empty
+    $query_snippet = "AND (MATCH(document_content_raw) AGAINST ('$q') OR document_name LIKE '%$q%')";
+} else {
+    $query_snippet = ""; // empty
 }
 
 //Rebuild URL
@@ -29,7 +29,7 @@ $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o
 // Folder ID
 $get_folder_id = 0;
 if (!empty($_GET['folder_id'])) {
-  $get_folder_id = intval($_GET['folder_id']);
+    $get_folder_id = intval($_GET['folder_id']);
 }
 
 $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM documents
@@ -45,183 +45,181 @@ $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-alt"></i> Documents
-    </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_document_templates.php?client_id=<?php echo $client_id; ?>">Templates</a>
-    </div>
-
-    <div class="card-tools">
-
-      <div class="btn-group">
-        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDocumentModal">
-          <i class="fas fa-fw fa-plus"></i> New Document
-        </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="#addFolderModal"><i class="fa fa-fw fa-folder-plus"></i> Folder</a>
-          <div class="dropdown-divider"></div>
-          <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addDocumentFromTemplateModal">From Template</a>
-        </div>
-      </div>
-
-    </div>
-
-  </div>
-  <div class="card-body">
-    <div class="row">
-      <div class="col-md-3 border-right">
-        <h4>Folders</h4>
-        <hr>
-        <ul class="nav nav-pills flex-column bg-light">
-          <li class="nav-item">
-            <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");
-          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"));
-            $num_documents = $row['num'];
-
-          ?>
-          
-          <li class="nav-item">
-            <div class="row">
-              <div class="col-10">
-                <a class="nav-link <?php if ($get_folder_id == $folder_id) { echo "active"; } ?> " href="?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $folder_id; ?>">
-                  <?php
-                  if ($get_folder_id == $folder_id) { ?>
-                  <i class="fas fa-fw fa-folder-open"></i> 
-                  <?php
-                  }else{
-                  ?>
-                  <i class="fas fa-fw fa-folder"></i>
-                  <?php } ?>
-
-                  <?php echo $folder_name; ?> <?php if ($num_documents > 0) { echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_documents</span>"; } ?>
-                </a> 
-              </div>
-              <div class="col-2">
-                <div class="dropdown">
-                  <button class="btn btn-sm" type="button" data-toggle="dropdown">
-                    <i class="fas fa-ellipsis-v"></i>
-                  </button>
-                  <div class="dropdown-menu">
-                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#renameFolderModal<?php echo $folder_id; ?>">Rename</a>
-                    <?php if ($session_user_role == 3) { ?>
-                      <div class="dropdown-divider"></div>
-                      <a class="dropdown-item text-danger" href="post.php?delete_folder=<?php echo $folder_id; ?>">Delete</a>
-                    <?php } ?>
-                  </div>
-                </div>
-              </div>
+    <div class="card card-dark">
+        <div class="card-header py-2">
+            <h3 class="card-title mt-2">
+                <i class="fa fa-fw fa-file-alt"></i> Documents
+            </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_document_templates.php?client_id=<?php echo $client_id; ?>">Templates</a>
             </div>
-          </li>
-        
-          <?php 
-          include("client_document_folder_rename_modal.php");
 
-          } 
-          ?>
-        </ul>
-        <?php include("client_document_folder_add_modal.php"); ?>
-      </div>
+            <div class="card-tools">
 
-      <div class="col-md-9">
-        <form autocomplete="off">
-          <input type="hidden" name="client_id" value="<?php echo intval($client_id); ?>">
-          <input type="hidden" name="folder_id" value="<?php echo $get_folder_id; ?>">
-          <div class="input-group">
-            <input type="search" class="form-control " name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Documents">
-            <div class="input-group-append">
-              <button class="btn btn-secondary"><i class="fa fa-search"></i></button>
-            </div>
-          </div>
-        </form>
-        <hr>
-
-        <div class="table-responsive">
-          <table class="table table-striped table-sm 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=document_name&o=<?php echo $disp; ?>">Name</a>
-                </th>
-                <th>
-                  <a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=document_created_at&o=<?php echo $disp; ?>">Created</a>
-                </th>
-                <th>
-                  <a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=document_updated_at&o=<?php echo $disp; ?>">Updated</a>
-                </th>
-                <th class="text-center">
-                  Action
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              <?php
-          
-              while ($row = mysqli_fetch_array($sql)) {
-                $document_id = $row['document_id'];
-                $document_name = htmlentities($row['document_name']);
-                $document_content = $row['document_content'];
-                $document_created_at = $row['document_created_at'];
-                $document_updated_at = $row['document_updated_at'];
-                $document_folder_id = $row['document_folder_id'];
-
-              ?>
-
-              <tr>
-                <td>
-                  <a href="client_document_details.php?client_id=<?php echo $client_id; ?>&document_id=<?php echo $document_id; ?>"><i class="fas fa-fw fa-file-alt"></i> <?php echo $document_name; ?></a>
-                </td>
-                <td><?php echo $document_created_at; ?></td>
-                <td><?php echo $document_updated_at; ?></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="btn-group">
+                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDocumentModal">
+                        <i class="fas fa-fw fa-plus"></i> New Document
                     </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="#editDocumentModal<?php echo $document_id; ?>">Edit</a>
-                      <a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'Document', $document_id"; ?>)">Share</a>
-                      <?php if ($session_user_role == 3) { ?>
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addFolderModal"><i class="fa fa-fw fa-folder-plus"></i> Folder</a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-danger" href="post.php?delete_document=<?php echo $document_id; ?>">Delete</a>
-                      <?php } ?>
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addDocumentFromTemplateModal">From Template</a>
                     </div>
-                  </div>
-                  <?php include("client_document_view_modal.php"); ?>      
-                </td>
-              </tr>
+                </div>
 
-              <?php
-              
-              include("client_document_edit_modal.php");
-              }
+            </div>
 
-              ?>
-
-            </tbody>
-          </table>
-          <br>
         </div>
-        <?php include("pagination.php"); ?>
-      </div>
+        <div class="card-body">
+            <div class="row">
+                <div class="col-md-3 border-right">
+                    <h4>Folders</h4>
+                    <hr>
+                    <ul class="nav nav-pills flex-column bg-light">
+                        <li class="nav-item">
+                            <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");
+                        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"));
+                            $num_documents = $row['num'];
+
+                            ?>
+
+                            <li class="nav-item">
+                                <div class="row">
+                                    <div class="col-10">
+                                        <a class="nav-link <?php if ($get_folder_id == $folder_id) { echo "active"; } ?> " href="?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $folder_id; ?>">
+                                            <?php
+                                            if ($get_folder_id == $folder_id) { ?>
+                                                <i class="fas fa-fw fa-folder-open"></i>
+                                            <?php } else { ?>
+                                                <i class="fas fa-fw fa-folder"></i>
+                                            <?php } ?>
+
+                                            <?php echo $folder_name; ?> <?php if ($num_documents > 0) { echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_documents</span>"; } ?>
+                                        </a>
+                                    </div>
+                                    <div class="col-2">
+                                        <div class="dropdown">
+                                            <button class="btn btn-sm" type="button" data-toggle="dropdown">
+                                                <i class="fas fa-ellipsis-v"></i>
+                                            </button>
+                                            <div class="dropdown-menu">
+                                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#renameFolderModal<?php echo $folder_id; ?>">Rename</a>
+                                                <?php if ($session_user_role == 3) { ?>
+                                                    <div class="dropdown-divider"></div>
+                                                    <a class="dropdown-item text-danger" href="post.php?delete_folder=<?php echo $folder_id; ?>">Delete</a>
+                                                <?php } ?>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </li>
+
+                            <?php
+                            require("client_document_folder_rename_modal.php");
+
+                        }
+                        ?>
+                    </ul>
+                    <?php require_once("client_document_folder_add_modal.php"); ?>
+                </div>
+
+                <div class="col-md-9">
+                    <form autocomplete="off">
+                        <input type="hidden" name="client_id" value="<?php echo intval($client_id); ?>">
+                        <input type="hidden" name="folder_id" value="<?php echo $get_folder_id; ?>">
+                        <div class="input-group">
+                            <input type="search" class="form-control " name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Documents">
+                            <div class="input-group-append">
+                                <button class="btn btn-secondary"><i class="fa fa-search"></i></button>
+                            </div>
+                        </div>
+                    </form>
+                    <hr>
+
+                    <div class="table-responsive">
+                        <table class="table table-striped table-sm 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=document_name&o=<?php echo $disp; ?>">Name</a>
+                                </th>
+                                <th>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=document_created_at&o=<?php echo $disp; ?>">Created</a>
+                                </th>
+                                <th>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=document_updated_at&o=<?php echo $disp; ?>">Updated</a>
+                                </th>
+                                <th class="text-center">
+                                    Action
+                                </th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <?php
+
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $document_id = $row['document_id'];
+                                $document_name = htmlentities($row['document_name']);
+                                $document_content = $row['document_content'];
+                                $document_created_at = $row['document_created_at'];
+                                $document_updated_at = $row['document_updated_at'];
+                                $document_folder_id = $row['document_folder_id'];
+
+                                ?>
+
+                                <tr>
+                                    <td>
+                                        <a href="client_document_details.php?client_id=<?php echo $client_id; ?>&document_id=<?php echo $document_id; ?>"><i class="fas fa-fw fa-file-alt"></i> <?php echo $document_name; ?></a>
+                                    </td>
+                                    <td><?php echo $document_created_at; ?></td>
+                                    <td><?php echo $document_updated_at; ?></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="#editDocumentModal<?php echo $document_id; ?>">Edit</a>
+                                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'Document', $document_id"; ?>)">Share</a>
+                                                <?php if ($session_user_role == 3) { ?>
+                                                    <div class="dropdown-divider"></div>
+                                                    <a class="dropdown-item text-danger" href="post.php?delete_document=<?php echo $document_id; ?>">Delete</a>
+                                                <?php } ?>
+                                            </div>
+                                        </div>
+                                        <?php require("client_document_view_modal.php"); ?>
+                                    </td>
+                                </tr>
+
+                                <?php
+
+                                require("client_document_edit_modal.php");
+                            }
+
+                            ?>
+
+                            </tbody>
+                        </table>
+                        <br>
+                    </div>
+                    <?php require_once("pagination.php"); ?>
+                </div>
+            </div>
+        </div>
     </div>
-  </div>
-</div>
-  
 
-<?php include("share_modal.php"); ?>
-<?php include("client_document_add_modal.php"); ?>
-<?php include("client_document_add_from_template_modal.php"); ?>
 
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php
+require_once("share_modal.php");
+require_once("client_document_add_modal.php");
+require_once("client_document_add_from_template_modal.php");
+require_once("footer.php");
diff --git a/client_domain_add_modal.php b/client_domain_add_modal.php
index 8b144228..95b21c9f 100644
--- a/client_domain_add_modal.php
+++ b/client_domain_add_modal.php
@@ -1,90 +1,84 @@
 <div class="modal" id="addDomainModal" 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-globe"></i> New Domain</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="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body bg-white">    
-          
-          <div class="form-group">
-            <label>Domain 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-globe"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" placeholder="example.com" 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-globe"></i> New Domain</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Registrar</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
-              </div>
-              <select class="form-control select2" name="registrar">
-                <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"); 
-                while ($row = mysqli_fetch_array($sql)) {
-                  $vendor_id = $row['vendor_id'];
-                  $vendor_name = htmlentities($row['vendor_name']);
-                ?>
-                <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-        
-          <div class="form-group">
-            <label>Webhost</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
-              </div>
-              <select class="form-control select2" name="webhost">
-                <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"); 
-                while ($row = mysqli_fetch_array($sql)) {
-                  $vendor_id = $row['vendor_id'];
-                  $vendor_name = htmlentities($row['vendor_name']);
-                ?>
-                <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-        
-          <div class="form-group">
-            <label>Expire Date</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="expire" max="2999-12-31">
-            </div>
-          </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <div class="modal-body bg-white">
 
+                    <div class="form-group">
+                        <label>Domain 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-globe"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="name" placeholder="example.com" required autofocus>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Registrar</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
+                            </div>
+                            <select class="form-control select2" name="registrar">
+                                <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");
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $vendor_id = $row['vendor_id'];
+                                    $vendor_name = htmlentities($row['vendor_name']);
+                                    ?>
+                                    <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Webhost</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
+                            </div>
+                            <select class="form-control select2" name="webhost">
+                                <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");
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $vendor_id = $row['vendor_id'];
+                                    $vendor_name = htmlentities($row['vendor_name']);
+                                    ?>
+                                    <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Expire Date</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="expire" max="2999-12-31">
+                        </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="add_domain" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</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_domain" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/client_domain_edit_modal.php b/client_domain_edit_modal.php
index 00ea8309..bef85b9a 100644
--- a/client_domain_edit_modal.php
+++ b/client_domain_edit_modal.php
@@ -1,137 +1,137 @@
 <div class="modal" id="editDomainModal" 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-globe"></i> Editing domain: <span class="text-bold" id="editHeader"></span></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="domain_id" value="" id="editDomainId">
-        <div class="modal-body bg-white">
-
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-overview">Overview</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-records">Records</a>
-            </li>
-          </ul>
-
-          <hr>
-
-          <div class="tab-content">
-
-            <div class="tab-pane fade show active" id="pills-overview">
-
-              <div class="form-group">
-                <label>Domain 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-globe"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="name" id="editDomainName" placeholder="Domain name example.com" value="" required>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Domain Registrar</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
-                  </div>
-                  <select class="form-control select2" name="registrar" id="editRegistrarId">
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Webhost</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
-                  </div>
-                  <select class="form-control select2" name="webhost" id="editWebhostId">
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Expire Date</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" id="editExpire" name="expire" max="2999-12-31">
-                </div>
-              </div>
-
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-globe"></i> Editing domain: <span class="text-bold" id="editHeader"></span></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="domain_id" value="" id="editDomainId">
+                <div class="modal-body bg-white">
 
-            <div class="tab-pane fade" id="pills-records">
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-overview">Overview</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-records">Records</a>
+                        </li>
+                    </ul>
+
+                    <hr>
+
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-overview">
+
+                            <div class="form-group">
+                                <label>Domain 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-globe"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" id="editDomainName" placeholder="Domain name example.com" value="" required>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Domain Registrar</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="registrar" id="editRegistrarId">
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Webhost</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="webhost" id="editWebhostId">
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Expire Date</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" id="editExpire" name="expire" max="2999-12-31">
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-records">
+
+                            <div class="form-group">
+                                <label>Domain IP(s)</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
+                                    </div>
+                                    <textarea class="form-control" id="editDomainIP" name="domain_ip" rows="1" disabled></textarea>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Name Servers</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-crown"></i></span>
+                                    </div>
+                                    <textarea class="form-control" id="editNameServers" name="name_servers" rows="1" disabled></textarea>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>MX Records</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-mail-bulk"></i></span>
+                                    </div>
+                                    <textarea class="form-control" id="editMailServers" name="mail_servers" rows="1" disabled></textarea>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>TXT Records</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-check-double"></i></span>
+                                    </div>
+                                    <textarea class="form-control" id="editTxtRecords" name="txt_records" rows="1" disabled></textarea>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Raw WHOIS</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-search-plus"></i></span>
+                                    </div>
+                                    <textarea class="form-control" id="editRawWhois" name="raw_whois" rows="6" disabled></textarea>
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </div>
 
-              <div class="form-group">
-                <label>Domain IP(s)</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
-                  </div>
-                  <textarea class="form-control" id="editDomainIP" name="domain_ip" rows="1" disabled></textarea>
                 </div>
-              </div>
-
-              <div class="form-group">
-                <label>Name Servers</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-crown"></i></span>
-                  </div>
-                  <textarea class="form-control" id="editNameServers" name="name_servers" rows="1" disabled></textarea>
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="edit_domain" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
                 </div>
-              </div>
-
-              <div class="form-group">
-                <label>MX Records</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-mail-bulk"></i></span>
-                  </div>
-                  <textarea class="form-control" id="editMailServers" name="mail_servers" rows="1" disabled></textarea>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>TXT Records</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-check-double"></i></span>
-                  </div>
-                  <textarea class="form-control" id="editTxtRecords" name="txt_records" rows="1" disabled></textarea>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Raw WHOIS</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-search-plus"></i></span>
-                  </div>
-                  <textarea class="form-control" id="editRawWhois" name="raw_whois" rows="6" disabled></textarea>
-                </div>
-              </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_domain" 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/client_domains.php b/client_domains.php
index 776bb779..d03133f5 100644
--- a/client_domains.php
+++ b/client_domains.php
@@ -1,11 +1,11 @@
-<?php include("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 = "domain_name";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+} else {
+    $sb = "domain_name";
 }
 
 //Rebuild URL
@@ -19,182 +19,104 @@ $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-globe"></i> Domains</h3>
-    <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDomainModal"><i class="fas fa-fw fa-plus"></i> New Domain</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 Domains">
-            <div class="input-group-append">
-              <button class="btn btn-dark"><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-globe"></i> Domains</h3>
+            <div class="card-tools">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDomainModal"><i class="fas fa-fw fa-plus"></i> New Domain</button>
             </div>
-          </div>
         </div>
 
-        <div class="col-md-8">
-          <div class="float-right">
-            <a href="post.php?export_client_domains_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
-          </div>
-        </div>
+        <div class="card-body">
+            <form autocomplete="off">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <div class="row">
 
-      </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=domain_name&o=<?php echo $disp; ?>">Domain</a></th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_name&o=<?php echo $disp; ?>">Registrar</a></th>
-            <th>Web Host</th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=domain_expire&o=<?php echo $disp; ?>">Expires</a></th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $domain_id = $row['domain_id'];
-            $domain_name = htmlentities($row['domain_name']);
-            $domain_registrar = htmlentities($row['domain_registrar']);
-            $domain_webhost = htmlentities($row['domain_webhost']);
-            $domain_expire = htmlentities($row['domain_expire']);
-            $domain_registrar_name = htmlentities($row['vendor_name']);
-            if (empty($domain_registrar_name)) {
-              $domain_registrar_name = "-";
-            }
+                    <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 Domains">
+                            <div class="input-group-append">
+                                <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                            </div>
+                        </div>
+                    </div>
 
-            $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)) {
-              $domain_webhost_name = "-";
-            }
+                    <div class="col-md-8">
+                        <div class="float-right">
+                            <a href="post.php?export_client_domains_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
+                        </div>
+                    </div>
 
-          ?>
-          <tr>
-            <td><a class="text-dark" href="#" data-toggle="modal" onclick="populateDomainEditModal(<?php echo $client_id, ",", $domain_id ?>)" data-target="#editDomainModal"><?php echo $domain_name; ?></a></td>
-            <td><?php echo $domain_registrar_name; ?></td>
-            <td><?php echo $domain_webhost_name; ?></td>
-            <td><?php echo $domain_expire; ?></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" onclick="populateDomainEditModal(<?php echo $client_id, ",", $domain_id ?>)" data-target="#editDomainModal">Edit</a>
-                  <?php if ($session_user_role == 3) { ?>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item text-danger" href="post.php?delete_domain=<?php echo $domain_id; ?>">Delete</a>
-                  <?php } ?>
                 </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=domain_name&o=<?php echo $disp; ?>">Domain</a></th>
+                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_name&o=<?php echo $disp; ?>">Registrar</a></th>
+                        <th>Web Host</th>
+                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=domain_expire&o=<?php echo $disp; ?>">Expires</a></th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
 
-          <?php
-          }
-          ?>
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $domain_id = $row['domain_id'];
+                        $domain_name = htmlentities($row['domain_name']);
+                        $domain_registrar = htmlentities($row['domain_registrar']);
+                        $domain_webhost = htmlentities($row['domain_webhost']);
+                        $domain_expire = htmlentities($row['domain_expire']);
+                        $domain_registrar_name = htmlentities($row['vendor_name']);
+                        if (empty($domain_registrar_name)) {
+                            $domain_registrar_name = "-";
+                        }
 
-        </tbody>
-      </table>
+                        $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)) {
+                            $domain_webhost_name = "-";
+                        }
+
+                        ?>
+                        <tr>
+                            <td><a class="text-dark" href="#" data-toggle="modal" onclick="populateDomainEditModal(<?php echo $client_id, ",", $domain_id ?>)" data-target="#editDomainModal"><?php echo $domain_name; ?></a></td>
+                            <td><?php echo $domain_registrar_name; ?></td>
+                            <td><?php echo $domain_webhost_name; ?></td>
+                            <td><?php echo $domain_expire; ?></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" onclick="populateDomainEditModal(<?php echo $client_id, ",", $domain_id ?>)" data-target="#editDomainModal">Edit</a>
+                                        <?php if ($session_user_role == 3) { ?>
+                                            <div class="dropdown-divider"></div>
+                                            <a class="dropdown-item text-danger" href="post.php?delete_domain=<?php echo $domain_id; ?>">Delete</a>
+                                        <?php } ?>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                        <?php
+                    }
+                    ?>
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once("pagination.php"); ?>
+        </div>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
-</div>
+    <script src="js/domain_edit_modal.js"></script>
 
 <?php
-include("client_domain_edit_modal.php");
-include("client_domain_add_modal.php");
-?>
-
-<script>
-    function populateDomainEditModal(client_id, domain_id) {
-
-        // Send a GET request to post.php as post.php?domain_get_json_details=true&client_id=NUM&domain_id=NUM
-        jQuery.get(
-            "ajax.php",
-            {domain_get_json_details: 'true', client_id: client_id, domain_id: domain_id},
-            function(data) {
-
-                // If we get a response from post.php, parse it as JSON
-                const response = JSON.parse(data);
-
-                // Access the domain info (one), registrars (multiple) and webhosts (multiple)
-                const domain = response.domain[0];
-                const vendors = response.vendors;
-
-                // Populate the domain modal fields
-                document.getElementById("editHeader").innerText = domain.domain_name;
-                document.getElementById("editDomainId").value = domain_id;
-                document.getElementById("editDomainName").value = domain.domain_name;
-                document.getElementById("editExpire").value = domain.domain_expire;
-                document.getElementById("editDomainIP").value = domain.domain_ip;
-                document.getElementById("editNameServers").value = domain.domain_name_servers;
-                document.getElementById("editMailServers").value = domain.domain_mail_servers;
-                document.getElementById("editTxtRecords").value = domain.domain_txt;
-                document.getElementById("editRawWhois").value = domain.domain_raw_whois;
-
-                /* DROPDOWNS */
-
-                // Registrar dropdown
-                var registrarDropdown = document.getElementById("editRegistrarId");
-
-                // Clear registrar dropdown
-                var i, L = registrarDropdown.options.length -1;
-                for(i = L; i >= 0; i--) {
-                    registrarDropdown.remove(i);
-                }
-                registrarDropdown[registrarDropdown.length] = new Option('- Vendor -', '0');
-
-                // Populate dropdown
-                vendors.forEach(vendor => {
-                    if (parseInt(vendor.vendor_id) == parseInt(domain.domain_registrar)) {
-                        // Selected domain
-                        registrarDropdown[registrarDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id, true, true);
-                    }
-                    else{
-                        registrarDropdown[registrarDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id);
-                    }
-                });
-
-                // Webhost dropdown
-                var webhostDropdown = document.getElementById("editWebhostId");
-
-                // Clear registrar dropdown
-                var i, L = webhostDropdown.options.length -1;
-                for(i = L; i >= 0; i--) {
-                    webhostDropdown.remove(i);
-                }
-                webhostDropdown[webhostDropdown.length] = new Option('- Vendor -', '0');
-
-                // Populate dropdown
-                vendors.forEach(vendor => {
-                    if (parseInt(vendor.vendor_id) == parseInt(domain.domain_webhost)) {
-                        // Selected domain
-                        webhostDropdown[webhostDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id, true, true);
-                    }
-                    else{
-                        webhostDropdown[webhostDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id);
-                    }
-                });
-
-
-            }
-        );
-    }
-</script>
-
-<?php include("footer.php"); ?>
\ No newline at end of file
+require_once("client_domain_edit_modal.php");
+require_once("client_domain_add_modal.php");
+require_once("footer.php");
diff --git a/client_edit_modal.php b/client_edit_modal.php
index 496d8663..d694c73f 100644
--- a/client_edit_modal.php
+++ b/client_edit_modal.php
@@ -1,178 +1,175 @@
 <div class="modal" id="editClientModal<?php echo $client_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 mr-2"></i>Editing: <strong><?php echo $client_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="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body bg-white">
-          
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-client-details<?php echo $client_id; ?>">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-client-notes<?php echo $client_id; ?>">Notes</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-client-tag<?php echo $client_id; ?>">Tag</a>
-            </li>
-          </ul>
-
-          <hr>
-          
-          <div class="tab-content">
-
-            <div class="tab-pane fade show active" id="pills-client-details<?php echo $client_id; ?>">
-
-              <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="Name or Company" value="<?php echo $client_name; ?>" required>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Industry</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-briefcase"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="type" placeholder="Industry" value="<?php echo $client_type; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Referral</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-smile-wink"></i></span>
-                  </div>
-                  <select class="form-control select2" name="referral">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($referral_sql)) {
-                      $referral = htmlentities($row['category_name']);
-                    ?>
-                      <option <?php if ($client_referral == $referral) { echo "selected"; } ?> > <?php echo $referral; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                  <div class="input-group-append">
-                    <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickReferralModal"><i class="fas fa-fw fa-plus"></i></button>
-                  </div>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Website</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="website" placeholder="ex. google.com" value="<?php echo $client_website; ?>">
-                </div>
-              </div>
-              
-              <?php if ($config_module_enable_accounting) { ?>
-              <div class="form-group">
-                <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 ($client_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">
-                <label>Invoice Net Terms</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>
-                  <select class="form-control select2" name="net_terms">
-                    <option value="">- Net Terms -</option>
-                    <?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
-                    <option <?php if ($net_term_value == $client_net_terms) { echo "selected"; } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-              
-              <?php }else{ ?>
-              
-              <input type="hidden" name="currency_code" value="<?php echo $currency_code; ?>">
-              <input type="hidden" name="net_terms" value="<?php echo $net_term_value; ?>">
-              <?php } ?>
-
+    <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 mr-2"></i>Editing: <strong><?php echo $client_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="client_id" value="<?php echo $client_id; ?>">
+                <div class="modal-body bg-white">
 
-            <div class="tab-pane fade" id="pills-client-notes<?php echo $client_id; ?>">
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-client-details<?php echo $client_id; ?>">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-client-notes<?php echo $client_id; ?>">Notes</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-client-tag<?php echo $client_id; ?>">Tag</a>
+                        </li>
+                    </ul>
 
-              <div class="form-group">
-                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $client_notes; ?></textarea>
-              </div>
-            
-            </div>
+                    <hr>
 
-            <div class="tab-pane fade" id="pills-client-tag<?php echo $client_id; ?>">
+                    <div class="tab-content">
 
-              <ul class="list-group">
+                        <div class="tab-pane fade show active" id="pills-client-details<?php echo $client_id; ?>">
 
-                <?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");
+                            <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="Name or Company" value="<?php echo $client_name; ?>" required>
+                                </div>
+                            </div>
 
-                while ($row = mysqli_fetch_array($sql_tags_select)) {
-                  $tag_id_select = $row['tag_id'];
-                  $tag_name_select = htmlentities($row['tag_name']);
-                  $tag_color_select = htmlentities($row['tag_color']);
-                  $tag_icon_select = htmlentities($row['tag_icon']);
+                            <div class="form-group">
+                                <label>Industry</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-briefcase"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="type" placeholder="Industry" value="<?php echo $client_type; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Referral</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-smile-wink"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="referral">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($referral_sql)) {
+                                            $referral = htmlentities($row['category_name']);
+                                            ?>
+                                            <option <?php if ($client_referral == $referral) { echo "selected"; } ?> > <?php echo $referral; ?></option>
+
+                                            <?php
+                                        }
+                                        ?>
+                                    </select>
+                                    <div class="input-group-append">
+                                        <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickReferralModal"><i class="fas fa-fw fa-plus"></i></button>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Website</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="website" placeholder="ex. google.com" value="<?php echo $client_website; ?>">
+                                </div>
+                            </div>
+
+                            <?php if ($config_module_enable_accounting) { ?>
+                                <div class="form-group">
+                                    <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 ($client_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">
+                                    <label>Invoice Net Terms</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>
+                                        <select class="form-control select2" name="net_terms">
+                                            <option value="">- Net Terms -</option>
+                                            <?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
+                                                <option <?php if ($net_term_value == $client_net_terms) { echo "selected"; } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
+                                </div>
+
+                            <?php } else { ?>
+                                <input type="hidden" name="currency_code" value="<?php echo $currency_code; ?>">
+                                <input type="hidden" name="net_terms" value="<?php echo $net_term_value; ?>">
+                            <?php } ?>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-client-notes<?php echo $client_id; ?>">
+
+                            <div class="form-group">
+                                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $client_notes; ?></textarea>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-client-tag<?php echo $client_id; ?>">
+
+                            <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");
+
+                                while ($row = mysqli_fetch_array($sql_tags_select)) {
+                                    $tag_id_select = $row['tag_id'];
+                                    $tag_name_select = htmlentities($row['tag_name']);
+                                    $tag_color_select = htmlentities($row['tag_color']);
+                                    $tag_icon_select = htmlentities($row['tag_icon']);
+
+                                    ?>
+                                    <li class="list-group-item">
+                                        <div class="custom-control custom-checkbox">
+                                            <input class="custom-control-input" type="checkbox" id="tagCheckbox<?php echo "$tag_id_select$client_id"; ?>" name="tags[]" value="<?php echo $tag_id_select; ?>" <?php if (in_array($tag_id_select, $client_tag_id_array)) { echo "checked"; } ?>>
+                                            <label for="tagCheckbox<?php echo "$tag_id_select$client_id"; ?>" class="custom-control-label">
+                                            <span class="badge bg-<?php echo $tag_color_select; ?>">
+                                              <?php echo "<i class='fa fw fa-$tag_icon_select'></i>"; ?> <?php echo $tag_name_select; ?>
+                                            </span>
+                                            </label>
+                                        </div>
+                                    </li>
+
+                                <?php } ?>
+
+                            </ul>
+
+                        </div>
 
-                ?>
-                  <li class="list-group-item">
-                    <div class="custom-control custom-checkbox">
-                      <input class="custom-control-input" type="checkbox" id="tagCheckbox<?php echo "$tag_id_select$client_id"; ?>" name="tags[]" value="<?php echo $tag_id_select; ?>" <?php if (in_array($tag_id_select, $client_tag_id_array)) { echo "checked"; } ?>>
-                      <label for="tagCheckbox<?php echo "$tag_id_select$client_id"; ?>" class="custom-control-label">
-                        <span class="badge bg-<?php echo $tag_color_select; ?>">
-                          <?php echo "<i class='fa fw fa-$tag_icon_select'></i>"; ?> <?php echo $tag_name_select; ?>    
-                        </span>
-                      </label>
                     </div>
-                  </li>                  
-
-                <?php
-                }
-                ?>
-
-              </ul>
-
-            </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="edit_client" 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_client" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/client_events.php b/client_events.php
index 9b6abca0..45dc60c1 100644
--- a/client_events.php
+++ b/client_events.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <link href='plugins/fullcalendar/main.min.css' rel='stylesheet' />
 
@@ -95,4 +95,4 @@ while ($row = mysqli_fetch_array($sql)) {
 
   </script>
 
-  <?php include("footer.php"); ?>
\ No newline at end of file
+  <?php include("footer.php"); ?>
diff --git a/client_file_add_modal.php b/client_file_add_modal.php
index 68b8f67f..671ea4f3 100644
--- a/client_file_add_modal.php
+++ b/client_file_add_modal.php
@@ -1,36 +1,36 @@
 <div class="modal" id="addFileModal" 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-cloud-upload-alt"></i> Upload File</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="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body bg-white">
-
-          <div class="form-group">
-            <label>File name</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
-              </div>
-              <input type="text" class="form-control" name="new_name" placeholder="leave blank to use existing name">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-cloud-upload-alt"></i> Upload File</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="client_id" value="<?php echo $client_id; ?>">
+                <div class="modal-body bg-white">
 
-          <div class="form-group">
-            <input type="file" class="form-control-file" name="file" accept=".jpg, .jpeg, .gif, .png, .webp, .pdf, .txt, .doc, .docx, .csv, .xls, .xlsx, .zip, .tar, .gz">
-          </div>
+                    <div class="form-group">
+                        <label>File name</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="new_name" placeholder="leave blank to use existing name">
+                        </div>
+                    </div>
 
+                    <div class="form-group">
+                        <input type="file" class="form-control-file" name="file" accept=".jpg, .jpeg, .gif, .png, .webp, .pdf, .txt, .doc, .docx, .csv, .xls, .xlsx, .zip, .tar, .gz">
+                    </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_file" class="btn btn-primary text-bold"><i class="fa fa-fw fa-upload"></i> Upload</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_file" class="btn btn-primary text-bold"><i class="fa fa-fw fa-upload"></i> Upload</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/client_file_view_modal.php b/client_file_view_modal.php
index 05ddbe54..9903700b 100644
--- a/client_file_view_modal.php
+++ b/client_file_view_modal.php
@@ -1,17 +1,17 @@
 <div class="modal" id="viewFileModal<?php echo $file_id; ?>" tabindex="-1">
-  <div class="modal-dialog modal-xl ">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-image"></i> <?php echo $file_name; ?></h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>     
-      
-      <div style="text-align: center;">
-        <img class="img-fluid" src="<?php echo "uploads/clients/$session_company_id/$client_id/$file_reference_name"; ?>">
-      </div>
-      
+    <div class="modal-dialog modal-xl ">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-image"></i> <?php echo $file_name; ?></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+
+            <div style="text-align: center;">
+                <img class="img-fluid" src="<?php echo "uploads/clients/$session_company_id/$client_id/$file_reference_name"; ?>">
+            </div>
+
+        </div>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/client_files.php b/client_files.php
index bdc2b3b3..98ed549d 100644
--- a/client_files.php
+++ b/client_files.php
@@ -1,4 +1,6 @@
-<?php require_once("inc_all_client.php");
+<?php
+
+require_once("inc_all_client.php");
 
 $sql_files_images = mysqli_query($mysqli, "SELECT * FROM files WHERE file_client_id = $client_id AND (file_ext LIKE 'JPG' OR file_ext LIKE 'jpg' OR file_ext LIKE 'JPEG' OR file_ext LIKE 'jpeg' OR file_ext LIKE 'png' OR file_ext LIKE 'PNG') ORDER BY file_name ASC");
 
@@ -19,11 +21,8 @@ $num_of_files = mysqli_num_rows($sql_files_images) + mysqli_num_rows($sql_files_
 
             <?php
             if ($num_of_files == 0) {
-
                 echo "<div style='text-align: center;'><h3 class='text-secondary'>No Records Here</h3></div>";
-            }
-
-            ?>
+            } ?>
 
             <div class="row">
 
@@ -54,7 +53,7 @@ $num_of_files = mysqli_num_rows($sql_files_images) + mysqli_num_rows($sql_files_
                     </div>
 
                     <?php
-                    include("client_file_view_modal.php");
+                    require("client_file_view_modal.php");
                 }
                 ?>
             </div>
diff --git a/client_invoices.php b/client_invoices.php
index 1111dc51..40b80d40 100644
--- a/client_invoices.php
+++ b/client_invoices.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <?php
 
@@ -164,4 +164,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 <?php include("invoice_add_modal.php"); ?>
 
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php include("footer.php"); ?>
diff --git a/client_location_add_modal.php b/client_location_add_modal.php
index fc0aa65e..9db12960 100644
--- a/client_location_add_modal.php
+++ b/client_location_add_modal.php
@@ -1,174 +1,172 @@
 <div class="modal" id="addLocationModal" 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-map-marker-alt"></i> Creating location</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="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body bg-white">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt"></i> Creating location</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="client_id" value="<?php echo $client_id; ?>">
+                <div class="modal-body bg-white">
 
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-address">Address</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-contact">Contact</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-photo">Photo</a>
-            </li>
-          </ul>
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-address">Address</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-contact">Contact</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-photo">Photo</a>
+                        </li>
+                    </ul>
 
-          <hr>
+                    <hr>
 
-          <div class="tab-content">
+                    <div class="tab-content">
 
-            <div class="tab-pane fade show active" id="pills-address">
+                        <div class="tab-pane fade show active" id="pills-address">
+
+                            <div class="form-group">
+                                <label>Location Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary</span></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Name of location" required autofocus>
+                                    <div class="input-group-append">
+                                        <div class="input-group-text">
+                                            <input type="checkbox" name="primary_location" value="1" <?php if ($primary_location == 0) { echo "checked"; } ?>>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Address</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="address" placeholder="Street Address">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>City</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="city" placeholder="City">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>State / Province</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="state" placeholder="State or Province">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Zip / Postal Code</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Country</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="country">
+                                        <option value="">- Country -</option>
+                                        <?php foreach($countries_array as $country_name) { ?>
+                                            <option <?php if ($session_company_country == $country_name) { echo "selected"; } ?> ><?php echo $country_name; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-contact">
+
+                            <div class="form-group">
+                                <label>Contact</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>
+                                    <select class="form-control" name="contact">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($sql_contacts)) {
+                                            $contact_id = $row['contact_id'];
+                                            $contact_name = htmlentities($row['contact_name']);
+                                            ?>
+                                            <option value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?></option>
+                                        <?php } ?>
+
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Phone</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="phone" placeholder="Phone Number">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Hours</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="hours" placeholder="Hours of operation">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <textarea class="form-control" rows="6" name="notes" placeholder="Enter some notes"></textarea>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-photo">
+
+                            <div class="form-group">
+                                <input type="file" class="form-control-file" name="file">
+                            </div>
+
+                        </div>
 
-              <div class="form-group">
-                <label>Location Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary</span></label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="name" placeholder="Name of location" required autofocus>
-                  <div class="input-group-append">
-                    <div class="input-group-text">
-                      <input type="checkbox" name="primary_location" value="1" <?php if ($primary_location == 0) { echo "checked"; } ?>>
                     </div>
-                  </div>
+
                 </div>
-              </div>
-
-              <div class="form-group">
-                <label>Address</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="address" placeholder="Street Address">
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_location" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
                 </div>
-              </div>
-             
-              <div class="form-group">
-                <label>City</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="city" placeholder="City">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>State / Province</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="state" placeholder="State or Province">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Zip / Postal Code</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Country</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                  </div>
-                  <select class="form-control select2" name="country">
-                    <option value="">- Country -</option>
-                    <?php foreach($countries_array as $country_name) { ?>
-                    <option <?php if ($session_company_country == $country_name) { echo "selected"; } ?> ><?php echo $country_name; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-contact">
-
-              <div class="form-group">
-                <label>Contact</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>
-                  <select class="form-control" name="contact">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql_contacts)) {
-                      $contact_id = $row['contact_id'];
-                      $contact_name = htmlentities($row['contact_name']);
-                    ?>
-                      <option value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Phone</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="phone" placeholder="Phone Number"> 
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Hours</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="hours" placeholder="Hours of operation"> 
-                </div>
-              </div>
-
-              <div class="form-group">
-                <textarea class="form-control" rows="6" name="notes" placeholder="Enter some notes"></textarea>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-photo">
-
-              <div class="form-group">
-                <input type="file" class="form-control-file" name="file">
-              </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_location" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/client_location_edit_modal.php b/client_location_edit_modal.php
index 5ed63ee9..41856e3a 100644
--- a/client_location_edit_modal.php
+++ b/client_location_edit_modal.php
@@ -1,183 +1,181 @@
 <div class="modal" id="editLocationModal<?php echo $location_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-map-marker-alt"></i> Editing location: <strong><?php echo $location_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="location_id" value="<?php echo $location_id; ?>">
-        <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <input type="hidden" name="existing_file_name" value="<?php echo $location_photo; ?>">
-        <div class="modal-body bg-white">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt"></i> Editing location: <strong><?php echo $location_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="location_id" value="<?php echo $location_id; ?>">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <input type="hidden" name="existing_file_name" value="<?php echo $location_photo; ?>">
+                <div class="modal-body bg-white">
 
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-address<?php echo $location_id; ?>">Address</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-contact<?php echo $location_id; ?>">Contact</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-photo<?php echo $location_id; ?>">Photo</a>
-            </li>
-          </ul>
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-address<?php echo $location_id; ?>">Address</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-contact<?php echo $location_id; ?>">Contact</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-photo<?php echo $location_id; ?>">Photo</a>
+                        </li>
+                    </ul>
 
-          <hr>
+                    <hr>
 
-          <div class="tab-content">
+                    <div class="tab-content">
 
-            <div class="tab-pane fade show active" id="pills-address<?php echo $location_id; ?>">
+                        <div class="tab-pane fade show active" id="pills-address<?php echo $location_id; ?>">
+
+                            <div class="form-group">
+                                <label>Location Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary</span></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Name of location" value="<?php echo $location_name; ?>" required>
+                                    <div class="input-group-append">
+                                        <div class="input-group-text">
+                                            <input type="checkbox" name="primary_location" value="1" <?php if ($location_id == $primary_location) { echo "checked"; } ?>>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Address</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="address" placeholder="Street Address" value="<?php echo $location_address; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>City</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="city" placeholder="City" value="<?php echo $location_city; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>State / Province</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="state" placeholder="State or Province" value="<?php echo $location_state; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Zip / Postal Code</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" value="<?php echo $location_zip; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Country</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="country">
+                                        <option value="">- Country -</option>
+                                        <?php foreach($countries_array as $country_name) { ?>
+                                            <option <?php if ($location_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-contact<?php echo $location_id; ?>">
+
+                            <div class="form-group">
+                                <label>Contact</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>
+                                    <select class="form-control" name="contact">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($sql_contacts)) {
+                                            $contact_id_select = $row['contact_id'];
+                                            $contact_name_select = htmlentities($row['contact_name']);
+
+                                            ?>
+                                            <option <?php if ($location_contact_id == $contact_id_select) { echo "selected"; } ?> value="<?php echo $contact_id_select; ?>"><?php echo $contact_name_select; ?></option>
+                                        <?php } ?>
+
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Phone</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $location_phone; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Hours</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="hours" placeholder="Hours of operation" value="<?php echo $location_hours; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <textarea class="form-control" rows="5" name="notes" placeholder="Enter some notes"><?php echo $location_notes; ?></textarea>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-photo<?php echo $location_id; ?>">
+
+                            <div class="mb-3" style="text-align: center;">
+                                <?php if (!empty($location_photo)) { ?>
+                                    <img class="img-fluid" src="<?php echo "uploads/clients/$session_company_id/$client_id/$location_photo"; ?>">
+                                <?php } ?>
+                            </div>
+
+                            <div class="form-group">
+                                <input type="file" class="form-control-file" name="file">
+                            </div>
+
+                        </div>
 
-              <div class="form-group">
-                <label>Location Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary</span></label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="name" placeholder="Name of location" value="<?php echo $location_name; ?>" required>
-                  <div class="input-group-append">
-                    <div class="input-group-text">
-                      <input type="checkbox" name="primary_location" value="1" <?php if ($location_id == $primary_location) { echo "checked"; } ?>>
                     </div>
-                  </div>
+
                 </div>
-              </div>
-
-              <div class="form-group">
-                <label>Address</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="address" placeholder="Street Address" value="<?php echo $location_address; ?>">
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="edit_location" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
                 </div>
-              </div>
-
-              <div class="form-group">
-                <label>City</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="city" placeholder="City" value="<?php echo $location_city; ?>">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>State / Province</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="state" placeholder="State or Province" value="<?php echo $location_state; ?>">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Zip / Postal Code</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" value="<?php echo $location_zip; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Country</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                  </div>
-                  <select class="form-control select2" name="country">
-                    <option value="">- Country -</option>
-                    <?php foreach($countries_array as $country_name) { ?>
-                    <option <?php if ($location_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-contact<?php echo $location_id; ?>">
-
-              <div class="form-group">
-                <label>Contact</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>
-                  <select class="form-control" name="contact">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql_contacts)) {
-                      $contact_id_select = $row['contact_id'];
-                      $contact_name_select = htmlentities($row['contact_name']);
-
-                    ?>
-                      <option <?php if ($location_contact_id == $contact_id_select) { echo "selected"; } ?> value="<?php echo $contact_id_select; ?>"><?php echo $contact_name_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Phone</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $location_phone; ?>"> 
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Hours</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="hours" placeholder="Hours of operation" value="<?php echo $location_hours; ?>"> 
-                </div>
-              </div>
-
-              <div class="form-group">
-                <textarea class="form-control" rows="5" name="notes" placeholder="Enter some notes"><?php echo $location_notes; ?></textarea>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-photo<?php echo $location_id; ?>">
-
-              <div class="mb-3" style="text-align: center;">
-                <?php if (!empty($location_photo)) { ?>
-                <img class="img-fluid" src="<?php echo "uploads/clients/$session_company_id/$client_id/$location_photo"; ?>">
-                <?php } ?>
-              </div>
-
-              <div class="form-group">
-                <input type="file" class="form-control-file" name="file">
-              </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_location" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/client_locations.php b/client_locations.php
index a8b8cacc..22255184 100644
--- a/client_locations.php
+++ b/client_locations.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <?php 
  
@@ -156,4 +156,4 @@ include("client_location_import_modal.php");
 
 ?>
 
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php include("footer.php"); ?>
diff --git a/client_login_add_modal.php b/client_login_add_modal.php
index 74e7abe6..57f83bb4 100644
--- a/client_login_add_modal.php
+++ b/client_login_add_modal.php
@@ -1,215 +1,215 @@
 <div class="modal" id="addLoginModal" 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> New Login</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="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body bg-white">  
+    <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> New Login</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="client_id" value="<?php echo $client_id; ?>">
+                <div class="modal-body bg-white">
 
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-relation">Relation</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
-            </li>
-          </ul>
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-relation">Relation</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
+                        </li>
+                    </ul>
 
-          <hr>
-          
-          <div class="tab-content">
+                    <hr>
 
-            <div class="tab-pane fade show active" id="pills-details">
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-details">
+
+                            <div class="form-group">
+                                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Important?</span></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Name of Login" required autofocus>
+                                    <div class="input-group-append">
+                                        <div class="input-group-text">
+                                            <input type="checkbox" name="important" value="1">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Username</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="username" placeholder="Username">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Password <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-lock"></i></span>
+                                    </div>
+                                    <input type="password" class="form-control" data-toggle="password" id="password" name="password" placeholder="Password" required autocomplete="new-password">
+                                    <div class="input-group-append">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                                    </div>
+                                    <div class="input-group-append">
+                                        <span class="btn btn-default"><i class="fa fa-fw fa-question" onclick="generatePassword()"></i></span>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>OTP</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                                    </div>
+                                    <input type="password" class="form-control" data-toggle="password" name="otp_secret" placeholder="Insert secret key">
+                                    <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>URL/Host</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="uri" placeholder="ex. google.com">
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-relation">
+
+                            <div class="form-group">
+                                <label>Contact</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>
+                                    <select class="form-control" name="contact">
+                                        <option value="">- Contact -</option>
+                                        <?php
+
+                                        $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']);
+                                            ?>
+                                            <option value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?></option>
+
+                                            <?php
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Vendor</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" name="vendor">
+                                        <option value="">- Vendor -</option>
+                                        <?php
+
+                                        $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']);
+                                            ?>
+                                            <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
+
+                                            <?php
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Asset</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" name="asset">
+                                        <option value="">- Asset -</option>
+                                        <?php
+
+                                        $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']);
+                                            ?>
+                                            <option value="<?php echo $asset_id; ?>"><?php echo $asset_name; ?></option>
+
+                                            <?php
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>software</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-box"></i></span>
+                                    </div>
+                                    <select class="form-control" name="software">
+                                        <option value="">- software -</option>
+                                        <?php
+
+                                        $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']);
+                                            ?>
+                                            <option value="<?php echo $software_id; ?>"><?php echo $software_name; ?></option>
+
+                                            <?php
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-notes">
+
+                            <div class="form-group">
+                                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="note"></textarea>
+                            </div>
+
+                        </div>
 
-              <div class="form-group">
-                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Important?</span></label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="name" placeholder="Name of Login" required autofocus>
-                  <div class="input-group-append">
-                    <div class="input-group-text">
-                      <input type="checkbox" name="important" value="1">
                     </div>
-                  </div>
                 </div>
-              </div>
-            
-              <div class="form-group">
-                <label>Username</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="username" placeholder="Username">
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_login" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
                 </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Password <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-lock"></i></span>
-                  </div>
-                  <input type="password" class="form-control" data-toggle="password" id="password" name="password" placeholder="Password" required autocomplete="new-password">
-                  <div class="input-group-append">
-                    <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                  </div>
-                  <div class="input-group-append">
-                    <span class="btn btn-default"><i class="fa fa-fw fa-question" onclick="generatePassword()"></i></span>
-                  </div>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>OTP</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                  </div>
-                  <input type="password" class="form-control" data-toggle="password" name="otp_secret" placeholder="Insert secret key">
-                  <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>URL/Host</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="uri" placeholder="ex. google.com">
-                </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-relation">
-
-              <div class="form-group">
-                <label>Contact</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>
-                  <select class="form-control" name="contact">
-                    <option value="">- Contact -</option>
-                    <?php 
-                    
-                    $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']);
-                    ?>
-                      <option value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Vendor</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" name="vendor">
-                    <option value="">- Vendor -</option>
-                    <?php 
-                    
-                    $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']);
-                    ?>
-                      <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-            
-              <div class="form-group">
-                <label>Asset</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" name="asset">
-                    <option value="">- Asset -</option>
-                    <?php 
-                    
-                    $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']);
-                    ?>
-                      <option value="<?php echo $asset_id; ?>"><?php echo $asset_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-            
-              <div class="form-group">
-                <label>software</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-box"></i></span>
-                  </div>
-                  <select class="form-control" name="software">
-                    <option value="">- software -</option>
-                    <?php 
-                    
-                    $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']);
-                    ?>
-                      <option value="<?php echo $software_id; ?>"><?php echo $software_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-notes">
-
-              <div class="form-group">
-                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="note"></textarea>
-              </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_login" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/client_login_edit_modal.php b/client_login_edit_modal.php
index 86108f55..b0d991ae 100644
--- a/client_login_edit_modal.php
+++ b/client_login_edit_modal.php
@@ -1,222 +1,213 @@
 <div class="modal" id="editLoginModal<?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> Editing password: <strong><?php echo $login_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="login_id" value="<?php echo $login_id; ?>">
-        <div class="modal-body bg-white">  
+    <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> Editing password: <strong><?php echo $login_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="login_id" value="<?php echo $login_id; ?>">
+                <div class="modal-body bg-white">
 
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $login_id; ?>">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-relation<?php echo $login_id; ?>">Relation</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $login_id; ?>">Notes</a>
-            </li>
-          </ul>
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $login_id; ?>">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-relation<?php echo $login_id; ?>">Relation</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $login_id; ?>">Notes</a>
+                        </li>
+                    </ul>
 
-          <hr>
-          
-          <div class="tab-content">
+                    <hr>
 
-            <div class="tab-pane fade show active" id="pills-details<?php echo $login_id; ?>">
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-details<?php echo $login_id; ?>">
+
+                            <div class="form-group">
+                                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Important?</span></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Name of Login" value="<?php echo $login_name; ?>" required>
+                                    <div class="input-group-append">
+                                        <div class="input-group-text">
+                                            <input type="checkbox" name="important" value="1" <?php if ($login_important == 1) { echo "checked"; } ?>>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Username</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="username" placeholder="Username" value="<?php echo $login_username; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Password <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-lock"></i></span>
+                                    </div>
+                                    <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Password" value="<?php echo $login_password; ?>" required autocomplete="new-password">
+                                    <div class="input-group-append">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                                    </div>
+                                    <div class="input-group-append">
+                                        <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_password; ?>"><i class="fa fa-fw fa-copy"></i></button>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>OTP</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                                    </div>
+                                    <input type="password" class="form-control" data-toggle="password" name="otp_secret" value="<?php echo $login_otp_secret; ?>" placeholder="Insert secret key">
+                                    <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>URL/Host</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="uri" placeholder="ex. google.com" value="<?php echo $login_uri; ?>">
+                                    <div class="input-group-append">
+
+                                        <a href="<?php echo $login_uri; ?>" class="input-group-text"><i class="fa fa-fw fa-link"></i></a>
+                                    </div>
+                                    <div class="input-group-append">
+                                        <button class="input-group-text clipboardjs" type="button" data-clipboard-text="<?php echo $login_uri; ?>"><i class="fa fa-fw fa-copy"></i></button>
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-relation<?php echo $login_id; ?>">
+
+                            <div class="form-group">
+                                <label>Contact</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>
+                                    <select class="form-control" name="contact">
+                                        <option value="">- Contact -</option>
+                                        <?php
+
+                                        $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']);
+                                            ?>
+                                            <option <?php if ($login_contact_id == $contact_id_select) { echo "selected"; } ?> value="<?php echo $contact_id_select; ?>"><?php echo $contact_name_select; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Vendor</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="vendor">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($sql_vendors)) {
+                                            $vendor_id_select = $row['vendor_id'];
+                                            $vendor_name_select = htmlentities($row['vendor_name']);
+                                            ?>
+                                            <option <?php if ($login_vendor_id == $vendor_id_select) { echo "selected"; } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
+                                        <?php } ?>
+
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Asset</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="asset">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($sql_assets)) {
+                                            $asset_id_select = $row['asset_id'];
+                                            $asset_name_select = htmlentities($row['asset_name']);
+                                            ?>
+                                            <option <?php if ($login_asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
+
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Software</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-box"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="software">
+                                        <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");
+                                        while ($row = mysqli_fetch_array($sql_software)) {
+                                            $software_id_select = $row['software_id'];
+                                            $software_name_select = htmlentities($row['software_name']);
+                                            ?>
+                                            <option <?php if ($login_software_id == $software_id_select) { echo "selected"; } ?> value="<?php echo $software_id_select; ?>"><?php echo $software_name_select; ?></option>
+
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-notes<?php echo $login_id; ?>">
+
+                            <div class="form-group">
+                                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="note"><?php echo $login_note; ?></textarea>
+                            </div>
+
+                        </div>
 
-              <div class="form-group">
-                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Important?</span></label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="name" placeholder="Name of Login" value="<?php echo $login_name; ?>" required>
-                  <div class="input-group-append">
-                    <div class="input-group-text">
-                      <input type="checkbox" name="important" value="1" <?php if ($login_important == 1) { echo "checked"; } ?>>
                     </div>
-                  </div>
                 </div>
-              </div>
-            
-              <div class="form-group">
-                <label>Username</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="username" placeholder="Username" value="<?php echo $login_username; ?>">
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="edit_login" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
                 </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Password <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-lock"></i></span>
-                  </div>
-                  <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Password" value="<?php echo $login_password; ?>" required autocomplete="new-password">
-                  <div class="input-group-append">
-                    <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                  </div>
-                  <div class="input-group-append">
-                    <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_password; ?>"><i class="fa fa-fw fa-copy"></i></button>
-                  </div>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>OTP</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                  </div>
-                  <input type="password" class="form-control" data-toggle="password" name="otp_secret" value="<?php echo $login_otp_secret; ?>" placeholder="Insert secret key">
-                  <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>URL/Host</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="uri" placeholder="ex. google.com" value="<?php echo $login_uri; ?>">
-                  <div class="input-group-append">
-                    
-                    <a href="<?php echo $login_uri; ?>" class="input-group-text"><i class="fa fa-fw fa-link"></i></a>
-                  </div>
-                  <div class="input-group-append">
-                    <button class="input-group-text clipboardjs" type="button" data-clipboard-text="<?php echo $login_uri; ?>"><i class="fa fa-fw fa-copy"></i></button>
-                  </div>
-                </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-relation<?php echo $login_id; ?>">
-
-              <div class="form-group">
-                <label>Contact</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>
-                  <select class="form-control" name="contact">
-                    <option value="">- Contact -</option>
-                    <?php 
-                    
-                    $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']);
-                    ?>
-                      <option <?php if ($login_contact_id == $contact_id_select) { echo "selected"; } ?> value="<?php echo $contact_id_select; ?>"><?php echo $contact_name_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Vendor</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="vendor">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql_vendors)) {
-                      $vendor_id_select = $row['vendor_id'];
-                      $vendor_name_select = htmlentities($row['vendor_name']);
-                    ?>
-                      <option <?php if ($login_vendor_id == $vendor_id_select) { echo "selected"; } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-            
-              <div class="form-group">
-                <label>Asset</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="asset">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql_assets)) {
-                      $asset_id_select = $row['asset_id'];
-                      $asset_name_select = htmlentities($row['asset_name']);
-                    ?>
-                      <option <?php if ($login_asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-            
-              <div class="form-group">
-                <label>Software</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-box"></i></span>
-                  </div>
-                  <select class="form-control select2" name="software">
-                    <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"); 
-                    while ($row = mysqli_fetch_array($sql_software)) {
-                      $software_id_select = $row['software_id'];
-                      $software_name_select = htmlentities($row['software_name']);
-                    ?>
-                      <option <?php if ($login_software_id == $software_id_select) { echo "selected"; } ?> value="<?php echo $software_id_select; ?>"><?php echo $software_name_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-notes<?php echo $login_id; ?>">
-
-              <div class="form-group">
-                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="note"><?php echo $login_note; ?></textarea>
-              </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_login" 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/client_logins.php b/client_logins.php
index b090e710..07d2fef7 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <?php
 
diff --git a/client_logs.php b/client_logs.php
index 0ba9c132..c10eee23 100644
--- a/client_logs.php
+++ b/client_logs.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <?php 
 
diff --git a/client_networks.php b/client_networks.php
index 953cf6ae..3907cf8b 100644
--- a/client_networks.php
+++ b/client_networks.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <?php
 
@@ -187,4 +187,4 @@ function populateNetworkEditModal(client_id, network_id) {
 }
 </script>
 
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php include("footer.php"); ?>
diff --git a/client_payments.php b/client_payments.php
index bc372f22..faad8d45 100644
--- a/client_payments.php
+++ b/client_payments.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <?php
 
@@ -118,4 +118,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
   </div>
 </div>
 
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php include("footer.php"); ?>
diff --git a/client_quotes.php b/client_quotes.php
index fed1fe1e..afbb21ee 100644
--- a/client_quotes.php
+++ b/client_quotes.php
@@ -1,17 +1,17 @@
-<?php include("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 = "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";
 }
 
 //Rebuild URL
@@ -27,132 +27,132 @@ $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 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 Quotes">
-            <div class="input-group-append">
-              <button class="btn btn-dark"><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 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 class="float-right">
-            <a href="post.php?export_client_quotes_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
-          </div>
-        </div>
+                    <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 Quotes">
+                            <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=quote_number&o=<?php echo $disp; ?>">Number</a></th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_scope&o=<?php echo $disp; ?>">Scope</a></th>
-            <th class="text-right"><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_amount&o=<?php echo $disp; ?>">Amount</a></th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_date&o=<?php echo $disp; ?>">Date</a></th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=category_name&o=<?php echo $disp; ?>">Category</a></th>
-            <th><a class="text-secondary" 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'];
-            $category_id = $row['category_id'];
-            $category_name = htmlentities($row['category_name']);
+                    <div class="col-md-8">
+                        <div class="float-right">
+                            <a href="post.php?export_client_quotes_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
+                        </div>
+                    </div>
 
-            //Set Badge color based off of quote status
-            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 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>
+            </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=quote_number&o=<?php echo $disp; ?>">Number</a></th>
+                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_scope&o=<?php echo $disp; ?>">Scope</a></th>
+                        <th class="text-right"><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_amount&o=<?php echo $disp; ?>">Amount</a></th>
+                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_date&o=<?php echo $disp; ?>">Date</a></th>
+                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=category_name&o=<?php echo $disp; ?>">Category</a></th>
+                        <th><a class="text-secondary" 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
 
-          <?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'];
+                        $category_id = $row['category_id'];
+                        $category_name = htmlentities($row['category_name']);
 
-          include("quote_edit_modal.php");
-          include("quote_copy_modal.php");
-          }
+                        //Set Badge color based off of quote status
+                        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";
+                        }
 
-          ?>
+                        ?>
 
-        </tbody>
-      </table>
+                        <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 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>
+
+                        <?php
+
+                        require("quote_edit_modal.php");
+                        require("quote_copy_modal.php");
+                    }
+
+                    ?>
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once("pagination.php"); ?>
+        </div>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
-</div>
 
-<?php include("quote_add_modal.php"); ?>
-
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php
+require_once("quote_add_modal.php");
+require_once("footer.php");
diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php
index a449242e..3def656e 100644
--- a/client_recurring_invoices.php
+++ b/client_recurring_invoices.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <?php
 
@@ -138,4 +138,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 <?php include("recurring_invoice_add_modal.php"); ?>
 
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php include("footer.php"); ?>
diff --git a/client_scheduled_tickets.php b/client_scheduled_tickets.php
index f503586e..9052f86b 100644
--- a/client_scheduled_tickets.php
+++ b/client_scheduled_tickets.php
@@ -1,11 +1,11 @@
-<?php include("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 = "scheduled_ticket_subject";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+} else {
+    $sb = "scheduled_ticket_subject";
 }
 
 //Rebuild URL
@@ -23,101 +23,95 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 
 ?>
-<script src="js/scheduledTickets.js"></script>
+    <script src="js/scheduled_tickets_edit_modal.js"></script>
 
-<div class="card card-dark">
-  <div class="card-header">
-    <h3 class="card-title mt-2"><i class="fa fa-fw fa-sync"></i> Scheduled 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_tickets.php?client_id=<?php echo $client_id; ?>">Tickets</a>
-    </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 Scheduled Tickets">
-            <div class="input-group-append">
-              <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+    <div class="card card-dark">
+        <div class="card-header">
+            <h3 class="card-title mt-2"><i class="fa fa-fw fa-sync"></i> Scheduled 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_tickets.php?client_id=<?php echo $client_id; ?>">Tickets</a>
             </div>
-          </div>
         </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">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
+            <form autocomplete="off">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <div class="row">
 
-        while ($row = mysqli_fetch_array($sql)) {
-          $scheduled_ticket_id = $row['scheduled_ticket_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'];
-          ?>
+                    <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>
 
-          <tr>
-            <td><a href="#" data-toggle="modal" data-target="#editScheduledTicketModal"
-                   onclick="populateScheduledTicketEditModal(<?php echo $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 $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>
-            </td>
-          </tr>
+            </form>
+            <hr>
 
-          <?php
-        }
-        ?>
+            <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">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
 
-        </tbody>
-      </table>
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $scheduled_ticket_id = $row['scheduled_ticket_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'];
+                        ?>
+
+                        <tr>
+                            <td><a href="#" data-toggle="modal" data-target="#editScheduledTicketModal" onclick="populateScheduledTicketEditModal(<?php echo $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 $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>
+                            </td>
+                        </tr>
+
+                    <?php } ?>
+
+                    </tbody>
+                </table>
+            </div>
+            <?php
+            require_once('pagination.php');
+            require_once("scheduled_ticket_edit_modal.php")
+            ?>
+        </div>
     </div>
-    <?php
-    include('pagination.php');
-    include("scheduled_ticket_edit_modal.php")
-    ?>
-  </div>
-</div>
 
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php
+require_once("footer.php");
diff --git a/client_services.php b/client_services.php
index efb5325b..6694af4d 100644
--- a/client_services.php
+++ b/client_services.php
@@ -1,15 +1,15 @@
-<?php include("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 = "service_name";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
+    $sb = "service_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)));
 
 // Overview SQL query
 $sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM services 
@@ -21,165 +21,163 @@ $sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM services
 $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-stream"></i> Services</h3>
-      <div class="card-tools">
-        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addServiceModal"><i class="fas fa-fw fa-plus"></i> New Service</button>
-      </div>
-    </div>
-
-    <div class="card-body">
-
-      <form autocomplete="off">
-        <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <div class="input-group">
-          <input type="search" class="form-control " name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Services">
-          <div class="input-group-append">
-            <button class="btn btn-secondary"><i class="fa fa-search"></i></button>
-          </div>
+    <div class="card card-dark">
+        <div class="card-header py-2">
+            <h3 class="card-title mt-2"><i class="fa fa-fw fa-stream"></i> Services</h3>
+            <div class="card-tools">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addServiceModal"><i class="fas fa-fw fa-plus"></i> New Service</button>
+            </div>
         </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">Name</a></th>
-            <th><a class="text-dark">Category</a></th>
-            <th><a class="text-dark">Updated</a></th>
-            <th><a class="text-dark">Importance</a></th>
+        <div class="card-body">
 
-            <th class="text-center">Action</th>
-          </tr>
-          </thead>
-          <tbody>
-          <?php
-
-          while ($row = mysqli_fetch_array($sql)) {
-            $service_id = $row['service_id'];
-            $service_name = htmlentities($row['service_name']);
-            $service_description = htmlentities($row['service_description']);
-            $service_category = htmlentities($row['service_category']);
-            $service_importance = htmlentities($row['service_importance']);
-            $service_backup = htmlentities($row['service_backup']);
-            $service_notes = htmlentities($row['service_notes']);
-            $service_updated_at = $row['service_updated_at'];
-            $service_review_due = $row['service_review_due'];
-
-            // Service Importance
-            if ($service_importance == "High") {
-              $service_importance_display = "<span class='p-2 badge badge-danger'>$service_importance</span>";
-            }elseif ($service_importance == "Medium") {
-              $service_importance_display = "<span class='p-2 badge badge-warning'>$service_importance</span>";
-            }elseif ($service_importance == "Low") {
-              $service_importance_display = "<span class='p-2 badge badge-info'>$service_importance</span>";
-            }else{
-              $service_importance_display = "-";
-            }
-
-            ?>
-
-            <tr>
-              <!-- Name/Category/Updated/Importance from DB -->
-              <td><a href="#" data-toggle="modal" data-target="#viewServiceModal<?php echo $service_id; ?>"> <?php echo $service_name ?></a></td>
-              <td><a> <?php echo $service_category ?></a></td>
-              <td><a> <?php echo $service_updated_at ?></a></td>
-              <td><a> <?php echo $service_importance ?></a></td>
-
-              <!-- Action -->
-              <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="#editServiceModal<?php echo $service_id; ?>">Edit</a>
-                    <?php if ($session_user_role == 3) { ?>
-                      <div class="dropdown-divider"></div>
-                      <a class="dropdown-item text-danger" href="post.php?delete_service=<?php echo $service_id; ?>">Delete</a>
-                    <?php } ?>
-                  </div>
+            <form autocomplete="off">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <div class="input-group">
+                    <input type="search" class="form-control " name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Services">
+                    <div class="input-group-append">
+                        <button class="btn btn-secondary"><i class="fa fa-search"></i></button>
+                    </div>
                 </div>
-              </td>
-            </tr>
+            </form>
+            <hr>
 
-            <?php
+            <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">Name</a></th>
+                        <th><a class="text-dark">Category</a></th>
+                        <th><a class="text-dark">Updated</a></th>
+                        <th><a class="text-dark">Importance</a></th>
 
-            // 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'"
-            );
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
 
-            // 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'"
-            );
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $service_id = $row['service_id'];
+                        $service_name = htmlentities($row['service_name']);
+                        $service_description = htmlentities($row['service_description']);
+                        $service_category = htmlentities($row['service_category']);
+                        $service_importance = htmlentities($row['service_importance']);
+                        $service_backup = htmlentities($row['service_backup']);
+                        $service_notes = htmlentities($row['service_notes']);
+                        $service_updated_at = $row['service_updated_at'];
+                        $service_review_due = $row['service_review_due'];
 
-            // 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'"
-            );
-            // 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'"
-            );
+                        // Service Importance
+                        if ($service_importance == "High") {
+                            $service_importance_display = "<span class='p-2 badge badge-danger'>$service_importance</span>";
+                        } elseif ($service_importance == "Medium") {
+                            $service_importance_display = "<span class='p-2 badge badge-warning'>$service_importance</span>";
+                        } elseif ($service_importance == "Low") {
+                            $service_importance_display = "<span class='p-2 badge badge-info'>$service_importance</span>";
+                        } else {
+                            $service_importance_display = "-";
+                        }
 
-            // Associated URLs ---- REMOVED for now
-            //$sql_urls = mysqli_query($mysqli, "SELECT * FROM service_urls
-            //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'"
-            );
+                        <tr>
+                            <!-- Name/Category/Updated/Importance from DB -->
+                            <td><a href="#" data-toggle="modal" data-target="#viewServiceModal<?php echo $service_id; ?>"> <?php echo $service_name ?></a></td>
+                            <td><a> <?php echo $service_category ?></a></td>
+                            <td><a> <?php echo $service_updated_at ?></a></td>
+                            <td><a> <?php echo $service_importance ?></a></td>
 
-            // 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'"
-            );
+                            <!-- Action -->
+                            <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="#editServiceModal<?php echo $service_id; ?>">Edit</a>
+                                        <?php if ($session_user_role == 3) { ?>
+                                            <div class="dropdown-divider"></div>
+                                            <a class="dropdown-item text-danger" href="post.php?delete_service=<?php echo $service_id; ?>">Delete</a>
+                                        <?php } ?>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
 
-            // 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'"
-            );
+                        <?php
 
-            include("client_service_edit_modal.php");
-            include("client_service_view_modal.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'"
+                        );
 
-          }
-          ?>
+                        // 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'"
+                        );
 
-          </tbody>
-        </table>
-      </div>
-      <?php
-      include ('pagination.php');
-      ?>
+                        // 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'"
+                        );
+                        // 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'"
+                        );
+
+                        // Associated URLs ---- REMOVED for now
+                        //$sql_urls = mysqli_query($mysqli, "SELECT * FROM service_urls
+                        //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'"
+                        );
+
+                        // 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'"
+                        );
+
+                        // 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'"
+                        );
+
+                        require("client_service_edit_modal.php");
+                        require("client_service_view_modal.php");
+
+                    }
+                    ?>
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once('pagination.php'); ?>
+        </div>
     </div>
-  </div>
 
-<?php include("client_service_add_modal.php"); ?>
-
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php
+require_once("client_service_add_modal.php");
+require_once("footer.php");
diff --git a/client_shared_items.php b/client_shared_items.php
index 9ad310b9..0e38436e 100644
--- a/client_shared_items.php
+++ b/client_shared_items.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <?php
 
@@ -128,4 +128,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
     </div>
   </div>
 
-  <?php include("footer.php"); ?>
\ No newline at end of file
+  <?php include("footer.php"); ?>
diff --git a/client_software.php b/client_software.php
index c8fe6bd9..958db432 100644
--- a/client_software.php
+++ b/client_software.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <?php 
 
@@ -195,4 +195,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 <?php include("client_software_add_modal.php"); ?>
 <?php include("client_software_add_from_template_modal.php"); ?>
 
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php include("footer.php"); ?>
diff --git a/client_software_add_from_template_modal.php b/client_software_add_from_template_modal.php
index 3b144df8..d68c265d 100644
--- a/client_software_add_from_template_modal.php
+++ b/client_software_add_from_template_modal.php
@@ -1,49 +1,47 @@
 <div class="modal" id="addSoftwareFromTemplateModal" 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-cube"></i> New License from Template</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="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body bg-white">
-
-          <label>Template</label>
-          <div class="form-group">
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-puzzle-piece"></i></span>
-              </div>
-              <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");
-                while($row = mysqli_fetch_array($sql_software_templates)){
-                  $software_template_id = $row['software_id'];
-                  $software_template_name = htmlentities($row['software_name']);
-
-                ?>
-                <option value="<?php echo $software_template_id ?>"><?php echo $software_template_name; ?></option>
-                <?php
-                } 
-                ?>
-                
-              </select>
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-cube"></i> New License from Template</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
-        
-        </div>
-        
-        <div class="modal-footer bg-white">
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <div class="modal-body bg-white">
 
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_software_from_template" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
+                    <label>Template</label>
+                    <div class="form-group">
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-puzzle-piece"></i></span>
+                            </div>
+                            <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");
+                                while($row = mysqli_fetch_array($sql_software_templates)){
+                                    $software_template_id = $row['software_id'];
+                                    $software_template_name = htmlentities($row['software_name']);
 
+                                    ?>
+                                    <option value="<?php echo $software_template_id ?>"><?php echo $software_template_name; ?></option>
+                                <?php } ?>
+
+                            </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="add_software_from_template" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
+
+                </div>
+            </form>
         </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/client_software_add_modal.php b/client_software_add_modal.php
index 22ae765f..0d14d818 100644
--- a/client_software_add_modal.php
+++ b/client_software_add_modal.php
@@ -1,238 +1,234 @@
 <div class="modal" id="addSoftwareModal" 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-cube"></i> New License</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="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body bg-white">
-
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-device-licenses">Device Licenses</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-user-licenses">User Licenses</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-login">Login</a>
-            </li>
-          </ul>
-
-          <hr>
-          
-          <div class="tab-content">
-
-            <div class="tab-pane fade show active" id="pills-details">
-          
-              <div class="form-group">
-                <label>Software 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-cube"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="name" placeholder="Software name" required autofocus>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Version</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="version" placeholder="Software version">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Type <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="type" required>
-                    <option value="">- Type -</option>
-                    <?php foreach($software_types_array as $software_type) { ?>
-                    <option><?php echo $software_type; ?></option>
-                    <?php } ?>
-                  </select> 
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>License Type</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-                  </div>
-                  <select class="form-control select2" name="license_type">
-                    <option value="">- Select a License Type -</option>
-                    <?php foreach($license_types_array as $license_type) { ?>
-                    <option><?php echo $license_type; ?></option>
-                    <?php } ?>
-                  </select> 
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Seats</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-chair"></i></span>
-                  </div>
-                  <input type="number" class="form-control" name="seats" placeholder="Number of seats"> 
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>License Key</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="key" placeholder="License key"> 
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Purchase Date</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="purchase" max="2999-12-31">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Expire</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="expire" max="2999-12-31">
-                </div>
-              </div>
-
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-cube"></i> New License</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="client_id" value="<?php echo $client_id; ?>">
+                <div class="modal-body bg-white">
 
-            <div class="tab-pane fade" id="pills-device-licenses">
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-device-licenses">Device Licenses</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-user-licenses">User Licenses</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-login">Login</a>
+                        </li>
+                    </ul>
 
-              <div class="alert alert-info">
-                Select Assets that are licensed for this software
-              </div>
+                    <hr>
 
-              <ul class="list-group">
+                    <div class="tab-content">
 
-                <?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");
+                        <div class="tab-pane fade show active" id="pills-details">
 
-                while ($row = mysqli_fetch_array($sql)) {
-                  $asset_id = $row['asset_id'];
-                  $asset_name = htmlentities($row['asset_name']);
-                  $asset_type = htmlentities($row['asset_type']);
-                  $contact_name = htmlentities($row['contact_name']);
+                            <div class="form-group">
+                                <label>Software 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-cube"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Software name" required autofocus>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Version</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="version" placeholder="Software version">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Type <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="type" required>
+                                        <option value="">- Type -</option>
+                                        <?php foreach($software_types_array as $software_type) { ?>
+                                            <option><?php echo $software_type; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>License Type</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="license_type">
+                                        <option value="">- Select a License Type -</option>
+                                        <?php foreach($license_types_array as $license_type) { ?>
+                                            <option><?php echo $license_type; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Seats</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-chair"></i></span>
+                                    </div>
+                                    <input type="number" class="form-control" name="seats" placeholder="Number of seats">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>License Key</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="key" placeholder="License key">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Purchase Date</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="purchase" max="2999-12-31">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Expire</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="expire" max="2999-12-31">
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-device-licenses">
+
+                            <div class="alert alert-info">
+                                Select Assets that are licensed for this software
+                            </div>
+
+                            <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");
+
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $asset_id = $row['asset_id'];
+                                    $asset_name = htmlentities($row['asset_name']);
+                                    $asset_type = htmlentities($row['asset_type']);
+                                    $contact_name = htmlentities($row['contact_name']);
+
+                                    ?>
+                                    <li class="list-group-item">
+                                        <div class="form-check">
+                                            <input type="checkbox" class="form-check-input" name="assets[]" value="<?php echo $asset_id; ?>">
+                                            <label class="form-check-label ml-2"><?php echo "$asset_name - $contact_name"; ?></label>
+                                        </div>
+                                    </li>
+
+                                <?php } ?>
+
+                            </ul>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-user-licenses">
+
+                            <div class="alert alert-info">
+                                Select Users that are licensed for this software
+                            </div>
+
+                            <ul class="list-group">
+
+                                <?php
+                                $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']);
+                                    $contact_email = htmlentities($row['contact_email']);
+
+                                    ?>
+                                    <li class="list-group-item">
+                                        <div class="form-check">
+                                            <input type="checkbox" class="form-check-input" name="contacts[]" value="<?php echo $contact_id; ?>">
+                                            <label class="form-check-label ml-2"><?php echo "$contact_name - $contact_email"; ?></label>
+                                        </div>
+                                    </li>
+
+                                <?php } ?>
+
+                            </ul>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-notes">
+
+                            <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-login">
+
+                            <div class="form-group">
+                                <label>Username</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="username" placeholder="Username">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>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="password" placeholder="Password" 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>
 
-                ?>
-                  <li class="list-group-item">
-                    <div class="form-check">
-                      <input type="checkbox" class="form-check-input" name="assets[]" value="<?php echo $asset_id; ?>">
-                      <label class="form-check-label ml-2"><?php echo "$asset_name - $contact_name"; ?></label>
                     </div>
-                  </li>
 
-                <?php
-                }
-                ?>
-
-              </ul>
-            
-            </div>
-
-            <div class="tab-pane fade" id="pills-user-licenses">
-
-              <div class="alert alert-info">
-                Select Users that are licensed for this software
-              </div>
-
-              <ul class="list-group">
-
-                <?php
-                $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']);
-                  $contact_email = htmlentities($row['contact_email']);
-
-                ?>
-                  <li class="list-group-item">
-                    <div class="form-check">
-                      <input type="checkbox" class="form-check-input" name="contacts[]" value="<?php echo $contact_id; ?>">
-                      <label class="form-check-label ml-2"><?php echo "$contact_name - $contact_email"; ?></label>
-                    </div>
-                  </li>
-
-                <?php
-                }
-                ?>
-
-              </ul>
-            
-            </div>
-
-            <div class="tab-pane fade" id="pills-notes">
-              
-              <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
-
-            </div>
-            
-            <div class="tab-pane fade" id="pills-login">
-
-              <div class="form-group">
-                <label>Username</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="username" placeholder="Username">
                 </div>
-              </div>
-              
-              <div class="form-group">
-                <label>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="password" placeholder="Password" autocomplete="new-password">
-                  <div class="input-group-append">
-                    <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                  </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_software" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
                 </div>
-              </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_software" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/client_software_edit_modal.php b/client_software_edit_modal.php
index f39d9b4f..f0fd19d7 100644
--- a/client_software_edit_modal.php
+++ b/client_software_edit_modal.php
@@ -1,238 +1,234 @@
 <div class="modal" id="editSoftwareModal<?php echo $software_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-cube"></i> Editing license: <strong><?php echo $software_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="software_id" value="<?php echo $software_id; ?>">
-        <input type="hidden" name="login_id" value="<?php echo $login_id; ?>">
-        <div class="modal-body bg-white">    
-          
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $software_id; ?>">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-device-licenses<?php echo $software_id; ?>">Device Licenses</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-user-licenses<?php echo $software_id; ?>">User Licenses</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $software_id; ?>">Notes</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-login<?php echo $software_id; ?>">Login</a>
-            </li>
-          </ul>
-
-          <hr>
-          
-          <div class="tab-content">
-
-            <div class="tab-pane fade show active" id="pills-details<?php echo $software_id; ?>">
-
-              <div class="form-group">
-                <label>Software 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-cube"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="name" placeholder="Software name" value="<?php echo $software_name; ?>" required>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Version</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="version" placeholder="Software version" value="<?php echo $software_version; ?>">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Type <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="type" required>
-                    <?php foreach($software_types_array as $software_type_select) { ?>
-                    <option <?php if ($software_type == $software_type_select) { echo "selected"; } ?>><?php echo $software_type_select; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>License Type</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-                  </div>
-                  <select class="form-control select2" name="license_type">
-                    <option value="">- Select a License Type -</option>
-                    <?php foreach($license_types_array as $license_type_select) { ?>
-                    <option <?php if ($license_type_select == $software_license_type) { echo "selected"; } ?>><?php echo $license_type_select; ?></option>
-                    <?php } ?>
-                  </select> 
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Seats</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-                  </div>
-                  <input type="number" class="form-control" name="seats" placeholder="Number of seats" value="<?php echo $software_seats; ?>"> 
-                </div>
-              </div>
-            
-              <div class="form-group">
-                <label>License Key</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="key" placeholder="License key" value="<?php echo $software_key; ?>"> 
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Purchase Date</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="purchase" max="2999-12-31" value="<?php echo $software_purchase; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Expire</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="expire" max="2999-12-31" value="<?php echo $software_expire; ?>">
-                </div>
-              </div>
-
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-cube"></i> Editing license: <strong><?php echo $software_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="software_id" value="<?php echo $software_id; ?>">
+                <input type="hidden" name="login_id" value="<?php echo $login_id; ?>">
+                <div class="modal-body bg-white">
 
-            <div class="tab-pane fade" id="pills-device-licenses<?php echo $software_id; ?>">
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $software_id; ?>">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-device-licenses<?php echo $software_id; ?>">Device Licenses</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-user-licenses<?php echo $software_id; ?>">User Licenses</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $software_id; ?>">Notes</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-login<?php echo $software_id; ?>">Login</a>
+                        </li>
+                    </ul>
 
-              <div class="alert alert-info">
-                Select Assets that are licensed for this software
-              </div>
+                    <hr>
 
-              <ul class="list-group">
+                    <div class="tab-content">
 
-                <?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");
+                        <div class="tab-pane fade show active" id="pills-details<?php echo $software_id; ?>">
 
-                while ($row = mysqli_fetch_array($sql_assets_select)) {
-                  $asset_id_select = $row['asset_id'];
-                  $asset_name_select = htmlentities($row['asset_name']);
-                  $asset_type_select = htmlentities($row['asset_type']);
-                  $contact_name_select = htmlentities($row['contact_name']);
+                            <div class="form-group">
+                                <label>Software 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-cube"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Software name" value="<?php echo $software_name; ?>" required>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Version</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="version" placeholder="Software version" value="<?php echo $software_version; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Type <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="type" required>
+                                        <?php foreach($software_types_array as $software_type_select) { ?>
+                                            <option <?php if ($software_type == $software_type_select) { echo "selected"; } ?>><?php echo $software_type_select; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>License Type</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="license_type">
+                                        <option value="">- Select a License Type -</option>
+                                        <?php foreach($license_types_array as $license_type_select) { ?>
+                                            <option <?php if ($license_type_select == $software_license_type) { echo "selected"; } ?>><?php echo $license_type_select; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Seats</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                                    </div>
+                                    <input type="number" class="form-control" name="seats" placeholder="Number of seats" value="<?php echo $software_seats; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>License Key</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="key" placeholder="License key" value="<?php echo $software_key; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Purchase Date</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="purchase" max="2999-12-31" value="<?php echo $software_purchase; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Expire</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="expire" max="2999-12-31" value="<?php echo $software_expire; ?>">
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-device-licenses<?php echo $software_id; ?>">
+
+                            <div class="alert alert-info">
+                                Select Assets that are licensed for this software
+                            </div>
+
+                            <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");
+
+                                while ($row = mysqli_fetch_array($sql_assets_select)) {
+                                    $asset_id_select = $row['asset_id'];
+                                    $asset_name_select = htmlentities($row['asset_name']);
+                                    $asset_type_select = htmlentities($row['asset_type']);
+                                    $contact_name_select = htmlentities($row['contact_name']);
+
+                                    ?>
+                                    <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"; } ?>>
+                                            <label class="form-check-label ml-2"><?php echo "$asset_name_select - $contact_name_select"; ?></label>
+                                        </div>
+                                    </li>
+
+                                <?php } ?>
+
+                            </ul>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-user-licenses<?php echo $software_id; ?>">
+
+                            <div class="alert alert-info">
+                                Select Users that are licensed for this software
+                            </div>
+
+                            <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");
+
+                                while ($row = mysqli_fetch_array($sql_contacts_select)) {
+                                    $contact_id_select = $row['contact_id'];
+                                    $contact_name_select = htmlentities($row['contact_name']);
+                                    $contact_email_select = htmlentities($row['contact_email']);
+
+                                    ?>
+                                    <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"; } ?>>
+                                            <label class="form-check-label ml-2"><?php echo "$contact_name_select - $contact_email_select"; ?></label>
+                                        </div>
+                                    </li>
+
+                                <?php } ?>
+
+                            </ul>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-notes<?php echo $software_id; ?>">
+
+                            <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $software_notes; ?></textarea>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-login<?php echo $software_id; ?>">
+
+                            <div class="form-group">
+                                <label>Username</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="username" placeholder="Username" value="<?php echo $login_username; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>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="password" placeholder="Password" value="<?php echo $login_password; ?>" 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>
 
-                ?>
-                  <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"; } ?>>
-                      <label class="form-check-label ml-2"><?php echo "$asset_name_select - $contact_name_select"; ?></label>
                     </div>
-                  </li>
 
-                <?php
-                }
-                ?>
-
-              </ul>
-            
-            </div>
-
-            <div class="tab-pane fade" id="pills-user-licenses<?php echo $software_id; ?>">
-
-              <div class="alert alert-info">
-                Select Users that are licensed for this software
-              </div>
-
-              <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");
-
-                while ($row = mysqli_fetch_array($sql_contacts_select)) {
-                  $contact_id_select = $row['contact_id'];
-                  $contact_name_select = htmlentities($row['contact_name']);
-                  $contact_email_select = htmlentities($row['contact_email']);
-
-                ?>
-                  <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"; } ?>>
-                      <label class="form-check-label ml-2"><?php echo "$contact_name_select - $contact_email_select"; ?></label>
-                    </div>
-                  </li>
-
-                <?php
-                }
-                ?>
-
-              </ul>
-            
-            </div>
-
-            <div class="tab-pane fade" id="pills-notes<?php echo $software_id; ?>">
-              
-              <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $software_notes; ?></textarea>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-login<?php echo $software_id; ?>">
-
-              <div class="form-group">
-                <label>Username</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="username" placeholder="Username" value="<?php echo $login_username; ?>">
                 </div>
-              </div>
-              
-              <div class="form-group">
-                <label>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="password" placeholder="Password" value="<?php echo $login_password; ?>" autocomplete="new-password">
-                  <div class="input-group-append">
-                    <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                  </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_software" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
                 </div>
-              </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_software" 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/client_software_template_add_modal.php b/client_software_template_add_modal.php
index 97c27f25..5421891e 100644
--- a/client_software_template_add_modal.php
+++ b/client_software_template_add_modal.php
@@ -1,74 +1,74 @@
 <div class="modal" id="addSoftwareTemplateModal" 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-cube"></i> New License Template</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="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body bg-white">
-
-          <div class="form-group">
-            <label>Template 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-cube"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" placeholder="Software 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-cube"></i> New License Template</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <div class="modal-body bg-white">
 
-          <div class="form-group">
-            <label>Version</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-              </div>
-              <input type="text" class="form-control" name="version" placeholder="Software version">
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Type <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="type" required>
-                <option value="">- Type -</option>
-                <?php foreach($software_types_array as $software_type) { ?>
-                <option><?php echo $software_type; ?></option>
-                <?php } ?>
-              </select> 
-            </div>
-          </div>
+                    <div class="form-group">
+                        <label>Template 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-cube"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="name" placeholder="Software name" required autofocus>
+                        </div>
+                    </div>
 
-          <div class="form-group">
-            <label>License Type</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-              </div>
-              <select class="form-control select2" name="license_type">
-                <option value="">- Select a License Type -</option>
-                <?php foreach($license_types_array as $license_type) { ?>
-                <option><?php echo $license_type; ?></option>
-                <?php } ?>
-              </select> 
-            </div>
-          </div>
+                    <div class="form-group">
+                        <label>Version</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="version" placeholder="Software version">
+                        </div>
+                    </div>
 
-          <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
+                    <div class="form-group">
+                        <label>Type <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="type" required>
+                                <option value="">- Type -</option>
+                                <?php foreach($software_types_array as $software_type) { ?>
+                                    <option><?php echo $software_type; ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
 
+                    <div class="form-group">
+                        <label>License Type</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                            </div>
+                            <select class="form-control select2" name="license_type">
+                                <option value="">- Select a License Type -</option>
+                                <?php foreach($license_types_array as $license_type) { ?>
+                                    <option><?php echo $license_type; ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
+
+                </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_software_template" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create Template</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_software_template" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create Template</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/client_software_template_edit_modal.php b/client_software_template_edit_modal.php
index b7482019..6017bb6b 100644
--- a/client_software_template_edit_modal.php
+++ b/client_software_template_edit_modal.php
@@ -1,73 +1,73 @@
 <div class="modal" id="editSoftwareTemplateModal<?php echo $software_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-cube"></i> Editing template: <strong><?php echo $software_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="software_id" value="<?php echo $software_id; ?>">
-        <div class="modal-body bg-white">    
-
-          <div class="form-group">
-            <label>Template 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-cube"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" placeholder="Software name" value="<?php echo $software_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-cube"></i> Editing template: <strong><?php echo $software_name; ?></strong></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="software_id" value="<?php echo $software_id; ?>">
+                <div class="modal-body bg-white">
 
-          <div class="form-group">
-            <label>Version</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-              </div>
-              <input type="text" class="form-control" name="version" placeholder="Software version" value="<?php echo $software_version; ?>">
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Type <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="type" required>
-                <?php foreach($software_types_array as $software_type_select) { ?>
-                <option <?php if($software_type == $software_type_select) { echo "selected"; } ?>><?php echo $software_type_select; ?></option>
-                <?php } ?>
-              </select>
-            </div>
-          </div>
+                    <div class="form-group">
+                        <label>Template 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-cube"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="name" placeholder="Software name" value="<?php echo $software_name; ?>" required>
+                        </div>
+                    </div>
 
-          <div class="form-group">
-            <label>License Type</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-              </div>
-              <select class="form-control select2" name="license_type">
-                <option value="">- Select a License Type -</option>
-                <?php foreach($license_types_array as $license_type_select) { ?>
-                <option <?php if($license_type_select == $software_license_type){ echo "selected"; } ?>><?php echo $license_type_select; ?></option>
-                <?php } ?>
-              </select> 
-            </div>
-          </div>
-          
-          <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $software_notes; ?></textarea>
+                    <div class="form-group">
+                        <label>Version</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="version" placeholder="Software version" value="<?php echo $software_version; ?>">
+                        </div>
+                    </div>
 
+                    <div class="form-group">
+                        <label>Type <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="type" required>
+                                <?php foreach($software_types_array as $software_type_select) { ?>
+                                    <option <?php if($software_type == $software_type_select) { echo "selected"; } ?>><?php echo $software_type_select; ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>License Type</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                            </div>
+                            <select class="form-control select2" name="license_type">
+                                <option value="">- Select a License Type -</option>
+                                <?php foreach($license_types_array as $license_type_select) { ?>
+                                    <option <?php if($license_type_select == $software_license_type){ echo "selected"; } ?>><?php echo $license_type_select; ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $software_notes; ?></textarea>
+
+                </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_software_template" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save Template</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_software_template" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save Template</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/client_software_templates.php b/client_software_templates.php
index b99e6150..4e67c371 100644
--- a/client_software_templates.php
+++ b/client_software_templates.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <?php 
 
@@ -116,4 +116,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 <?php include("client_software_template_add_modal.php"); ?>
 
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php include("footer.php"); ?>
diff --git a/client_tickets.php b/client_tickets.php
index 5ef30065..37ff82d2 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <?php
 
diff --git a/client_trips.php b/client_trips.php
index 16845c0d..dc48a703 100644
--- a/client_trips.php
+++ b/client_trips.php
@@ -1,26 +1,26 @@
-<?php include("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 = "trip_date";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+} else {
+    $sb = "trip_date";
 }
 
 // Reverse default sort
 if (!isset($_GET['o'])) {
-  $o = "DESC";
-  $disp = "ASC";
+    $o = "DESC";
+    $disp = "ASC";
 }
 
 //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']));
-}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
@@ -38,116 +38,116 @@ $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-route"></i> Trips</h3>
-    <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTripModal"><i class="fas fa-fw fa-plus"></i> New Trip</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 Trips">
-            <div class="input-group-append">
-              <button class="btn btn-dark"><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-route"></i> Trips</h3>
+            <div class="card-tools">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTripModal"><i class="fas fa-fw fa-plus"></i> New Trip</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 class="float-right">
-            <a href="post.php?export_client_trips_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
-            <a href="#" class="btn btn-default"><i class="fa fa-fw fa-upload"></i> Import</a>
-          </div>
-        </div>
+                    <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 Trips">
+                            <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-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_date&o=<?php echo $disp; ?>">Date</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=user_name&o=<?php echo $disp; ?>">Driver</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_purpose&o=<?php echo $disp; ?>">Purpose</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_source&o=<?php echo $disp; ?>">From</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_destination&o=<?php echo $disp; ?>">To</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_miles&o=<?php echo $disp; ?>">Miles</a></th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $trip_id = $row['trip_id'];
-            $trip_date = $row['trip_date'];
-            $trip_purpose = htmlentities($row['trip_purpose']);
-            $trip_source = htmlentities($row['trip_source']);
-            $trip_destination = htmlentities($row['trip_destination']);
-            $trip_miles = htmlentities($row['trip_miles']);
-            $trip_user_id = $row['trip_user_id'];
-            $round_trip = htmlentities($row['round_trip']);
-            $client_id = $row['trip_client_id'];
+                    <div class="col-md-8">
+                        <div class="float-right">
+                            <a href="post.php?export_client_trips_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
+                            <a href="#" class="btn btn-default"><i class="fa fa-fw fa-upload"></i> Import</a>
+                        </div>
+                    </div>
 
-            if ($round_trip == 1) {
-              $round_trip_display = "<i class='fa fa-fw fa-sync-alt text-secondary'></i>";
-            }else{
-              $round_trip_display = "";
-            }
-            $user_name = htmlentities($row['user_name']);
-            if (empty($user_name)) {
-              $user_name_display = "-";
-            }else{
-              $user_name_display = $user_name;
-            }
-
-          ?>
-          <tr>
-            <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editTripModal<?php echo $trip_id; ?>"><?php echo $trip_date; ?></a></td>
-            <td><?php echo $user_name_display; ?></td>
-            <td><?php echo $trip_purpose; ?></td>
-            <td><?php echo $trip_source; ?></td>
-            <td><?php echo $trip_destination; ?></td>
-            <td><?php echo "$trip_miles $round_trip_display"; ?></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="//maps.google.com?q=<?php echo $trip_source; ?> to <?php echo $trip_destination; ?>" target="_blank">Map it</a>
-                  <div class="dropdown-divider"></div>
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTripModal<?php echo $trip_id; ?>">Edit</a>
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addTripCopyModal<?php echo $trip_id; ?>">Copy</a>
-                  <div class="dropdown-divider"></div>
-                  <a class="dropdown-item text-danger" href="post.php?delete_trip=<?php echo $trip_id; ?>">Delete</a>
                 </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=trip_date&o=<?php echo $disp; ?>">Date</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=user_name&o=<?php echo $disp; ?>">Driver</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_purpose&o=<?php echo $disp; ?>">Purpose</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_source&o=<?php echo $disp; ?>">From</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_destination&o=<?php echo $disp; ?>">To</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_miles&o=<?php echo $disp; ?>">Miles</a></th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
 
-          <?php
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $trip_id = $row['trip_id'];
+                        $trip_date = $row['trip_date'];
+                        $trip_purpose = htmlentities($row['trip_purpose']);
+                        $trip_source = htmlentities($row['trip_source']);
+                        $trip_destination = htmlentities($row['trip_destination']);
+                        $trip_miles = htmlentities($row['trip_miles']);
+                        $trip_user_id = $row['trip_user_id'];
+                        $round_trip = htmlentities($row['round_trip']);
+                        $client_id = $row['trip_client_id'];
 
-          include("trip_copy_modal.php");
-          include("trip_edit_modal.php");
-          }
-          
-          ?>
+                        if ($round_trip == 1) {
+                            $round_trip_display = "<i class='fa fa-fw fa-sync-alt text-secondary'></i>";
+                        } else {
+                            $round_trip_display = "";
+                        }
+                        $user_name = htmlentities($row['user_name']);
+                        if (empty($user_name)) {
+                            $user_name_display = "-";
+                        } else {
+                            $user_name_display = $user_name;
+                        }
 
-        </tbody>
-      </table>
+                        ?>
+                        <tr>
+                            <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editTripModal<?php echo $trip_id; ?>"><?php echo $trip_date; ?></a></td>
+                            <td><?php echo $user_name_display; ?></td>
+                            <td><?php echo $trip_purpose; ?></td>
+                            <td><?php echo $trip_source; ?></td>
+                            <td><?php echo $trip_destination; ?></td>
+                            <td><?php echo "$trip_miles $round_trip_display"; ?></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="//maps.google.com?q=<?php echo $trip_source; ?> to <?php echo $trip_destination; ?>" target="_blank">Map it</a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTripModal<?php echo $trip_id; ?>">Edit</a>
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addTripCopyModal<?php echo $trip_id; ?>">Copy</a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger" href="post.php?delete_trip=<?php echo $trip_id; ?>">Delete</a>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                        <?php
+
+                        require("trip_copy_modal.php");
+                        require("trip_edit_modal.php");
+                    }
+
+                    ?>
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once("pagination.php"); ?>
+        </div>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
-</div>
 
-<?php include("trip_add_modal.php"); ?>
-
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php
+require_once("trip_add_modal.php");
+require_once("footer.php");
diff --git a/client_vendor_templates.php b/client_vendor_templates.php
index b5678ed0..2b7f1ee6 100644
--- a/client_vendor_templates.php
+++ b/client_vendor_templates.php
@@ -1,4 +1,4 @@
-<?php include("inc_all_client.php"); ?>
+<?php require_once("inc_all_client.php"); ?>
 
 <?php
 
@@ -177,4 +177,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 <?php include("vendor_template_add_modal.php"); ?>
 
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php include("footer.php"); ?>
diff --git a/client_vendors.php b/client_vendors.php
index 74ab5d3b..1df431d9 100644
--- a/client_vendors.php
+++ b/client_vendors.php
@@ -1,23 +1,23 @@
-<?php include("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
@@ -32,160 +32,146 @@ $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">
-      <div class="btn-group">
-        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addVendorModal">
-          <i class="fas fa-fw fa-plus"></i> New Vendor
-        </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="#addVendorFromTemplateModal">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 Vendors">
-            <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_vendors_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
-            <a href="#" class="btn btn-default"><i class="fa fa-fw fa-upload"></i> Import</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=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_id = intval($row['vendor_template_id']);
-              
-          ?>
-          <tr>
-            <th>
-              <i class="fa fa-fw fa-building text-secondary"></i> 
-              <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_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="#editVendorModal<?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 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">
+                <div class="btn-group">
+                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addVendorModal">
+                        <i class="fas fa-fw fa-plus"></i> New Vendor
+                    </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="#addVendorFromTemplateModal">From Template</a>
+                    </div>
                 </div>
-              </div>
-            </td>
-          </tr>
+            </div>
+        </div>
+        <div class="card-body">
+            <form autocomplete="off">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <div class="row">
 
-          <?php
-          
-          include("vendor_edit_modal.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 Vendors">
+                            <div class="input-group-append">
+                                <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                            </div>
+                        </div>
+                    </div>
 
-        </tbody>
-      </table>
+                    <div class="col-md-8">
+                        <div class="float-right">
+                            <a href="post.php?export_client_vendors_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
+                            <a href="#" class="btn btn-default"><i class="fa fa-fw fa-upload"></i> Import</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=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_id = intval($row['vendor_template_id']);
+
+                        ?>
+                        <tr>
+                            <th>
+                                <i class="fa fa-fw fa-building text-secondary"></i>
+                                <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_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="#editVendorModal<?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_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"); ?>
-<?php include("vendor_add_from_template_modal.php"); ?>
-
-<?php include("footer.php"); ?>
\ No newline at end of file
+<?php
+require_once("vendor_add_modal.php");
+require_once("vendor_add_from_template_modal.php");
+require_once("footer.php");
diff --git a/clients.php b/clients.php
index 7278c7eb..6287e9fc 100644
--- a/clients.php
+++ b/clients.php
@@ -1,89 +1,89 @@
 <?php
-  
-include("inc_all.php");
+
+require_once("inc_all.php");
 
 //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;
 }
-  
-//Custom Query Filter  
+
+//Custom Query Filter
 if (isset($_GET['query'])) {
-  $query = strip_tags(mysqli_real_escape_string($mysqli,$_GET['query']));
-  //Phone Numbers
-  $phone_query = preg_replace("/[^0-9]/", '',$query);
-  if (empty($phone_query)) {
-    $phone_query = $query;
-  }
-}else{
-  $query = "";
-  $phone_query = "";
+    $query = strip_tags(mysqli_real_escape_string($mysqli,$_GET['query']));
+    //Phone Numbers
+    $phone_query = preg_replace("/[^0-9]/", '',$query);
+    if (empty($phone_query)) {
+        $phone_query = $query;
+    }
+} else {
+    $query = "";
+    $phone_query = "";
 }
 
 //Column Filter
 if (!empty($_GET['sortby'])) {
-  $sortby = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sortby']));
-}else{
-  $sortby = "client_accessed_at";
+    $sortby = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sortby']));
+} else {
+    $sortby = "client_accessed_at";
 }
 
 //Column Order Filter
 if (isset($_GET['order'])) {
-  if ($_GET['order'] == 'ASC') {
-    $order = "ASC";
-    $order_display = "DESC";
-  }else{
+    if ($_GET['order'] == 'ASC') {
+        $order = "ASC";
+        $order_display = "DESC";
+    } else {
+        $order = "DESC";
+        $order_display = "ASC";
+    }
+} else {
     $order = "DESC";
     $order_display = "ASC";
-  }
-}else{
-  $order = "DESC";
-  $order_display = "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['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']));
-}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"));
-}elseif ($_GET['canned_date'] == "thisweek") {
-  $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"));
-}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"));
-}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"));  
-}else{
-  $date_from = "0000-00-00";
-  $date_to = "9999-00-00";
+    $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"));
+} elseif ($_GET['canned_date'] == "thisweek") {
+    $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"));
+} 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"));
+} 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"));
+} else {
+    $date_from = "0000-00-00";
+    $date_to = "9999-00-00";
 }
 
 //Rebuild URL
@@ -105,272 +105,256 @@ $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-users"></i> Clients</h3>
-    <div class="card-tools">
-      <?php if ($session_user_role == 3) { ?>
-        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addClientModal"><i class="fas fa-fw fa-plus"></i> New Client</button>
-      <?php } ?>
-    </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="query" value="<?php if (isset($query)) {echo strip_tags(htmlentities($query));} ?>" placeholder="Search Clients" autofocus>
-            <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['date_from'])) { 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="date_from" max="2999-12-31" value="<?php echo htmlentities($date_from); ?>">
-            </div>
-          </div>
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Date To</label>
-              <input type="date" class="form-control" name="date_to" max="2999-12-31" value="<?php echo htmlentities($date_to); ?>">
-            </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_sortby; ?>&sortby=client_name&order=<?php echo $order_display; ?>">Name</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sortby; ?>&sortby=location_city&order=<?php echo $order_display; ?>">Primary Address </a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sortby; ?>&sortby=contact_name&order=<?php echo $order_display; ?>">Primary Contact</a></th>
-            <?php if ($session_user_role == 3 || $session_user_role == 1 && $config_module_enable_accounting == 1) { ?> <th class="text-right">Billing</th> <?php } ?>
-            <?php if ($session_user_role == 3) { ?> <th class="text-center">Action</th> <?php } ?>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $client_id = $row['client_id'];
-            $client_name = htmlentities($row['client_name']);
-            $client_type = htmlentities($row['client_type']);
-            $location_id = $row['location_id'];
-            $location_country = htmlentities($row['location_country']);
-            $location_address = htmlentities($row['location_address']);
-            $location_city = htmlentities($row['location_city']);
-            $location_state = htmlentities($row['location_state']);
-            $location_zip = htmlentities($row['location_zip']);
-            if (empty($location_address) && empty($location_city) && empty($location_state) && empty($location_zip)) {
-              $location_address_display = "-";
-            }else{
-              $location_address_display = "$location_address<br>$location_city $location_state $location_zip";
-            }
-            $contact_id = $row['contact_id'];
-            $contact_name = htmlentities($row['contact_name']);
-            $contact_title = htmlentities($row['contact_title']);
-            $contact_phone = formatPhoneNumber($row['contact_phone']);
-            $contact_extension = htmlentities($row['contact_extension']);
-            $contact_mobile = formatPhoneNumber($row['contact_mobile']);
-            $contact_email = htmlentities($row['contact_email']);
-            $client_website = htmlentities($row['client_website']);
-            $client_currency_code = htmlentities($row['client_currency_code']);
-            $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_updated_at = $row['client_updated_at'];
-            $client_archive_at = $row['client_archived_at'];
-
-            //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");
-            while ($row = mysqli_fetch_array($sql_client_tags)) {
-
-              $client_tag_id = $row['tag_id'];
-              $client_tag_name = htmlentities($row['tag_name']);
-              $client_tag_color = htmlentities($row['tag_color']);
-              $client_tag_icon = htmlentities($row['tag_icon']);
-              if (empty($client_tag_icon)) {
-                $client_tag_icon = "tag";
-              }
-            
-              $client_tag_id_array[] = $client_tag_id;
-              if (empty($client_tag_color)) {
-                $client_tag_name_display_array[] = "<small class='text-secondary'>$client_tag_name</small> ";
-              }else{  
-                $client_tag_name_display_array[] = "<span class='badge bg-$client_tag_color'><i class='fa fa-fw fa-$client_tag_icon'></i> $client_tag_name</span> ";
-              }
-            }
-            $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' ");
-            $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");
-            $row = mysqli_fetch_array($sql_amount_paid);
-            
-            $amount_paid = $row['amount_paid'];
-
-            $balance = $invoice_amounts - $amount_paid;
-            //set Text color on balance
-            if ($balance > 0) {
-              $balance_text_color = "text-danger font-weight-bold";
-            }else{
-              $balance_text_color = "";
-            }
-
-            //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");
-            $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");
-            $row = mysqli_fetch_array($sql_recurring_yearly_total);
-            
-            $recurring_yearly_total = $row['recurring_yearly_total'] / 12;
-
-            $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total;          
-      
-          ?>
-          <tr>
-            <td>
-              <strong><a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></strong>
-              <?php
-              if (!empty($client_type)) {
-              ?>
-              <br>
-              <small class="text-secondary"><?php echo $client_type; ?></small>
-              <?php } ?>
-              <?php
-              if (!empty($client_tags_display)) {
-              ?>
-              <br>
-              <?php echo $client_tags_display; ?>
-              <?php } ?>
-              <br>
-              <small class="text-secondary"><strong>Created:</strong> <?php echo $client_created_at; ?></small>
-            </td>
-            <td><?php echo $location_address_display; ?></td>
-            <td>
-              <?php 
-              if (empty($contact_name) && empty($contact_phone) && empty($contact_mobile) && empty($client_email)) {
-                echo "-";
-              }
-              ?>
-              <?php
-              if (!empty($contact_name)) {
-              ?>
-              <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><strong><?php echo $contact_name; ?></strong>
-              <br>
-              <?php
-              }else{
-                echo "-";
-              }
-              ?>
-              <?php
-              if (!empty($contact_phone)) {
-              ?>
-              <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $contact_phone; ?> <?php if (!empty($contact_extension)) { echo "x$contact_extension"; } ?>
-              <br>
-              <?php
-              }
-              ?>
-              <?php
-              if (!empty($contact_mobile)) {
-              ?>
-              <i class="fa fa-fw fa-mobile-alt text-secondary mr-2"></i><?php echo $contact_mobile; ?>
-              <br>
-              <?php
-              }
-              ?>
-              <?php
-              if (!empty($contact_email)) {
-              ?>
-              <i class="fa fa-fw fa-envelope text-secondary mr-2"></i><a href="mailto:<?php echo $contact_email; ?>"><?php echo $contact_email; ?></a><button class='btn btn-sm clipboardjs' data-clipboard-text='<?php echo $contact_email; ?>'><i class='far fa-copy text-secondary'></i></button>
-              <?php
-              }
-              ?>
-            </td>
-
-            <!-- Show Billing for Admin/Accountant roles only and if accounting module is enabled -->
-            <?php if ($session_user_role == 3 || $session_user_role == 1 && $config_module_enable_accounting == 1) { ?>
-              <td class="text-right">
-                <span class="text-secondary">Balance</span> <span class="<?php echo $balance_text_color; ?>"><?php echo numfmt_format_currency($currency_format, $balance, $session_company_currency); ?></span>
-                <br>
-                <span class="text-secondary">Paid</span> <?php echo numfmt_format_currency($currency_format, $amount_paid, $session_company_currency); ?>
-                <br>
-                <span class="text-secondary">Monthly</span> <?php echo numfmt_format_currency($currency_format, $recurring_monthly, $session_company_currency); ?>
-              </td>
-            <?php } ?>
-
-            <!-- Show actions for Admin role only -->
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-users"></i> Clients</h3>
+        <div class="card-tools">
             <?php if ($session_user_role == 3) { ?>
-              <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="#editClientModal<?php echo $client_id; ?>">Edit</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item text-danger" href="post.php?archive_client=<?php echo $client_id; ?>">Archive</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item text-danger" href="#" data-toggle="modal" data-target="#deleteClientModal<?php echo $client_id; ?>">Delete</a>
-                  </div>
-                </div>
-              </td>
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addClientModal"><i class="fas fa-fw fa-plus"></i> New Client</button>
             <?php } ?>
-          </tr>
-
-          <?php
-
-            include("client_edit_modal.php");
-            include("client_delete_modal.php");
-
-          }
-          
-          ?>
-
-        </tbody>
-      </table>
+        </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="query" value="<?php if (isset($query)) {echo strip_tags(htmlentities($query));} ?>" placeholder="Search Clients" autofocus>
+                        <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['date_from'])) { 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="date_from" max="2999-12-31" value="<?php echo htmlentities($date_from); ?>">
+                        </div>
+                    </div>
+                    <div class="col-md-2">
+                        <div class="form-group">
+                            <label>Date To</label>
+                            <input type="date" class="form-control" name="date_to" max="2999-12-31" value="<?php echo htmlentities($date_to); ?>">
+                        </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_sortby; ?>&sortby=client_name&order=<?php echo $order_display; ?>">Name</a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sortby; ?>&sortby=location_city&order=<?php echo $order_display; ?>">Primary Address </a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sortby; ?>&sortby=contact_name&order=<?php echo $order_display; ?>">Primary Contact</a></th>
+                    <?php if ($session_user_role == 3 || $session_user_role == 1 && $config_module_enable_accounting == 1) { ?> <th class="text-right">Billing</th> <?php } ?>
+                    <?php if ($session_user_role == 3) { ?> <th class="text-center">Action</th> <?php } ?>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
+
+                while ($row = mysqli_fetch_array($sql)) {
+                    $client_id = $row['client_id'];
+                    $client_name = htmlentities($row['client_name']);
+                    $client_type = htmlentities($row['client_type']);
+                    $location_id = $row['location_id'];
+                    $location_country = htmlentities($row['location_country']);
+                    $location_address = htmlentities($row['location_address']);
+                    $location_city = htmlentities($row['location_city']);
+                    $location_state = htmlentities($row['location_state']);
+                    $location_zip = htmlentities($row['location_zip']);
+                    if (empty($location_address) && empty($location_city) && empty($location_state) && empty($location_zip)) {
+                        $location_address_display = "-";
+                    } else {
+                        $location_address_display = "$location_address<br>$location_city $location_state $location_zip";
+                    }
+                    $contact_id = $row['contact_id'];
+                    $contact_name = htmlentities($row['contact_name']);
+                    $contact_title = htmlentities($row['contact_title']);
+                    $contact_phone = formatPhoneNumber($row['contact_phone']);
+                    $contact_extension = htmlentities($row['contact_extension']);
+                    $contact_mobile = formatPhoneNumber($row['contact_mobile']);
+                    $contact_email = htmlentities($row['contact_email']);
+                    $client_website = htmlentities($row['client_website']);
+                    $client_currency_code = htmlentities($row['client_currency_code']);
+                    $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_updated_at = $row['client_updated_at'];
+                    $client_archive_at = $row['client_archived_at'];
+
+                    //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");
+                    while ($row = mysqli_fetch_array($sql_client_tags)) {
+
+                        $client_tag_id = $row['tag_id'];
+                        $client_tag_name = htmlentities($row['tag_name']);
+                        $client_tag_color = htmlentities($row['tag_color']);
+                        $client_tag_icon = htmlentities($row['tag_icon']);
+                        if (empty($client_tag_icon)) {
+                            $client_tag_icon = "tag";
+                        }
+
+                        $client_tag_id_array[] = $client_tag_id;
+                        if (empty($client_tag_color)) {
+                            $client_tag_name_display_array[] = "<small class='text-secondary'>$client_tag_name</small> ";
+                        } else {
+                            $client_tag_name_display_array[] = "<span class='badge bg-$client_tag_color'><i class='fa fa-fw fa-$client_tag_icon'></i> $client_tag_name</span> ";
+                        }
+                    }
+                    $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' ");
+                    $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");
+                    $row = mysqli_fetch_array($sql_amount_paid);
+
+                    $amount_paid = $row['amount_paid'];
+
+                    $balance = $invoice_amounts - $amount_paid;
+                    //set Text color on balance
+                    if ($balance > 0) {
+                        $balance_text_color = "text-danger font-weight-bold";
+                    } else {
+                        $balance_text_color = "";
+                    }
+
+                    //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");
+                    $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");
+                    $row = mysqli_fetch_array($sql_recurring_yearly_total);
+
+                    $recurring_yearly_total = $row['recurring_yearly_total'] / 12;
+
+                    $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total;
+
+                    ?>
+                    <tr>
+                        <td>
+                            <strong><a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></strong>
+                            <?php
+                            if (!empty($client_type)) {
+                                ?>
+                                <br>
+                                <small class="text-secondary"><?php echo $client_type; ?></small>
+                            <?php } ?>
+                            <?php
+                            if (!empty($client_tags_display)) { ?>
+                                <br>
+                                <?php echo $client_tags_display; ?>
+                            <?php } ?>
+                            <br>
+                            <small class="text-secondary"><strong>Created:</strong> <?php echo $client_created_at; ?></small>
+                        </td>
+                        <td><?php echo $location_address_display; ?></td>
+                        <td>
+                            <?php
+                            if (empty($contact_name) && empty($contact_phone) && empty($contact_mobile) && empty($client_email)) {
+                                echo "-";
+                            }
+
+                            if (!empty($contact_name)) { ?>
+                                <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><strong><?php echo $contact_name; ?></strong>
+                                <br>
+                            <?php } else {
+                                echo "-";
+                            }
+
+                            if (!empty($contact_phone)) { ?>
+                                <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $contact_phone; ?> <?php if (!empty($contact_extension)) { echo "x$contact_extension"; } ?>
+                                <br>
+                            <?php }
+
+                            if (!empty($contact_mobile)) { ?>
+                                <i class="fa fa-fw fa-mobile-alt text-secondary mr-2"></i><?php echo $contact_mobile; ?>
+                                <br>
+                            <?php }
+
+                            if (!empty($contact_email)) { ?>
+                                <i class="fa fa-fw fa-envelope text-secondary mr-2"></i><a href="mailto:<?php echo $contact_email; ?>"><?php echo $contact_email; ?></a><button class='btn btn-sm clipboardjs' data-clipboard-text='<?php echo $contact_email; ?>'><i class='far fa-copy text-secondary'></i></button>
+                            <?php } ?>
+                        </td>
+
+                        <!-- Show Billing for Admin/Accountant roles only and if accounting module is enabled -->
+                        <?php if ($session_user_role == 3 || $session_user_role == 1 && $config_module_enable_accounting == 1) { ?>
+                            <td class="text-right">
+                                <span class="text-secondary">Balance</span> <span class="<?php echo $balance_text_color; ?>"><?php echo numfmt_format_currency($currency_format, $balance, $session_company_currency); ?></span>
+                                <br>
+                                <span class="text-secondary">Paid</span> <?php echo numfmt_format_currency($currency_format, $amount_paid, $session_company_currency); ?>
+                                <br>
+                                <span class="text-secondary">Monthly</span> <?php echo numfmt_format_currency($currency_format, $recurring_monthly, $session_company_currency); ?>
+                            </td>
+                        <?php } ?>
+
+                        <!-- Show actions for Admin role only -->
+                        <?php if ($session_user_role == 3) { ?>
+                            <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="#editClientModal<?php echo $client_id; ?>">Edit</a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger" href="post.php?archive_client=<?php echo $client_id; ?>">Archive</a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger" href="#" data-toggle="modal" data-target="#deleteClientModal<?php echo $client_id; ?>">Delete</a>
+                                    </div>
+                                </div>
+                            </td>
+                        <?php } ?>
+                    </tr>
+
+                    <?php
+
+                    require("client_edit_modal.php");
+                    require("client_delete_modal.php");
+
+                } ?>
+
+                </tbody>
+            </table>
+        </div>
+        <?php require_once("pagination.php"); ?>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
 </div>
 
-<?php include("client_add_modal.php"); ?>
-<?php include("category_quick_add_modal.php"); ?>
-
-<?php include("footer.php"); ?>
+<?php
+require_once("client_add_modal.php");
+require_once("category_quick_add_modal.php");
+require_once("footer.php");
diff --git a/companies.php b/companies.php
index fcf1d56b..ac8e1ff2 100644
--- a/companies.php
+++ b/companies.php
@@ -1,9 +1,10 @@
-<?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']));
-}else{
-  $sb = "company_name";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+} else {
+    $sb = "company_name";
 }
 
 //Rebuild URL
@@ -18,113 +19,113 @@ $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> Companies</h3>
-    <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCompanyModal"><i class="fas fa-fw fa-plus"></i> New Company</button>
-    </div>
-  </div>
-  <div class="card-body">
-    <div class="alert alert-danger" role="alert">
-      <b>The multi-company feature is deprecated and should not be used. </b> It will be removed in the near future - please see the <a href="https://forum.itflow.org/d/74-removing-the-multi-company-feature">forum post</a>.
-    </div>
-    <hr>
-    <form autocomplete="off">
-      <div class="input-group">
-        <input type="search" class="form-control col-md-4" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Companies">
-        <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-building"></i> Companies</h3>
+            <div class="card-tools">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCompanyModal"><i class="fas fa-fw fa-plus"></i> New Company</button>
+            </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 class="text-center"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=company_name&o=<?php echo $disp; ?>">Name</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=company_address&o=<?php echo $disp; ?>">Address</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=company_phone&o=<?php echo $disp; ?>">Phone</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=company_email&o=<?php echo $disp; ?>">Email</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=company_website&o=<?php echo $disp; ?>">Website</a></th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
+        <div class="card-body">
+            <div class="alert alert-danger" role="alert">
+                <b>The multi-company feature is deprecated and should not be used. </b> It will be removed in the near future - please see the <a href="https://forum.itflow.org/d/74-removing-the-multi-company-feature">forum post</a>.
+            </div>
+            <hr>
+            <form autocomplete="off">
+                <div class="input-group">
+                    <input type="search" class="form-control col-md-4" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search Companies">
+                    <div class="input-group-append">
+                        <button class="btn btn-primary"><i class="fa fa-search"></i></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 class="text-center"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=company_name&o=<?php echo $disp; ?>">Name</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=company_address&o=<?php echo $disp; ?>">Address</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=company_phone&o=<?php echo $disp; ?>">Phone</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=company_email&o=<?php echo $disp; ?>">Email</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=company_website&o=<?php echo $disp; ?>">Website</a></th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
 
-          while ($row = mysqli_fetch_array($sql)) {
-            $company_id = $row['company_id'];
-            $company_name = htmlentities($row['company_name']);
-            $company_country = htmlentities($row['company_country']);
-            $company_address = htmlentities($row['company_address']);
-            $company_city = htmlentities($row['company_city']);
-            $company_state = htmlentities($row['company_state']);
-            $company_zip = htmlentities($row['company_zip']);
-            $company_phone = formatPhoneNumber($row['company_phone']);
-            $company_email = htmlentities($row['company_email']);
-            $company_website = htmlentities($row['company_website']);
-            $company_logo = htmlentities($row['company_logo']);
-            $company_locale = htmlentities($row['company_locale']);
-            $company_currency = htmlentities($row['company_currency']);
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $company_id = $row['company_id'];
+                        $company_name = htmlentities($row['company_name']);
+                        $company_country = htmlentities($row['company_country']);
+                        $company_address = htmlentities($row['company_address']);
+                        $company_city = htmlentities($row['company_city']);
+                        $company_state = htmlentities($row['company_state']);
+                        $company_zip = htmlentities($row['company_zip']);
+                        $company_phone = formatPhoneNumber($row['company_phone']);
+                        $company_email = htmlentities($row['company_email']);
+                        $company_website = htmlentities($row['company_website']);
+                        $company_logo = htmlentities($row['company_logo']);
+                        $company_locale = htmlentities($row['company_locale']);
+                        $company_currency = htmlentities($row['company_currency']);
 
-            $company_initials = htmlentities(initials($company_name));
+                        $company_initials = htmlentities(initials($company_name));
 
 
 
-          ?>
+                        ?>
 
-          <tr>
-            <td class="text-center">
-              <a class="text-dark" href="#" data-toggle="modal" data-target="#editCompanyModal<?php echo $company_id; ?>">
-                <?php if (!empty($company_logo)) { ?>
-                <img height="48" width="48" class="img-fluid rounded-circle" src="<?php echo "uploads/settings/$company_id/$company_logo"; ?>">
-                <?php }else{ ?>
-                <span class="fa-stack fa-2x">
+                        <tr>
+                            <td class="text-center">
+                                <a class="text-dark" href="#" data-toggle="modal" data-target="#editCompanyModal<?php echo $company_id; ?>">
+                                    <?php if (!empty($company_logo)) { ?>
+                                        <img height="48" width="48" class="img-fluid rounded-circle" src="<?php echo "uploads/settings/$company_id/$company_logo"; ?>">
+                                    <?php }else{ ?>
+                                        <span class="fa-stack fa-2x">
                   <i class="fa fa-circle fa-stack-2x text-secondary"></i>
                   <span class="fa fa-stack-1x text-white"><?php echo $company_initials; ?></span>
                 </span>
-                <br>
-                <?php } ?>
+                                        <br>
+                                    <?php } ?>
 
-                <div class="text-secondary"><?php echo $company_name; ?></div>
-              </a>
-            </td>
-            <td><?php echo $company_address; ?></td>
-            <td><?php echo $company_phone; ?></td>
-            <td><?php echo $company_email; ?></td>
-            <td><?php echo $company_website; ?></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="#editCompanyModal<?php echo $company_id; ?>">Edit</a>
-                  <div class="dropdown-divider"></div>
-                  <a class="dropdown-item text-danger" href="post.php?archive_company=<?php echo $company_id; ?>">Archive</a>
-                  <div class="dropdown-divider"></div>
-                  <a class="dropdown-item text-danger text-bold" href="post.php?delete_company=<?php echo $company_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">Delete</a>
-                </div>
-              </div>
-            </td>
-          </tr>
+                                    <div class="text-secondary"><?php echo $company_name; ?></div>
+                                </a>
+                            </td>
+                            <td><?php echo $company_address; ?></td>
+                            <td><?php echo $company_phone; ?></td>
+                            <td><?php echo $company_email; ?></td>
+                            <td><?php echo $company_website; ?></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="#editCompanyModal<?php echo $company_id; ?>">Edit</a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger" href="post.php?archive_company=<?php echo $company_id; ?>">Archive</a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger text-bold" href="post.php?delete_company=<?php echo $company_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">Delete</a>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
 
-          <?php
+                        <?php
 
-          include("company_edit_modal.php");
-          }
+                        require("company_edit_modal.php");
+                    }
 
-          ?>
+                    ?>
 
-        </tbody>
-      </table>
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once("pagination.php"); ?>
+        </div>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
-</div>
 
-<?php include("company_add_modal.php"); ?>
-
-<?php include("footer.php");
+<?php
+require_once("company_add_modal.php");
+require_once("footer.php");
diff --git a/company_add_modal.php b/company_add_modal.php
index 4bfb5031..53f88a63 100644
--- a/company_add_modal.php
+++ b/company_add_modal.php
@@ -1,192 +1,192 @@
 <div class="modal" id="addCompanyModal" 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> New Company</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">
-        <div class="modal-body bg-white">
-
-            <div class="alert alert-danger" role="alert">
-                <b>This feature is deprecated and should not be used</b>.
+    <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> New Company</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">
+                <div class="modal-body bg-white">
 
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-address">Address</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-contact" id="contactNavPill">Contact</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-locale">Locale</a>
-            </li>
-          </ul>
+                    <div class="alert alert-danger" role="alert">
+                        <b>This feature is deprecated and should not be used</b>.
+                    </div>
 
-          <hr>
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-address">Address</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-contact" id="contactNavPill">Contact</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-locale">Locale</a>
+                        </li>
+                    </ul>
 
-          <div class="tab-content">
+                    <hr>
 
-            <div class="tab-pane fade show active" id="pills-details">
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-details">
+
+                            <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-building"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Company Name" required autofocus>
+                                </div>
+                            </div>
+
+                            <div class="form-group mb-4">
+                                <label>Logo</label>
+                                <input type="file" class="form-control-file" name="file">
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-address">
+
+                            <div class="form-group">
+                                <label>Address</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="address" placeholder="Street Address">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>City</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="city" placeholder="City">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>State / Province</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="state" placeholder="State or Province">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Zip / Postal Code</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Country <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-flag"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="country" required>
+                                        <option value="">- Country -</option>
+                                        <?php foreach($countries_array as $country_name) { ?>
+                                            <option><?php echo $country_name; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-contact">
+
+                            <div class="form-group">
+                                <label>Phone</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="phone" placeholder="Phone Number">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Email</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">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Website</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="website" placeholder="Website address">
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-locale">
+
+                            <div class="form-group">
+                                <label>Locale <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-flag"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="locale" required>
+                                        <option value="">- Select a Locale -</option>
+                                        <?php foreach($locales_array as $locale_code => $locale_name) { ?>
+                                            <option value="<?php echo $locale_code; ?>"><?php echo "$locale_code - $locale_name"; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <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 value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></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="fa fa-fw fa-building"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="name" placeholder="Company Name" required autofocus>
                 </div>
-              </div>
-
-              <div class="form-group mb-4">
-                <label>Logo</label>
-                <input type="file" class="form-control-file" name="file">
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-address">
-
-              <div class="form-group">
-                <label>Address</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="address" placeholder="Street Address">
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_company" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
                 </div>
-              </div>
-
-              <div class="form-group">
-                <label>City</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="city" placeholder="City">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>State / Province</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="state" placeholder="State or Province">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Zip / Postal Code</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Country <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-flag"></i></span>
-                  </div>
-                  <select class="form-control select2" name="country" required>
-                    <option value="">- Country -</option>
-                    <?php foreach($countries_array as $country_name) { ?>
-                    <option><?php echo $country_name; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-contact">
-
-              <div class="form-group">
-                <label>Phone</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="phone" placeholder="Phone Number">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Email</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">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Website</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="website" placeholder="Website address">
-                </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-locale">
-
-              <div class="form-group">
-                <label>Locale <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-flag"></i></span>
-                  </div>
-                  <select class="form-control select2" name="locale" required>
-                    <option value="">- Select a Locale -</option>
-                    <?php foreach($locales_array as $locale_code => $locale_name) { ?>
-                    <option value="<?php echo $locale_code; ?>"><?php echo "$locale_code - $locale_name"; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <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 value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </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_company" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/company_edit_modal.php b/company_edit_modal.php
index a6d13ad9..d4a492a5 100644
--- a/company_edit_modal.php
+++ b/company_edit_modal.php
@@ -1,191 +1,191 @@
 <div class="modal" id="editCompanyModal<?php echo $company_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> Editing company: <strong><?php echo $company_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="company_id" value="<?php echo $company_id; ?>">
-        <input type="hidden" name="existing_file_name" value="<?php echo $company_logo; ?>">
-        <div class="modal-body bg-white">
-
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $company_id; ?>">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-address<?php echo $company_id; ?>">Address</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-contact<?php echo $company_id; ?>">Contact</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-locale<?php echo $company_id; ?>">Locale</a>
-            </li>
-          </ul>
-
-          <hr>
-          
-          <div class="tab-content">
-
-            <div class="tab-pane fade show active" id="pills-details<?php echo $company_id; ?>">
-
-              <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-building"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="name" placeholder="Company Name" value="<?php echo $company_name; ?>" required>
-                </div>
-              </div>
-
-              <div class="card col-md-2">
-                <div class="card-body">
-                  <img class="img-fluid" src="<?php echo "uploads/settings/$company_id/$company_logo"; ?>">
-                </div>
-              </div>
-
+    <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> Editing company: <strong><?php echo $company_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="company_id" value="<?php echo $company_id; ?>">
+                <input type="hidden" name="existing_file_name" value="<?php echo $company_logo; ?>">
+                <div class="modal-body bg-white">
 
-            <div class="tab-pane fade" id="pills-address<?php echo $company_id; ?>">
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $company_id; ?>">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-address<?php echo $company_id; ?>">Address</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-contact<?php echo $company_id; ?>">Contact</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-locale<?php echo $company_id; ?>">Locale</a>
+                        </li>
+                    </ul>
+
+                    <hr>
+
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-details<?php echo $company_id; ?>">
+
+                            <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-building"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Company Name" value="<?php echo $company_name; ?>" required>
+                                </div>
+                            </div>
+
+                            <div class="card col-md-2">
+                                <div class="card-body">
+                                    <img class="img-fluid" src="<?php echo "uploads/settings/$company_id/$company_logo"; ?>">
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-address<?php echo $company_id; ?>">
+
+                            <div class="form-group">
+                                <label>Address</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="address" placeholder="Street Address" value="<?php echo $company_address; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>City</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="city" placeholder="City" value="<?php echo $company_city; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>State / Province</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="state" placeholder="State or Province" value="<?php echo $company_state; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Zip / Postal Code</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" value="<?php echo $company_zip; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Country</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="country">
+                                        <option value="">- Country -</option>
+                                        <?php foreach($countries_array as $country_name) { ?>
+                                            <option <?php if ($company_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-contact<?php echo $company_id; ?>">
+
+                            <div class="form-group">
+                                <label>Phone</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $company_phone; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Email</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 $company_email; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Website</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="website" placeholder="Website address" value="<?php echo $company_website; ?>">
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-locale<?php echo $company_id; ?>">
+
+                            <div class="form-group">
+                                <label>Locale <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-flag"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="locale" required>
+                                        <option value="">- Select a Locale -</option>
+                                        <?php foreach($locales_array as $locale_code => $locale_name) { ?>
+                                            <option <?php if ($company_locale == $locale_code) { echo "selected"; } ?> value="<?php echo $locale_code; ?>"><?php echo "$locale_code - $locale_name"; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <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 ($company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </div>
 
-              <div class="form-group">
-                <label>Address</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="address" placeholder="Street Address" value="<?php echo $company_address; ?>">
                 </div>
-              </div>
-
-              <div class="form-group">
-                <label>City</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="city" placeholder="City" value="<?php echo $company_city; ?>">
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="edit_company" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
                 </div>
-              </div>
-
-              <div class="form-group">
-                <label>State / Province</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="state" placeholder="State or Province" value="<?php echo $company_state; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Zip / Postal Code</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" value="<?php echo $company_zip; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Country</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                  </div>
-                  <select class="form-control select2" name="country">
-                    <option value="">- Country -</option>
-                    <?php foreach($countries_array as $country_name) { ?>
-                    <option <?php if ($company_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-contact<?php echo $company_id; ?>">
-
-              <div class="form-group">
-                <label>Phone</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $company_phone; ?>"> 
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Email</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 $company_email; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Website</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="website" placeholder="Website address" value="<?php echo $company_website; ?>">
-                </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-locale<?php echo $company_id; ?>">
-
-              <div class="form-group">
-                <label>Locale <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-flag"></i></span>
-                  </div>
-                  <select class="form-control select2" name="locale" required>
-                    <option value="">- Select a Locale -</option>
-                    <?php foreach($locales_array as $locale_code => $locale_name) { ?>
-                    <option <?php if ($company_locale == $locale_code) { echo "selected"; } ?> value="<?php echo $locale_code; ?>"><?php echo "$locale_code - $locale_name"; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <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 ($company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </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_company" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/cron.php b/cron.php
index 4b70f65f..4fe78c9e 100644
--- a/cron.php
+++ b/cron.php
@@ -1,10 +1,7 @@
-<?php require_once("config.php"); ?>
-<?php require_once("functions.php"); ?>
 <?php
 
-?>
-
-<?php
+require_once("config.php");
+require_once("functions.php");
 
 $sql_companies = mysqli_query($mysqli,"SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id");
 
@@ -50,7 +47,7 @@ while($row = mysqli_fetch_array($sql_companies)){
     // Set Currency Format
     $currency_format = numfmt_create($company_locale, NumberFormatter::CURRENCY);
 
-    if($config_enable_cron == 1){
+    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");
@@ -112,9 +109,9 @@ while($row = mysqli_fetch_array($sql_companies)){
 
             //Get Certs Expiring
             $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"
+                LEFT JOIN clients ON certificate_client_id = client_id 
+                WHERE certificate_expire = CURDATE() + INTERVAL $day DAY
+                AND certificates.company_id = $company_id"
             );
 
             while($row = mysqli_fetch_array($sql)){
@@ -139,9 +136,9 @@ while($row = mysqli_fetch_array($sql_companies)){
 
             //Get Asset Warranty Expiring
             $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"
+                LEFT JOIN clients ON asset_client_id = client_id
+                WHERE asset_warranty_expire = CURDATE() + INTERVAL $day DAY
+                AND assets.company_id = $company_id"
             );
 
             while($row = mysqli_fetch_array($sql)){
@@ -277,14 +274,14 @@ while($row = mysqli_fetch_array($sql_companies)){
         foreach($invoiceAlertArray as $day){
 
             $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'
-        AND invoice_status NOT LIKE 'Paid'
-        AND invoice_status NOT LIKE 'Cancelled'
-        AND DATE_ADD(invoice_due, INTERVAL $day DAY) = CURDATE()
-        AND invoices.company_id = $company_id
-        ORDER BY invoice_number DESC"
+                LEFT JOIN clients ON invoice_client_id = client_id
+                LEFT JOIN contacts ON contact_id = primary_contact
+                WHERE invoice_status NOT LIKE 'Draft'
+                AND invoice_status NOT LIKE 'Paid'
+                AND invoice_status NOT LIKE 'Cancelled'
+                AND DATE_ADD(invoice_due, INTERVAL $day DAY) = CURDATE()
+                AND invoices.company_id = $company_id
+                ORDER BY invoice_number DESC"
             );
 
             while($row = mysqli_fetch_array($sql)){
@@ -393,10 +390,10 @@ while($row = mysqli_fetch_array($sql_companies)){
 
             if($config_recurring_auto_send_invoice == 1){
                 $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
-          AND invoices.company_id = $company_id"
+                  LEFT JOIN clients ON invoice_client_id = client_id
+                  LEFT JOIN contacts ON contact_id = primary_contact
+                  WHERE invoice_id = $new_invoice_id
+                  AND invoices.company_id = $company_id"
                 );
 
                 $row = mysqli_fetch_array($sql);
@@ -683,4 +680,4 @@ while($row = mysqli_fetch_array($sql_companies)){
 
 } //End Company Loop through
 
-?>
+
diff --git a/dashboard_technical.php b/dashboard_technical.php
index 1e2c9011..62d2a085 100644
--- a/dashboard_technical.php
+++ b/dashboard_technical.php
@@ -1,7 +1,7 @@
-<?php include_once("inc_all.php"); ?>
-
 <?php
 
+require_once("inc_all.php");
+
 if (isset($_GET['year'])) {
     $year = intval($_GET['year']);
 } else {
@@ -107,13 +107,13 @@ $expiring_certificates = $sql_certs_expiring['expiring_certs'];
 
     <div class="col-lg-4 col-6">
         <a class="small-box bg-success"">
-            <div class="inner">
-                <h3><?php echo $contacts_added; ?></h3>
-                <p>New Contacts</p>
-            </div>
-            <div class="icon">
-                <i class="fa fa-user"></i>
-            </div>
+        <div class="inner">
+            <h3><?php echo $contacts_added; ?></h3>
+            <p>New Contacts</p>
+        </div>
+        <div class="icon">
+            <i class="fa fa-user"></i>
+        </div>
         </a>
     </div>
     <!-- ./col -->
@@ -172,5 +172,6 @@ $expiring_certificates = $sql_certs_expiring['expiring_certs'];
 
 </div> <!-- rows -->
 
-<?php include_once("footer.php"); ?>
+<?php
+require_once("footer.php");
 
diff --git a/database_updates.php b/database_updates.php
index d233b9f0..447b8598 100644
--- a/database_updates.php
+++ b/database_updates.php
@@ -7,17 +7,17 @@
 
 // Check if our database versions are defined
 // If undefined, the file is probably being accessed directly rather than called via post.php?update_db
-if(!defined("LATEST_DATABASE_VERSION") || !defined("CURRENT_DATABASE_VERSION") || !isset($mysqli)){
+if (!defined("LATEST_DATABASE_VERSION") || !defined("CURRENT_DATABASE_VERSION") || !isset($mysqli)) {
     echo "Cannot access this file directly.";
     exit();
 }
 
 // Check if we need an update
-if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
+if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
 
     // We need updates!
 
-    if(CURRENT_DATABASE_VERSION == '0.0.1'){
+    if (CURRENT_DATABASE_VERSION == '0.0.1') {
         // Insert queries here required to update to DB version 0.0.2
 
         mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_module_enable_itdoc` TINYINT(1) DEFAULT 1 AFTER `config_backup_path`");
@@ -28,7 +28,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.0.2'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.0.2'){
+    if (CURRENT_DATABASE_VERSION == '0.0.2') {
         // Insert queries here required to update to DB version 0.0.3
 
         // Add document content raw column & index
@@ -36,7 +36,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
 
         // Populate content raw column with existing document data
         $documents_sql = mysqli_query($mysqli, "SELECT * FROM `documents`");
-        while($row = mysqli_fetch_array($documents_sql)){
+        while($row = mysqli_fetch_array($documents_sql)) {
             $id = $row['document_id'];
             $name = $row['document_name'];
             $content = $row['document_content'];
@@ -52,7 +52,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.0.3'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.0.3'){
+    if (CURRENT_DATABASE_VERSION == '0.0.3') {
         // Insert queries here required to update to DB version 0.0.4
         // mysqli_query($mysqli, "ALTER TABLE .....");
 
@@ -151,7 +151,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
 
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.0.4'){
+    if (CURRENT_DATABASE_VERSION == '0.0.4') {
         // Queries here required to update to DB version 0.0.5
 
         mysqli_query($mysqli, "ALTER TABLE `assets` DROP `asset_meshcentral_id`;");
@@ -162,7 +162,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.0.5'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.0.5'){
+    if (CURRENT_DATABASE_VERSION == '0.0.5') {
         // Insert queries here required to update to DB version 0.0.6
 
         mysqli_query($mysqli, "UPDATE documents SET document_folder_id = 0");
@@ -175,7 +175,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE settings SET config_current_database_version = '0.0.6'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.0.6'){
+    if (CURRENT_DATABASE_VERSION == '0.0.6') {
         // Insert queries here required to update to DB version 0.0.7
         mysqli_query($mysqli, "ALTER TABLE contacts ADD contact_department VARCHAR(200) NULL AFTER contact_title");
         mysqli_query($mysqli, "DROP TABLE departments");
@@ -184,7 +184,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.0.7'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.0.7'){
+    if (CURRENT_DATABASE_VERSION == '0.0.7') {
         // Insert queries here required to update to DB version 0.0.8
 
         // Add contact_department column to tables without it (fresh installs) - this will cause an error if it already exists so catch and discard it
@@ -198,7 +198,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.0.8'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.0.8'){
+    if (CURRENT_DATABASE_VERSION == '0.0.8') {
         // Insert queries here required to update to DB version 0.0.9
 
         mysqli_query($mysqli, "ALTER TABLE `revenues` CHANGE `revenue_created_at` `revenue_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, CHANGE `revenue_updated_at` `revenue_updated_at` DATETIME on update CURRENT_TIMESTAMP NULL DEFAULT NULL; ");
@@ -207,7 +207,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.0.9'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.0.9'){
+    if (CURRENT_DATABASE_VERSION == '0.0.9') {
         // Insert queries here required to update to DB version 0.0.9
         // Remove unused tables
         mysqli_query($mysqli, "DROP TABLE contracts");
@@ -221,7 +221,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.0'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.1.0'){
+    if (CURRENT_DATABASE_VERSION == '0.1.0') {
         // Insert queries here required to update to DB version 0.1.1
         // Logs don't get archived
         mysqli_query($mysqli, "ALTER TABLE `logs` DROP `log_archived_at`");
@@ -241,7 +241,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.1'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.1.1'){
+    if (CURRENT_DATABASE_VERSION == '0.1.1') {
         // Insert queries here required to update to DB version 0.1.2
         // Create Many to Many Relationship tables for Assets, Contacts, Software and Vendors
 
@@ -265,7 +265,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.2'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.1.2'){
+    if (CURRENT_DATABASE_VERSION == '0.1.2') {
         // Insert queries here required to update to DB version 0.1.3
         mysqli_query($mysqli, "ALTER TABLE `logs` ADD `log_entity_id` INT NOT NULL DEFAULT '0' AFTER `log_user_id`");
 
@@ -273,7 +273,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.3'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.1.3'){
+    if (CURRENT_DATABASE_VERSION == '0.1.3') {
         // Insert queries here required to update to DB version 0.1.4
         mysqli_query($mysqli, "ALTER TABLE assets ADD asset_status VARCHAR(200) NULL AFTER asset_mac");
 
@@ -281,7 +281,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.4'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.1.4'){
+    if (CURRENT_DATABASE_VERSION == '0.1.4') {
         // Insert queries here required to update to DB version 0.1.5
         mysqli_query($mysqli, "ALTER TABLE `domains` ADD `domain_txt` TEXT NULL DEFAULT NULL AFTER `domain_mail_servers`");
 
@@ -289,7 +289,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.5'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.1.5'){
+    if (CURRENT_DATABASE_VERSION == '0.1.5') {
         // Insert queries here required to update to DB version 0.1.6
         // Remove Mailing List Tables
         mysqli_query($mysqli, "DROP TABLE campaigns");
@@ -299,7 +299,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.6'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.1.6'){
+    if (CURRENT_DATABASE_VERSION == '0.1.6') {
         // Insert queries here required to update to DB version 0.1.7
         //Remove custom links
         mysqli_query($mysqli, "DROP TABLE custom_links");
@@ -307,7 +307,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.7'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.1.7'){
+    if (CURRENT_DATABASE_VERSION == '0.1.7') {
         // Insert queries here required to update to DB version 0.1.8
         mysqli_query($mysqli, "ALTER TABLE `settings` DROP `config_backup_enable`");
         mysqli_query($mysqli, "ALTER TABLE `settings` DROP `config_backup_path`");
@@ -316,14 +316,14 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.8'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.1.8'){
+    if (CURRENT_DATABASE_VERSION == '0.1.8') {
         // Insert queries here required to update to DB version 0.1.9
         mysqli_query($mysqli, "ALTER TABLE `settings` DROP `config_base_url`");
         // Then, update the database to the next sequential version
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.9'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.1.9'){
+    if (CURRENT_DATABASE_VERSION == '0.1.9') {
         // Insert queries here required to update to DB version 0.2.0
         // Allow contacts to reset their portal password
         mysqli_query($mysqli, "ALTER TABLE contacts ADD contact_password_reset_token VARCHAR(200) NULL DEFAULT NULL AFTER contact_password_hash");
@@ -332,7 +332,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.0'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.2.0'){
+    if (CURRENT_DATABASE_VERSION == '0.2.0') {
         //Insert queries here required to update to DB version 0.2.1
 
         mysqli_query($mysqli, "ALTER TABLE `vendors` 
@@ -369,7 +369,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.1'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.2.1'){
+    if (CURRENT_DATABASE_VERSION == '0.2.1') {
         // Insert queries here required to update to DB version 0.2.2
         mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ticket_email_parse` INT(1) NOT NULL DEFAULT '0' AFTER `config_ticket_from_email`");
         mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_imap_host` VARCHAR(200) NULL DEFAULT NULL AFTER `config_mail_from_name`, ADD `config_imap_port` INT(5) NULL DEFAULT NULL AFTER `config_imap_host`, ADD `config_imap_encryption` VARCHAR(200) NULL DEFAULT NULL AFTER `config_imap_port`;");
@@ -378,7 +378,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.2'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.2.2'){
+    if (CURRENT_DATABASE_VERSION == '0.2.2') {
         // Insert queries here required to update to DB version 0.2.3
 
         // Add contact_important field to those who don't have it (installed before March 2022)
@@ -392,7 +392,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.3'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.2.3'){
+    if (CURRENT_DATABASE_VERSION == '0.2.3') {
 
         //Create New interfaces Table
         mysqli_query($mysqli, "CREATE TABLE `interfaces` (`interface_id` int(11) AUTO_INCREMENT PRIMARY KEY,
@@ -413,18 +413,18 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
 
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.2.4'){
+    if (CURRENT_DATABASE_VERSION == '0.2.4') {
         mysqli_query($mysqli, "CREATE TABLE `contact_assets` (`contact_id` int(11) NOT NULL,`asset_id` int(11) NOT NULL, PRIMARY KEY (`contact_id`,`asset_id`))");
 
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.5'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.2.5'){
+    if (CURRENT_DATABASE_VERSION == '0.2.5') {
         mysqli_query($mysqli, "ALTER TABLE `users` ADD `user_status` TINYINT(1) DEFAULT 1 AFTER `user_password`");
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.6'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.2.6'){
+    if (CURRENT_DATABASE_VERSION == '0.2.6') {
         // Insert queries here required to update to DB version 0.2.7
         mysqli_query($mysqli, "ALTER TABLE `contacts` ADD `contact_token_expire` DATETIME NULL DEFAULT NULL AFTER `contact_password_reset_token`");
 
@@ -436,7 +436,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.7'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.2.7'){
+    if (CURRENT_DATABASE_VERSION == '0.2.7') {
 
         mysqli_query($mysqli, "ALTER TABLE `vendors` ADD `vendor_template` TINYINT(1) DEFAULT 0 AFTER `vendor_notes`");
         mysqli_query($mysqli, "ALTER TABLE `software` ADD `software_template` TINYINT(1) DEFAULT 0 AFTER `software_notes`");
@@ -446,21 +446,21 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.8'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.2.8'){
+    if (CURRENT_DATABASE_VERSION == '0.2.8') {
 
         mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_theme` VARCHAR(200) DEFAULT 'blue' AFTER `config_module_enable_ticketing`");
 
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.9'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.2.9'){
+    if (CURRENT_DATABASE_VERSION == '0.2.9') {
 
         mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ticket_client_general_notifications` INT(1) NOT NULL DEFAULT '1' AFTER `config_ticket_email_parse`");
 
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.0'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.3.0'){
+    if (CURRENT_DATABASE_VERSION == '0.3.0') {
         mysqli_query($mysqli, "ALTER TABLE `notifications` ADD `notification_user_id` TINYINT(1) DEFAULT 0 AFTER `notification_client_id`");
 
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.1'");
@@ -761,21 +761,21 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.2'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.3.2'){
+    if (CURRENT_DATABASE_VERSION == '0.3.2') {
         mysqli_query($mysqli, "ALTER TABLE `contacts` ADD `contact_billing` TINYINT(1) DEFAULT 0 AFTER `contact_important`");
         mysqli_query($mysqli, "ALTER TABLE `contacts` ADD `contact_technical` TINYINT(1) DEFAULT 0 AFTER `contact_billing`");
 
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.3'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.3.3'){
+    if (CURRENT_DATABASE_VERSION == '0.3.3') {
         mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_telemetry` TINYINT(1) DEFAULT 0 AFTER `config_theme`");
 
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.4'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.3.4'){
-    // Insert queries here required to update to DB version 0.3.5
+    if (CURRENT_DATABASE_VERSION == '0.3.4') {
+        // Insert queries here required to update to DB version 0.3.5
 
         //Get & upgrade user login encryption
         $sql_logins = mysqli_query($mysqli, "SELECT login_id, login_username FROM logins WHERE login_username IS NOT NULL");
@@ -786,11 +786,11 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
             mysqli_query($mysqli, "UPDATE logins SET login_username = '$login_encrypted_username' WHERE login_id = '$login_id'");
         }
 
-    // Then, update the database to the next sequential version
+        // Then, update the database to the next sequential version
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.5'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.3.5'){
+    if (CURRENT_DATABASE_VERSION == '0.3.5') {
         $installation_id = randomString(32);
 
         // Update config.php var with new version var for use with docker
@@ -800,7 +800,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.6'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.3.6'){
+    if (CURRENT_DATABASE_VERSION == '0.3.6') {
         // Insert queries here required to update to DB version 0.3.7
         mysqli_query($mysqli, "ALTER TABLE `shared_items` ADD `item_encrypted_username` VARCHAR(255) NULL DEFAULT NULL AFTER `item_related_id`");
 
@@ -808,14 +808,14 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.7'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.3.7'){
+    if (CURRENT_DATABASE_VERSION == '0.3.7') {
 
         mysqli_query($mysqli, "ALTER TABLE `logins` ADD `login_important` TINYINT(1) NOT NULL DEFAULT 0 AFTER `login_note`");
 
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.8'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.3.8'){
+    if (CURRENT_DATABASE_VERSION == '0.3.8') {
         mysqli_query($mysqli, "ALTER TABLE `contacts` ADD `contact_accessed_at` DATETIME NULL DEFAULT NULL AFTER `contact_archived_at`");
         mysqli_query($mysqli, "ALTER TABLE `locations` ADD `location_accessed_at` DATETIME NULL DEFAULT NULL AFTER `location_archived_at`");
         mysqli_query($mysqli, "ALTER TABLE `assets` ADD `asset_accessed_at` DATETIME NULL DEFAULT NULL AFTER `asset_archived_at`");
@@ -832,7 +832,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.3.9'");
     }
 
-    if(CURRENT_DATABASE_VERSION == '0.3.9'){
+    if (CURRENT_DATABASE_VERSION == '0.3.9') {
 
         mysqli_query($mysqli, "ALTER TABLE `vendors` ADD `vendor_template_id` INT(11) NOT NULL DEFAULT 0 AFTER `vendor_client_id`");
         mysqli_query($mysqli, "ALTER TABLE `software` ADD `software_template_id` INT(11) NOT NULL DEFAULT 0 AFTER `software_client_id`");
@@ -840,7 +840,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.4.0'");
     }
 
-    //if(CURRENT_DATABASE_VERSION == '0.4.0'){
+    //if (CURRENT_DATABASE_VERSION == '0.4.0') {
     // Insert queries here required to update to DB version 0.4.1
 
     // Then, update the database to the next sequential version
diff --git a/expense_add_modal.php b/expense_add_modal.php
index 25513c4f..36c280d7 100644
--- a/expense_add_modal.php
+++ b/expense_add_modal.php
@@ -1,165 +1,165 @@
 <div class="modal" id="addExpenseModal" tabindex="-1">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-cart-plus"></i> New Expense</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">
-        <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 class="modal-dialog modal-lg">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-cart-plus"></i> New Expense</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">
+                <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>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" name="amount" placeholder="Enter amount" autofocus 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_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
+                                    }
+                                    ?>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group col-md">
+                            <label>Vendor <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="vendor" required>
+                                    <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");
+                                    while ($row = mysqli_fetch_array($sql)) {
+                                        $vendor_id = $row['vendor_id'];
+                                        $vendor_name = htmlentities($row['vendor_name']);
+                                        ?>
+                                        <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
+
+                                        <?php
+                                    }
+                                    ?>
+                                </select>
+                                <div class="input-group-append">
+                                    <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickVendorModal"><i class="fas fa-fw fa-plus"></i></button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Description <strong class="text-danger">*</strong></label>
+                        <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required></textarea>
+                    </div>
+
+                    <div class="form-row">
+
+                        <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-list"></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 = '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']);
+                                        ?>
+                                        <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="#addQuickCategoryExpenseModal"><i class="fas fa-fw fa-plus"></i></button>
+                                </div>
+                            </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 class="form-group">
+                        <label>Receipt</label>
+                        <input type="file" class="form-control-file" name="file">
+                    </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" name="amount" placeholder="Enter amount" autofocus 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 class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_expense" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Create</button>
                 </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_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
-                  }
-                  ?>
-                </select>
-              </div>
-            </div>
-
-            <div class="form-group col-md">
-              <label>Vendor <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="vendor" required>
-                  <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"); 
-                  while ($row = mysqli_fetch_array($sql)) {
-                    $vendor_id = $row['vendor_id'];
-                    $vendor_name = htmlentities($row['vendor_name']);
-                  ?>
-                    <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
-                  
-                  <?php
-                  }
-                  ?>
-                </select>
-                <div class="input-group-append">
-                  <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickVendorModal"><i class="fas fa-fw fa-plus"></i></button>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label>Description <strong class="text-danger">*</strong></label>
-            <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required></textarea>
-          </div>
-          
-          <div class="form-row">
-
-            <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-list"></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 = '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']);
-                  ?>
-                    <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="#addQuickCategoryExpenseModal"><i class="fas fa-fw fa-plus"></i></button>
-                </div>
-              </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 class="form-group">
-            <label>Receipt</label>
-            <input type="file" class="form-control-file" name="file">
-          </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_expense" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/expense_copy_modal.php b/expense_copy_modal.php
index 53f5a269..c8cc2f84 100644
--- a/expense_copy_modal.php
+++ b/expense_copy_modal.php
@@ -1,156 +1,156 @@
 <div class="modal" id="addExpenseCopyModal<?php echo $expense_id; ?>" tabindex="-1">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-copy"></i> Copying expense</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" enctype="multipart/form-data" 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 class="modal-dialog modal-lg">
+        <div class="modal-content bg-dark">
+            <div class="modal-header text-white">
+                <h5 class="modal-title"><i class="fa fa-fw fa-copy"></i> Copying expense</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span aria-hidden="true">&times;</span>
+                </button>
             </div>
+            <form action="post.php" method="post" enctype="multipart/form-data" 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>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" name="amount" value="<?php echo $expense_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>
+                                    <?php
+
+                                    $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");
+                                        $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 ($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
+                                    }
+
+                                    ?>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group col-md">
+                            <label>Vendor <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="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");
+                                    while ($row = mysqli_fetch_array($sql_vendors)) {
+                                        $vendor_id_select = $row['vendor_id'];
+                                        $vendor_name_select = htmlentities($row['vendor_name']);
+                                        ?>
+                                        <option <?php if ($expense_vendor_id == $vendor_id_select) { ?> selected <?php } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
+                                        <?php
+                                    }
+
+                                    ?>
+                                </select>
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group">
+                        <label>Description <strong class="text-danger">*</strong></label>
+                        <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required><?php echo $expense_description; ?></textarea>
+                    </div>
+
+                    <div class="form-row">
+
+                        <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-list"></i></span>
+                                </div>
+                                <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");
+                                    while ($row = mysqli_fetch_array($sql_categories)) {
+                                        $category_id_select = $row['category_id'];
+                                        $category_name_select = htmlentities($row['category_name']);
+                                        ?>
+                                        <option <?php if ($expense_category_id == $category_id_select) { ?> selected <?php } ?> value="<?php echo $category_id_select; ?>"><?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 $expense_reference; ?>">
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Receipt</label>
+                        <input type="file" class="form-control-file" name="file">
+                    </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" name="amount" value="<?php echo $expense_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 class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_expense" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Copy</button>
                 </div>
-                <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");
-                  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 ($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
-                  }
-
-                  ?>
-                </select>
-              </div>
-            </div>
-
-            <div class="form-group col-md">
-              <label>Vendor <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="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");
-                  while ($row = mysqli_fetch_array($sql_vendors)) {
-                    $vendor_id_select = $row['vendor_id'];
-                    $vendor_name_select = htmlentities($row['vendor_name']);
-                  ?>
-                  <option <?php if ($expense_vendor_id == $vendor_id_select) { ?> selected <?php } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
-                  <?php
-                  }
-
-                  ?>
-                </select>
-              </div>
-            </div>
-
-          </div>
-
-          <div class="form-group">
-            <label>Description <strong class="text-danger">*</strong></label>
-            <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required><?php echo $expense_description; ?></textarea>
-          </div>
-
-          <div class="form-row">
-
-            <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-list"></i></span>
-                </div>
-                <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");
-                  while ($row = mysqli_fetch_array($sql_categories)) {
-                    $category_id_select = $row['category_id'];
-                    $category_name_select = htmlentities($row['category_name']);
-                  ?>
-                  <option <?php if ($expense_category_id == $category_id_select) { ?> selected <?php } ?> value="<?php echo $category_id_select; ?>"><?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 $expense_reference; ?>">
-              </div>
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label>Receipt</label>
-            <input type="file" class="form-control-file" name="file">
-          </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_expense" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Copy</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/expense_edit_modal.php b/expense_edit_modal.php
index 271b4039..70a81a9b 100644
--- a/expense_edit_modal.php
+++ b/expense_edit_modal.php
@@ -1,170 +1,170 @@
 <div class="modal" id="editExpenseModal<?php echo $expense_id; ?>" tabindex="-1">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-edit"></i> Editing expense</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-        <div class="modal-body bg-white">
-          <input type="hidden" name="expense_id" value="<?php echo $expense_id; ?>">
-          <input type="hidden" name="existing_file_name" value="<?php echo $expense_receipt; ?>">
-          
-          <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 $expense_date; ?>" required>
-              </div>
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title text-white"><i class="fa fa-fw fa-edit"></i> Editing expense</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span aria-hidden="true">&times;</span>
+                </button>
             </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>
+            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+                <div class="modal-body bg-white">
+                    <input type="hidden" name="expense_id" value="<?php echo $expense_id; ?>">
+                    <input type="hidden" name="existing_file_name" value="<?php echo $expense_receipt; ?>">
+
+                    <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 $expense_date; ?>" required>
+                            </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" name="amount" value="<?php echo $expense_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>
+                                    <?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");
+                                    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 ($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
+                                    }
+
+                                    ?>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group col-md">
+                            <label>Vendor <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="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");
+                                    while ($row = mysqli_fetch_array($sql_select)) {
+                                        $vendor_id_select = $row['vendor_id'];
+                                        $vendor_name_select = htmlentities($row['vendor_name']);
+                                        ?>
+                                        <option <?php if ($expense_vendor_id == $vendor_id_select) { ?> selected <?php } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
+                                        <?php
+                                    }
+
+                                    ?>
+                                </select>
+                                <div class="input-group-append">
+                                    <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickVendorModal"><i class="fas fa-fw fa-plus"></i></button>
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group">
+                        <label>Description <strong class="text-danger">*</strong></label>
+                        <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required><?php echo $expense_description; ?></textarea>
+                    </div>
+
+                    <div class="form-row">
+
+                        <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-list"></i></span>
+                                </div>
+                                <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");
+                                    while ($row = mysqli_fetch_array($sql_select)) {
+                                        $category_id_select = $row['category_id'];
+                                        $category_name_select = htmlentities($row['category_name']);
+                                        ?>
+                                        <option <?php if ($expense_category_id == $category_id_select) { ?> selected <?php } ?> 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="#addQuickCategoryExpenseModal"><i class="fas fa-fw fa-plus"></i></button>
+                                </div>
+                            </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 $expense_reference; ?>">
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group">
+                        <label>Receipt</label>
+                        <input type="file" class="form-control-file" name="file">
+                    </div>
+
+                    <?php if (!empty($expense_receipt)) { ?>
+                        <hr>
+                        <a class="text-secondary" href="<?php echo "uploads/expenses/$session_company_id/$expense_receipt"; ?>"><i class="fa fa-fw fa-2x fa-file-pdf text-secondary"></i> <?php echo basename($expense_receipt); ?></a>
+                    <?php } ?>
+
                 </div>
-                <input type="number" class="form-control" step="0.01" name="amount" value="<?php echo $expense_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 class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="edit_expense" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Save</button>
                 </div>
-                <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"); 
-                  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 ($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
-                  }
-                  
-                  ?>
-                </select>
-              </div>
-            </div>
-
-            <div class="form-group col-md">
-              <label>Vendor <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="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"); 
-                  while ($row = mysqli_fetch_array($sql_select)) {
-                    $vendor_id_select = $row['vendor_id'];
-                    $vendor_name_select = htmlentities($row['vendor_name']);
-                  ?>
-                  <option <?php if ($expense_vendor_id == $vendor_id_select) { ?> selected <?php } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
-                  <?php
-                  }
-                  
-                  ?>
-                </select>
-                <div class="input-group-append">
-                  <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickVendorModal"><i class="fas fa-fw fa-plus"></i></button>
-                </div>
-              </div>
-            </div>
-            
-          </div>
-            
-          <div class="form-group">
-            <label>Description <strong class="text-danger">*</strong></label>
-            <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required><?php echo $expense_description; ?></textarea>
-          </div>
-          
-          <div class="form-row">
-
-            <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-list"></i></span>
-                </div>
-                <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"); 
-                  while ($row = mysqli_fetch_array($sql_select)) {
-                    $category_id_select = $row['category_id'];
-                    $category_name_select = htmlentities($row['category_name']);
-                  ?>
-                  <option <?php if ($expense_category_id == $category_id_select) { ?> selected <?php } ?> 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="#addQuickCategoryExpenseModal"><i class="fas fa-fw fa-plus"></i></button>
-                </div>
-              </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 $expense_reference; ?>">
-              </div>
-            </div>
-          
-          </div>
-
-          <div class="form-group">
-            <label>Receipt</label>
-            <input type="file" class="form-control-file" name="file">
-          </div>
-
-          <?php if (!empty($expense_receipt)) { ?>
-            <hr>
-            <a class="text-secondary" href="<?php echo "uploads/expenses/$session_company_id/$expense_receipt"; ?>"><i class="fa fa-fw fa-2x fa-file-pdf text-secondary"></i> <?php echo basename($expense_receipt); ?></a>
-          <?php } ?>
-        
+            </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_expense" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Save</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/expense_export_modal.php b/expense_export_modal.php
index 3d89702b..2ae62149 100644
--- a/expense_export_modal.php
+++ b/expense_export_modal.php
@@ -1,41 +1,41 @@
 <div class="modal" id="exportExpensesModal" 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-download"></i> Export Expenses to CSV</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>Date From</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_from" max="2999-12-31" value="<?php echo $dtf; ?>">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-download"></i> Export Expenses to CSV</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
-   
-          <div class="form-group">
-            <label>Date To</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_to" max="2999-12-31" value="<?php echo $dtt; ?>">
-            </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="export_expenses_csv" class="btn btn-primary text-bold"><i class="fa fa-fw fa-download"></i> Download CSV</button>
-				</div>
-			</form>
-		</div>
-	</div>
-</div>
\ No newline at end of file
+            <form action="post.php" method="post" autocomplete="off">
+                <div class="modal-body bg-white">
+
+                    <div class="form-group">
+                        <label>Date From</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_from" max="2999-12-31" value="<?php echo $dtf; ?>">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Date To</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_to" max="2999-12-31" value="<?php echo $dtt; ?>">
+                        </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="export_expenses_csv" class="btn btn-primary text-bold"><i class="fa fa-fw fa-download"></i> Download CSV</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/expense_refund_modal.php b/expense_refund_modal.php
index 9968fc01..a6464981 100644
--- a/expense_refund_modal.php
+++ b/expense_refund_modal.php
@@ -1,67 +1,67 @@
 <div class="modal" id="addExpenseRefundModal<?php echo $expense_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="fa fa-fw fa-sync"></i> Refunding expense</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">
-          <input type="hidden" name="account" value="<?php echo $expense_account_id; ?>">
-          <input type="hidden" name="vendor" value="<?php echo $expense_vendor_id; ?>">
-          <input type="hidden" name="category" value="<?php echo $expense_category_id; ?>">
-          
-          <div class="form-row"> 
-            
-            <div class="form-group col-md">
-              <label>Refund Date</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="fa fa-fw fa-sync"></i> Refunding expense</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">
+                    <input type="hidden" name="account" value="<?php echo $expense_account_id; ?>">
+                    <input type="hidden" name="vendor" value="<?php echo $expense_vendor_id; ?>">
+                    <input type="hidden" name="category" value="<?php echo $expense_category_id; ?>">
+
+                    <div class="form-row">
+
+                        <div class="form-group col-md">
+                            <label>Refund Date</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>Refund Amount</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" name="amount" value="-<?php echo $expense_amount; ?>" required>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Description</label>
+                        <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required>Refund: <?php echo $expense_description; ?></textarea>
+                    </div>
+
+                    <div class="form-group">
+                        <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 $expense_reference; ?>">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Receipt</label>
+                        <input type="file" class="form-control-file" name="file">
+                    </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>Refund Amount</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 class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_expense" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Refund</button>
                 </div>
-                <input type="number" class="form-control" step="0.01" name="amount" value="-<?php echo $expense_amount; ?>" required>
-              </div>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Description</label>
-            <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required>Refund: <?php echo $expense_description; ?></textarea>
-          </div>
-          
-          <div class="form-group">
-            <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 $expense_reference; ?>">
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Receipt</label>
-            <input type="file" class="form-control-file" name="file">
-          </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_expense" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Refund</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/expenses.php b/expenses.php
index c20f16b3..3da2935d 100644
--- a/expenses.php
+++ b/expenses.php
@@ -1,56 +1,58 @@
-<?php include("inc_all.php");
+<?php
+
+require_once("inc_all.php");
 
 //$o = "DESC";
-  
+
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
-  $sb = "expense_date";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+} else {
+    $sb = "expense_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
@@ -70,157 +72,154 @@ $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-shopping-cart"></i> Expenses</h3>
-    <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addExpenseModal"><i class="fas fa-fw fa-plus"></i> New Expense</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 Expenses">
-            <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-shopping-cart"></i> Expenses</h3>
+            <div class="card-tools">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addExpenseModal"><i class="fas fa-fw fa-plus"></i> New Expense</button>
             </div>
-          </div>
         </div>
-        <div class="col-sm-8">
-          <div class="float-right">
-            <button type="button" class="btn btn-default btn-lg" data-toggle="modal" data-target="#exportExpensesModal"><i class="fa fa-fw fa-download"></i> Export</button>
-          </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</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=expense_date&o=<?php echo $disp; ?>">Date</a></th>
-            <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=category_name&o=<?php echo $disp; ?>">Category</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=expense_description&o=<?php echo $disp; ?>">Description</a></th>
-            <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=expense_amount&o=<?php echo $disp; ?>">Amount</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=account_name&o=<?php echo $disp; ?>">Account</a></th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $expense_id = $row['expense_id'];
-            $expense_date = $row['expense_date'];
-            $expense_amount = floatval($row['expense_amount']);
-            $expense_currency_code = htmlentities($row['expense_currency_code']);
-            $expense_description = htmlentities($row['expense_description']);
-            $expense_receipt = htmlentities($row['expense_receipt']);
-            $expense_reference = htmlentities($row['expense_reference']);
-            $expense_created_at = $row['expense_created_at'];
-            $expense_vendor_id = $row['expense_vendor_id'];
-            $vendor_name = htmlentities($row['vendor_name']);
-            $expense_category_id = $row['expense_category_id'];
-            $category_name = htmlentities($row['category_name']);
-            $account_name = htmlentities($row['account_name']);
-            $expense_account_id = $row['expense_account_id'];
 
-            if (empty($expense_receipt)) {
-              $receipt_attached = "";
-            }else{
-              $receipt_attached = "<a class='text-secondary mr-2' target='_blank' href='uploads/expenses/$session_company_id/$expense_receipt'><i class='fa fa-file-pdf'></i></a>";
-            }
-
-          ?>
-
-          <tr>
-            <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 class="text-right"><?php echo numfmt_format_currency($currency_format, $expense_amount, $expense_currency_code); ?></td>
-            <td><?php echo $account_name; ?></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">
-                  <?php 
-                  if (!empty($expense_receipt)) {
-                  ?>
-                  <a class="dropdown-item" href="<?php echo "uploads/expenses/$session_company_id/$expense_receipt"; ?>" download="<?php echo "$expense_date-$vendor_name-$category_name-$expense_id.pdf"; ?>">Download</a>
-                  <div class="dropdown-divider"></div>
-                  <?php
-                  }
-                  ?>
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editExpenseModal<?php echo $expense_id; ?>">Edit</a>
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addExpenseCopyModal<?php echo $expense_id; ?>">Copy</a>
-                  <div class="dropdown-divider"></div>
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addExpenseRefundModal<?php echo $expense_id; ?>">Refund</a>
-                  <div class="dropdown-divider"></div>
-                  <a class="dropdown-item text-danger" href="post.php?delete_expense=<?php echo $expense_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 Expenses">
+                            <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 class="col-sm-8">
+                        <div class="float-right">
+                            <button type="button" class="btn btn-default btn-lg" data-toggle="modal" data-target="#exportExpensesModal"><i class="fa fa-fw fa-download"></i> Export</button>
+                        </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</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=expense_date&o=<?php echo $disp; ?>">Date</a></th>
+                        <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=category_name&o=<?php echo $disp; ?>">Category</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=expense_description&o=<?php echo $disp; ?>">Description</a></th>
+                        <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=expense_amount&o=<?php echo $disp; ?>">Amount</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=account_name&o=<?php echo $disp; ?>">Account</a></th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
 
-          <?php
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $expense_id = $row['expense_id'];
+                        $expense_date = $row['expense_date'];
+                        $expense_amount = floatval($row['expense_amount']);
+                        $expense_currency_code = htmlentities($row['expense_currency_code']);
+                        $expense_description = htmlentities($row['expense_description']);
+                        $expense_receipt = htmlentities($row['expense_receipt']);
+                        $expense_reference = htmlentities($row['expense_reference']);
+                        $expense_created_at = $row['expense_created_at'];
+                        $expense_vendor_id = $row['expense_vendor_id'];
+                        $vendor_name = htmlentities($row['vendor_name']);
+                        $expense_category_id = $row['expense_category_id'];
+                        $category_name = htmlentities($row['category_name']);
+                        $account_name = htmlentities($row['account_name']);
+                        $expense_account_id = $row['expense_account_id'];
 
-          include("expense_edit_modal.php");
-          include("expense_copy_modal.php");
-          include("expense_refund_modal.php");
-          include("expense_export_modal.php");
-          
-          }
+                        if (empty($expense_receipt)) {
+                            $receipt_attached = "";
+                        } else {
+                            $receipt_attached = "<a class='text-secondary mr-2' target='_blank' href='uploads/expenses/$session_company_id/$expense_receipt'><i class='fa fa-file-pdf'></i></a>";
+                        }
 
-          ?>
+                        ?>
 
-        </tbody>
-      </table>
+                        <tr>
+                            <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 class="text-right"><?php echo numfmt_format_currency($currency_format, $expense_amount, $expense_currency_code); ?></td>
+                            <td><?php echo $account_name; ?></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">
+                                        <?php
+                                        if (!empty($expense_receipt)) { ?>
+                                            <a class="dropdown-item" href="<?php echo "uploads/expenses/$session_company_id/$expense_receipt"; ?>" download="<?php echo "$expense_date-$vendor_name-$category_name-$expense_id.pdf"; ?>">Download</a>
+                                            <div class="dropdown-divider"></div>
+                                        <?php } ?>
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editExpenseModal<?php echo $expense_id; ?>">Edit</a>
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addExpenseCopyModal<?php echo $expense_id; ?>">Copy</a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addExpenseRefundModal<?php echo $expense_id; ?>">Refund</a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger" href="post.php?delete_expense=<?php echo $expense_id; ?>">Delete</a>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                        <?php
+
+                        require("expense_edit_modal.php");
+                        require("expense_copy_modal.php");
+                        require("expense_refund_modal.php");
+                        require("expense_export_modal.php");
+
+                    }
+
+                    ?>
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once("pagination.php"); ?>
+        </div>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
-</div>
 
-<?php include("expense_add_modal.php"); ?>
-<?php include("category_quick_add_modal.php"); ?>
-
-<?php include("footer.php");
\ No newline at end of file
+<?php
+require_once("expense_add_modal.php");
+require_once("category_quick_add_modal.php");
+require_once("footer.php");
diff --git a/footer.php b/footer.php
index b4a653bb..44febd45 100644
--- a/footer.php
+++ b/footer.php
@@ -1,31 +1,31 @@
-			</div><!-- /.container-fluid -->
-		  </div>
-		  <!-- /.content -->
-		</div>
-		<!-- /.content-wrapper -->
-	</div>
-	<!-- ./wrapper -->
+</div><!-- /.container-fluid -->
+</div>
+<!-- /.content -->
+</div>
+<!-- /.content-wrapper -->
+</div>
+<!-- ./wrapper -->
 
-	<!-- REQUIRED SCRIPTS -->
+<!-- REQUIRED SCRIPTS -->
 
-	<!-- Bootstrap 4 -->
-	<script src="plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
-	<!-- Custom js-->
+<!-- Bootstrap 4 -->
+<script src="plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
 
-	<script src="plugins/moment/moment.min.js"></script>
-	<script src="plugins/chart.js/Chart.min.js"></script>
-	<script src="plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
-	<script src='plugins/daterangepicker/daterangepicker.js'></script>
-	<script src='plugins/select2/js/select2.min.js'></script>
-	<script src='plugins/inputmask/jquery.inputmask.min.js'></script>
-	<script src="plugins/summernote/summernote-bs4.min.js"></script>
-	<script src="plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
-	<script src="plugins/clipboardjs/clipboard.min.js"></script>
+<!-- Custom js-->
+<script src="plugins/moment/moment.min.js"></script>
+<script src="plugins/chart.js/Chart.min.js"></script>
+<script src="plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
+<script src='plugins/daterangepicker/daterangepicker.js'></script>
+<script src='plugins/select2/js/select2.min.js'></script>
+<script src='plugins/inputmask/jquery.inputmask.min.js'></script>
+<script src="plugins/summernote/summernote-bs4.min.js"></script>
+<script src="plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
+<script src="plugins/clipboardjs/clipboard.min.js"></script>
 
-	<!-- AdminLTE App -->
-	<script src="dist/js/adminlte.min.js"></script>
-	<script src="js/app.js"></script>
-	</body>
+<!-- AdminLTE App -->
+<script src="dist/js/adminlte.min.js"></script>
+<script src="js/app.js"></script>
+</body>
 </html>
 
 <?php
diff --git a/functions.php b/functions.php
index e75032b9..1dd5a753 100644
--- a/functions.php
+++ b/functions.php
@@ -540,3 +540,55 @@ function roundUpToNearestMultiple($n, $increment = 1000)
 {
     return (int) ($increment * ceil($n / $increment));
 }
+
+function getAssetIcon($asset_type)
+{
+    if ($asset_type == 'Laptop') {
+        $device_icon = "laptop";
+    } elseif ($asset_type == 'Desktop') {
+        $device_icon = "desktop";
+    } elseif ($asset_type == 'Server') {
+        $device_icon = "server";
+    } elseif ($asset_type == 'Printer') {
+        $device_icon = "print";
+    } elseif ($asset_type == 'Camera') {
+        $device_icon = "video";
+    } elseif ($asset_type == 'Switch' || $asset_type == 'Firewall/Router') {
+        $device_icon = "network-wired";
+    } elseif ($asset_type == 'Access Point') {
+        $device_icon = "wifi";
+    } elseif ($asset_type == 'Phone') {
+        $device_icon = "phone";
+    } elseif ($asset_type == 'Mobile Phone') {
+        $device_icon = "mobile-alt";
+    } elseif ($asset_type == 'Tablet') {
+        $device_icon = "tablet-alt";
+    } elseif ($asset_type == 'TV') {
+        $device_icon = "tv";
+    } elseif ($asset_type == 'Virtual Machine') {
+        $device_icon = "cloud";
+    } else {
+        $device_icon = "tag";
+    }
+
+    return $device_icon;
+}
+
+function getInvoiceBadgeColor($invoice_status)
+{
+    if ($invoice_status == "Sent") {
+        $invoice_badge_color = "warning text-white";
+    } elseif ($invoice_status == "Viewed") {
+        $invoice_badge_color = "info";
+    } elseif ($invoice_status == "Partial") {
+        $invoice_badge_color = "primary";
+    } elseif ($invoice_status == "Paid") {
+        $invoice_badge_color = "success";
+    } elseif ($invoice_status == "Cancelled") {
+        $invoice_badge_color = "danger";
+    } else{
+        $invoice_badge_color = "secondary";
+    }
+
+    return $invoice_badge_color;
+}
diff --git a/get_credential.php b/get_credential.php
index 687cbf1e..86e423a2 100644
--- a/get_credential.php
+++ b/get_credential.php
@@ -26,8 +26,8 @@ if (isset($_SERVER['HTTP_ORIGIN'])) {
     }
 }
 
-include_once("config.php");
-include_once("functions.php");
+require_once("config.php");
+require_once("functions.php");
 
 // IP & User Agent for logging
 $ip = strip_tags(mysqli_real_escape_string($mysqli,getIP()));
diff --git a/get_settings.php b/get_settings.php
index 01f2e736..8bcedf8f 100644
--- a/get_settings.php
+++ b/get_settings.php
@@ -316,127 +316,127 @@ $countries_array = array(
 );
 
 $timezones_array = array(
-	'US/Eastern',
-	'US/Central',
-	'US/Mountain',
-	'US/Pacific'
+    'US/Eastern',
+    'US/Central',
+    'US/Mountain',
+    'US/Pacific'
 );
 
 $currencies_array = array(
-  'ALL' => 'Albania Lek',
-  'AFN' => 'Afghanistan Afghani',
-  'ARS' => 'Argentina Peso',
-  'AWG' => 'Aruba Guilder',
-  'AUD' => 'Australia Dollar',
-  'AZN' => 'Azerbaijan New Manat',
-  'BSD' => 'Bahamas Dollar',
-  'BBD' => 'Barbados Dollar',
-  'BDT' => 'Bangladeshi taka',
-  'BYR' => 'Belarus Ruble',
-  'BZD' => 'Belize Dollar',
-  'BMD' => 'Bermuda Dollar',
-  'BOB' => 'Bolivia Boliviano',
-  'BAM' => 'Bosnia and Herzegovina Convertible Marka',
-  'BWP' => 'Botswana Pula',
-  'BGN' => 'Bulgaria Lev',
-  'BRL' => 'Brazil Real',
-  'BND' => 'Brunei Darussalam Dollar',
-  'KHR' => 'Cambodia Riel',
-  'CAD' => 'Canada Dollar',
-  'KYD' => 'Cayman Islands Dollar',
-  'CLP' => 'Chile Peso',
-  'CNY' => 'China Yuan Renminbi',
-  'COP' => 'Colombia Peso',
-  'CRC' => 'Costa Rica Colon',
-  'HRK' => 'Croatia Kuna',
-  'CUP' => 'Cuba Peso',
-  'CZK' => 'Czech Republic Koruna',
-  'DKK' => 'Denmark Krone',
-  'DOP' => 'Dominican Republic Peso',
-  'XCD' => 'East Caribbean Dollar',
-  'EGP' => 'Egypt Pound',
-  'SVC' => 'El Salvador Colon',
-  'EEK' => 'Estonia Kroon',
-  'EUR' => 'Euro Member Countries',
-  'FKP' => 'Falkland Islands (Malvinas) Pound',
-  'FJD' => 'Fiji Dollar',
-  'GHC' => 'Ghana Cedis',
-  'GIP' => 'Gibraltar Pound',
-  'GTQ' => 'Guatemala Quetzal',
-  'GGP' => 'Guernsey Pound',
-  'GYD' => 'Guyana Dollar',
-  'HNL' => 'Honduras Lempira',
-  'HKD' => 'Hong Kong Dollar',
-  'HUF' => 'Hungary Forint',
-  'ISK' => 'Iceland Krona',
-  'INR' => 'India Rupee',
-  'IDR' => 'Indonesia Rupiah',
-  'IRR' => 'Iran Rial',
-  'IMP' => 'Isle of Man Pound',
-  'ILS' => 'Israel Shekel',
-  'JMD' => 'Jamaica Dollar',
-  'JPY' => 'Japan Yen',
-  'JEP' => 'Jersey Pound',
-  'KZT' => 'Kazakhstan Tenge',
-  'KPW' => 'Korea (North) Won',
-  'KRW' => 'Korea (South) Won',
-  'KGS' => 'Kyrgyzstan Som',
-  'LAK' => 'Laos Kip',
-  'LVL' => 'Latvia Lat',
-  'LBP' => 'Lebanon Pound',
-  'LRD' => 'Liberia Dollar',
-  'LTL' => 'Lithuania Litas',
-  'MKD' => 'Macedonia Denar',
-  'MYR' => 'Malaysia Ringgit',
-  'MUR' => 'Mauritius Rupee',
-  'MXN' => 'Mexico Peso',
-  'MNT' => 'Mongolia Tughrik',
-  'MZN' => 'Mozambique Metical',
-  'NAD' => 'Namibia Dollar',
-  'NPR' => 'Nepal Rupee',
-  'ANG' => 'Netherlands Antilles Guilder',
-  'NZD' => 'New Zealand Dollar',
-  'NIO' => 'Nicaragua Cordoba',
-  'NGN' => 'Nigeria Naira',
-  'NOK' => 'Norway Krone',
-  'OMR' => 'Oman Rial',
-  'PKR' => 'Pakistan Rupee',
-  'PAB' => 'Panama Balboa',
-  'PYG' => 'Paraguay Guarani',
-  'PEN' => 'Peru Nuevo Sol',
-  'PHP' => 'Philippines Peso',
-  'PLN' => 'Poland Zloty',
-  'QAR' => 'Qatar Riyal',
-  'RON' => 'Romania New Leu',
-  'RUB' => 'Russia Ruble',
-  'SHP' => 'Saint Helena Pound',
-  'SAR' => 'Saudi Arabia Riyal',
-  'RSD' => 'Serbia Dinar',
-  'SCR' => 'Seychelles Rupee',
-  'SGD' => 'Singapore Dollar',
-  'SBD' => 'Solomon Islands Dollar',
-  'SOS' => 'Somalia Shilling',
-  'ZAR' => 'South Africa Rand',
-  'LKR' => 'Sri Lanka Rupee',
-  'SEK' => 'Sweden Krona',
-  'CHF' => 'Switzerland Franc',
-  'SRD' => 'Suriname Dollar',
-  'SYP' => 'Syria Pound',
-  'TWD' => 'Taiwan New Dollar',
-  'THB' => 'Thailand Baht',
-  'TTD' => 'Trinidad and Tobago Dollar',
-  'TRY' => 'Turkey Lira',
-  'TRL' => 'Turkey Lira',
-  'TVD' => 'Tuvalu Dollar',
-  'UAH' => 'Ukraine Hryvna',
-  'GBP' => 'United Kingdom Pound',
-  'USD' => 'United States Dollar',
-  'UYU' => 'Uruguay Peso',
-  'UZS' => 'Uzbekistan Som',
-  'VEF' => 'Venezuela Bolivar',
-  'VND' => 'Viet Nam Dong',
-  'YER' => 'Yemen Rial',
-  'ZWD' => 'Zimbabwe Dollar'
+    'ALL' => 'Albania Lek',
+    'AFN' => 'Afghanistan Afghani',
+    'ARS' => 'Argentina Peso',
+    'AWG' => 'Aruba Guilder',
+    'AUD' => 'Australia Dollar',
+    'AZN' => 'Azerbaijan New Manat',
+    'BSD' => 'Bahamas Dollar',
+    'BBD' => 'Barbados Dollar',
+    'BDT' => 'Bangladeshi taka',
+    'BYR' => 'Belarus Ruble',
+    'BZD' => 'Belize Dollar',
+    'BMD' => 'Bermuda Dollar',
+    'BOB' => 'Bolivia Boliviano',
+    'BAM' => 'Bosnia and Herzegovina Convertible Marka',
+    'BWP' => 'Botswana Pula',
+    'BGN' => 'Bulgaria Lev',
+    'BRL' => 'Brazil Real',
+    'BND' => 'Brunei Darussalam Dollar',
+    'KHR' => 'Cambodia Riel',
+    'CAD' => 'Canada Dollar',
+    'KYD' => 'Cayman Islands Dollar',
+    'CLP' => 'Chile Peso',
+    'CNY' => 'China Yuan Renminbi',
+    'COP' => 'Colombia Peso',
+    'CRC' => 'Costa Rica Colon',
+    'HRK' => 'Croatia Kuna',
+    'CUP' => 'Cuba Peso',
+    'CZK' => 'Czech Republic Koruna',
+    'DKK' => 'Denmark Krone',
+    'DOP' => 'Dominican Republic Peso',
+    'XCD' => 'East Caribbean Dollar',
+    'EGP' => 'Egypt Pound',
+    'SVC' => 'El Salvador Colon',
+    'EEK' => 'Estonia Kroon',
+    'EUR' => 'Euro Member Countries',
+    'FKP' => 'Falkland Islands (Malvinas) Pound',
+    'FJD' => 'Fiji Dollar',
+    'GHC' => 'Ghana Cedis',
+    'GIP' => 'Gibraltar Pound',
+    'GTQ' => 'Guatemala Quetzal',
+    'GGP' => 'Guernsey Pound',
+    'GYD' => 'Guyana Dollar',
+    'HNL' => 'Honduras Lempira',
+    'HKD' => 'Hong Kong Dollar',
+    'HUF' => 'Hungary Forint',
+    'ISK' => 'Iceland Krona',
+    'INR' => 'India Rupee',
+    'IDR' => 'Indonesia Rupiah',
+    'IRR' => 'Iran Rial',
+    'IMP' => 'Isle of Man Pound',
+    'ILS' => 'Israel Shekel',
+    'JMD' => 'Jamaica Dollar',
+    'JPY' => 'Japan Yen',
+    'JEP' => 'Jersey Pound',
+    'KZT' => 'Kazakhstan Tenge',
+    'KPW' => 'Korea (North) Won',
+    'KRW' => 'Korea (South) Won',
+    'KGS' => 'Kyrgyzstan Som',
+    'LAK' => 'Laos Kip',
+    'LVL' => 'Latvia Lat',
+    'LBP' => 'Lebanon Pound',
+    'LRD' => 'Liberia Dollar',
+    'LTL' => 'Lithuania Litas',
+    'MKD' => 'Macedonia Denar',
+    'MYR' => 'Malaysia Ringgit',
+    'MUR' => 'Mauritius Rupee',
+    'MXN' => 'Mexico Peso',
+    'MNT' => 'Mongolia Tughrik',
+    'MZN' => 'Mozambique Metical',
+    'NAD' => 'Namibia Dollar',
+    'NPR' => 'Nepal Rupee',
+    'ANG' => 'Netherlands Antilles Guilder',
+    'NZD' => 'New Zealand Dollar',
+    'NIO' => 'Nicaragua Cordoba',
+    'NGN' => 'Nigeria Naira',
+    'NOK' => 'Norway Krone',
+    'OMR' => 'Oman Rial',
+    'PKR' => 'Pakistan Rupee',
+    'PAB' => 'Panama Balboa',
+    'PYG' => 'Paraguay Guarani',
+    'PEN' => 'Peru Nuevo Sol',
+    'PHP' => 'Philippines Peso',
+    'PLN' => 'Poland Zloty',
+    'QAR' => 'Qatar Riyal',
+    'RON' => 'Romania New Leu',
+    'RUB' => 'Russia Ruble',
+    'SHP' => 'Saint Helena Pound',
+    'SAR' => 'Saudi Arabia Riyal',
+    'RSD' => 'Serbia Dinar',
+    'SCR' => 'Seychelles Rupee',
+    'SGD' => 'Singapore Dollar',
+    'SBD' => 'Solomon Islands Dollar',
+    'SOS' => 'Somalia Shilling',
+    'ZAR' => 'South Africa Rand',
+    'LKR' => 'Sri Lanka Rupee',
+    'SEK' => 'Sweden Krona',
+    'CHF' => 'Switzerland Franc',
+    'SRD' => 'Suriname Dollar',
+    'SYP' => 'Syria Pound',
+    'TWD' => 'Taiwan New Dollar',
+    'THB' => 'Thailand Baht',
+    'TTD' => 'Trinidad and Tobago Dollar',
+    'TRY' => 'Turkey Lira',
+    'TRL' => 'Turkey Lira',
+    'TVD' => 'Tuvalu Dollar',
+    'UAH' => 'Ukraine Hryvna',
+    'GBP' => 'United Kingdom Pound',
+    'USD' => 'United States Dollar',
+    'UYU' => 'Uruguay Peso',
+    'UZS' => 'Uzbekistan Som',
+    'VEF' => 'Venezuela Bolivar',
+    'VND' => 'Viet Nam Dong',
+    'YER' => 'Yemen Rial',
+    'ZWD' => 'Zimbabwe Dollar'
 );
 
 // List of locales
@@ -878,36 +878,36 @@ $locales_array = [
 ];
 
 $category_types_array = array(
-	'Expense',
-	'Income',
-	'Payment Method',
+    'Expense',
+    'Income',
+    'Payment Method',
     'Referral'
 );
 
 $asset_types_array = array(
-	'Laptop'=>'fa-laptop',
-	'Desktop'=>'fa-desktop',
-	'Server'=>'fa-server',
-	'Phone'=>'fa-phone',
+    'Laptop'=>'fa-laptop',
+    'Desktop'=>'fa-desktop',
+    'Server'=>'fa-server',
+    'Phone'=>'fa-phone',
     'Mobile Phone'=>'fa-mobile-alt',
-	'Tablet'=>'fa-tablet-alt',
-	'Firewall/Router'=>'fa-network-wired',
-	'Switch'=>'fa-network-wired',
-	'Access Point'=>'fa-wifi',
-	'Printer'=>'fa-print',
-	'Camera'=>'fa-video',
-	'TV'=>'fa-tv',
-	'Virtual Machine'=>'fa-cloud',
-	'Other'=>'fa-tag'
+    'Tablet'=>'fa-tablet-alt',
+    'Firewall/Router'=>'fa-network-wired',
+    'Switch'=>'fa-network-wired',
+    'Access Point'=>'fa-wifi',
+    'Printer'=>'fa-print',
+    'Camera'=>'fa-video',
+    'TV'=>'fa-tv',
+    'Virtual Machine'=>'fa-cloud',
+    'Other'=>'fa-tag'
 );
 
 $software_types_array = array(
-	'SaaS',
-	'Application',
+    'SaaS',
+    'Application',
     'Mobile',
     'System Software',
     'Operating System',
-	'Other'
+    'Other'
 );
 
 $license_types_array = array(
diff --git a/global_search.php b/global_search.php
index 27c44619..5b0f1292 100644
--- a/global_search.php
+++ b/global_search.php
@@ -1,7 +1,7 @@
-<?php include("inc_all.php"); ?>
-
 <?php
 
+require_once("inc_all.php");
+
 if (isset($_GET['query'])) {
 
     $query = trim(strip_tags(mysqli_real_escape_string($mysqli,$_GET['query'])));
@@ -60,9 +60,7 @@ if (isset($_GET['query'])) {
                                     <td><?php echo $location_phone; ?></td>
                                 </tr>
 
-                                <?php
-                            }
-                            ?>
+                            <?php } ?>
 
                             </tbody>
                         </table>
@@ -118,9 +116,8 @@ if (isset($_GET['query'])) {
                                     <td><?php echo $contact_mobile; ?></td>
                                 </tr>
 
-                                <?php
-                            }
-                            ?>
+                            <?php } ?>
+
 
                             </tbody>
                         </table>
@@ -161,9 +158,8 @@ if (isset($_GET['query'])) {
                                     <td><?php echo $vendor_phone; ?></td>
                                 </tr>
 
-                                <?php
-                            }
-                            ?>
+                            <?php } ?>
+
 
                             </tbody>
                         </table>
@@ -201,9 +197,8 @@ if (isset($_GET['query'])) {
                                     <td><?php echo $product_description; ?></td>
                                 </tr>
 
-                                <?php
-                            }
-                            ?>
+                            <?php } ?>
+
 
                             </tbody>
                         </table>
@@ -246,9 +241,8 @@ if (isset($_GET['query'])) {
                                     <td><?php echo $document_updated ?></td>
                                 </tr>
 
-                                <?php
-                            }
-                            ?>
+                            <?php } ?>
+
 
                             </tbody>
                         </table>
@@ -296,9 +290,8 @@ if (isset($_GET['query'])) {
 
                                 </tr>
 
-                                <?php
-                            }
-                            ?>
+                            <?php } ?>
+
 
                             </tbody>
                         </table>
@@ -343,9 +336,8 @@ if (isset($_GET['query'])) {
 
                                 </tr>
 
-                                <?php
-                            }
-                            ?>
+                            <?php } ?>
+
 
                             </tbody>
                         </table>
@@ -360,4 +352,5 @@ if (isset($_GET['query'])) {
 
 <?php } ?>
 
-<?php include("footer.php");
+<?php
+require_once("footer.php");
diff --git a/guest_download_file.php b/guest_download_file.php
index 6d069203..cf1ff992 100644
--- a/guest_download_file.php
+++ b/guest_download_file.php
@@ -1,7 +1,8 @@
 <?php
 // Not including the guest header as we don't want any HTML output
-include("config.php");
-include("functions.php");
+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']));
 
@@ -32,8 +33,7 @@ if (isset($_GET['id']) && isset($_GET['key'])) {
 
     if (empty($row['item_views'])) {
         $item_views = 0;
-    }
-    else {
+    } else {
         $item_views = intval($row['item_views']);
     }
 
@@ -64,5 +64,4 @@ if (isset($_GET['id']) && isset($_GET['key'])) {
     // 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'");
 
-
 }
diff --git a/guest_header.php b/guest_header.php
index 0fc66cca..54132776 100644
--- a/guest_header.php
+++ b/guest_header.php
@@ -1,64 +1,64 @@
-<?php 
+<?php
 
-include("config.php");
-include("functions.php");
+require_once("config.php");
+require_once("functions.php");
 
 session_start();
 
-$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']));
 
 ?>
 
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="x-ua-compatible" content="ie=edge">
-  <meta name="robots" content="noindex">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="robots" content="noindex">
 
-  <title><?php echo $config_app_name; ?></title>
+    <title><?php echo $config_app_name; ?></title>
 
-  <!-- Font Awesome Icons -->
-  <link rel="stylesheet" href="plugins/fontawesome-free/css/all.min.css">
-  <!-- Theme style -->
-  <link rel="stylesheet" href="dist/css/adminlte.min.css">
-  <!-- Google Font: Source Sans Pro -->
-  <!-- <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet"> -->
+    <!-- Font Awesome Icons -->
+    <link rel="stylesheet" href="plugins/fontawesome-free/css/all.min.css">
+    <!-- Theme style -->
+    <link rel="stylesheet" href="dist/css/adminlte.min.css">
+    <!-- Google Font: Source Sans Pro -->
+    <!-- <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet"> -->
 
-  <!-- Custom Style Sheet -->
-  <link href="plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
-  <link href="plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
-  <link href="plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
-  <link href='plugins/daterangepicker/daterangepicker.css' rel='stylesheet' />
+    <!-- Custom Style Sheet -->
+    <link href="plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
+    <link href="plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
+    <link href="plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
+    <link href='plugins/daterangepicker/daterangepicker.css' rel='stylesheet' />
 
 </head>
 <body class="layout-top-nav">
-  <div class="wrapper text-sm">
-    
+<div class="wrapper text-sm">
+
     <!-- Content Wrapper. Contains page content -->
     <div class="content-wrapper">
 
-      <!-- Main content -->
-      <div class="content">
-        <div class="container">
+        <!-- Main content -->
+        <div class="content">
+            <div class="container">
 
-          <?php
-          //Alert Feedback
-          if (!empty($_SESSION['alert_message'])) {
-              if (!isset($_SESSION['alert_type'])) {
-                  $_SESSION['alert_type'] = "info";
-              }
-            ?>
-              <div class="alert alert-<?php echo $_SESSION['alert_type']; ?>" id="alert">
-                <?php echo $_SESSION['alert_message']; ?>
-                <button class='close' data-dismiss='alert'>&times;</button>
-              </div>
-            <?php
-            
-            unset($_SESSION['alert_type']);
-            unset($_SESSION['alert_message']);
+                <?php
+                //Alert Feedback
+                if (!empty($_SESSION['alert_message'])) {
+                    if (!isset($_SESSION['alert_type'])) {
+                        $_SESSION['alert_type'] = "info";
+                    }
+                    ?>
+                    <div class="alert alert-<?php echo $_SESSION['alert_type']; ?>" id="alert">
+                        <?php echo $_SESSION['alert_message']; ?>
+                        <button class='close' data-dismiss='alert'>&times;</button>
+                    </div>
+                    <?php
 
-          }
-          ?>
+                    unset($_SESSION['alert_type']);
+                    unset($_SESSION['alert_message']);
+
+                }
+                ?>
diff --git a/guest_post.php b/guest_post.php
index 8a43f8a4..002ed06c 100644
--- a/guest_post.php
+++ b/guest_post.php
@@ -1,7 +1,7 @@
 <?php
 
-include("config.php");
-include("functions.php");
+require_once("config.php");
+require_once("functions.php");
 
 session_start();
 
@@ -22,8 +22,8 @@ if (isset($_GET['accept_quote'], $_GET['company_id'], $_GET['url_key'])) {
         $_SESSION['alert_message'] = "Quote Accepted";
 
         header("Location: " . $_SERVER["HTTP_REFERER"]);
-    }else{
-        echo "GTFO!!";
+    } else {
+        echo "Invalid!!";
     }
 
 }
@@ -46,8 +46,8 @@ if (isset($_GET['decline_quote'], $_GET['company_id'], $_GET['url_key'])) {
         $_SESSION['alert_message'] = "Quote Declined";
 
         header("Location: " . $_SERVER["HTTP_REFERER"]);
-    }else{
-        echo "GTFO!!";
+    } else {
+        echo "Invalid!!";
     }
 
 }
diff --git a/guest_view_invoice.php b/guest_view_invoice.php
index df3c074f..0eff51ce 100644
--- a/guest_view_invoice.php
+++ b/guest_view_invoice.php
@@ -72,19 +72,7 @@ if (isset($_GET['invoice_id'], $_GET['url_key'])) {
         $browser = strip_tags(mysqli_real_escape_string($mysqli,getWebBrowser($session_user_agent)));
 
         //Set Badge color based off of invoice status
-        if ($invoice_status == "Sent") {
-            $invoice_badge_color = "warning text-white";
-        }elseif ($invoice_status == "Viewed") {
-            $invoice_badge_color = "info";
-        }elseif ($invoice_status == "Partial") {
-            $invoice_badge_color = "primary";
-        }elseif ($invoice_status == "Paid") {
-            $invoice_badge_color = "success";
-        }elseif ($invoice_status == "Cancelled") {
-            $invoice_badge_color = "danger";
-        }else{
-            $invoice_badge_color = "secondary";
-        }
+        $invoice_badge_color = getInvoiceBadgeColor($invoice_status);
 
         //Update status to Viewed only if invoice_status = "Sent"
         if ($invoice_status == 'Sent') {
diff --git a/guest_view_item.php b/guest_view_item.php
index facef38b..9f45565c 100644
--- a/guest_view_item.php
+++ b/guest_view_item.php
@@ -4,11 +4,11 @@ header('Cache-Control: no-store, no-cache, must-revalidate');
 header('Cache-Control: post-check=0, pre-check=0', FALSE);
 header('Pragma: no-cache');
 
-include("guest_header.php"); ?>
+require_once("guest_header.php"); ?>
 
-<br>
-<h1> <?php echo $config_app_name ?> Guest sharing </h1>
-<hr>
+    <br>
+    <h1> <?php echo $config_app_name ?> Guest sharing </h1>
+    <hr>
 
 <?php
 if (!isset($_GET['id']) || !isset($_GET['key'])) {
@@ -56,7 +56,7 @@ if ($item_type == "Document") {
 
     if (mysqli_num_rows($doc_sql) !== 1 || !$doc_row) {
         echo "<div class=\"alert alert-danger\" role=\"alert\">Error retrieving document to view.</div>";
-        include("guest_footer.php");
+        require_once("guest_footer.php");
         exit();
     }
 
@@ -79,7 +79,7 @@ if ($item_type == "Document") {
     $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'");
 
-}elseif ($item_type == "File") {
+} 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");
     $file_row = mysqli_fetch_array($file_sql);
 
@@ -93,12 +93,12 @@ if ($item_type == "Document") {
 
     echo "<h3>A file has been shared with you</h3>";
     if (!empty($item_note)) {
-      echo "<p class=\"lead\">Note: <i>$item_note</i></p>";
+        echo "<p class=\"lead\">Note: <i>$item_note</i></p>";
     }
     echo "<a href=\"guest_download_file.php?id=$item_id&key=$item_key\" download=\"$file_name;\">Download $file_name</a>";
 
 
-}elseif ($item_type == "Login") {
+} elseif ($item_type == "Login") {
     $encryption_key = $_GET['ek'];
 
     $login_sql = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_id = '$item_related_id' AND login_client_id = '$client_id' LIMIT 1");
@@ -125,7 +125,7 @@ if ($item_type == "Document") {
 
     echo "<h3>A login entry has been shared with you</h3>";
     if (!empty($item_note)) {
-      echo "<p class=\"lead\">Note: <i>$item_note</i></p>";
+        echo "<p class=\"lead\">Note: <i>$item_note</i></p>";
     }
     echo "<br>";
 
@@ -148,4 +148,4 @@ if ($item_type == "Document") {
 
 echo "<br><hr>";
 echo $config_app_name;
-include("guest_footer.php");
+require_once("guest_footer.php");
diff --git a/inc_all.php b/inc_all.php
index 4fd0a4f4..c8ac89cf 100644
--- a/inc_all.php
+++ b/inc_all.php
@@ -1,12 +1,12 @@
 <?php
 
-include("config.php");
+require_once("config.php");
 include_once("functions.php");
-include("check_login.php");
-include("header.php");
-include("top_nav.php");
-include("side_nav.php");
-include("inc_wrapper.php");
-include("inc_alert_feedback.php");
-include("pagination_head.php");
+require_once("check_login.php");
+require_once("header.php");
+require_once("top_nav.php");
+require_once("side_nav.php");
+require_once("inc_wrapper.php");
+require_once("inc_alert_feedback.php");
+require_once("pagination_head.php");
 
diff --git a/inc_all_client.php b/inc_all_client.php
index ddf359b3..153a0857 100644
--- a/inc_all_client.php
+++ b/inc_all_client.php
@@ -1,14 +1,10 @@
-<?php 
+<?php
 
-include("config.php");
-include_once("functions.php");
-include("check_login.php");
-include("header.php");
-include("top_nav.php");
-
-?>
-
-<?php 
+require_once("config.php");
+require_once("functions.php");
+require_once("check_login.php");
+require_once("header.php");
+require_once("top_nav.php");
 
 if (isset($_GET['client_id'])) {
   $client_id = intval($_GET['client_id']);
@@ -24,7 +20,7 @@ if (isset($_GET['client_id'])) {
   if (mysqli_num_rows($sql) == 0) {
     include("header.php");
     echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1></center>";
-  }else{
+  } else {
 
     $row = mysqli_fetch_array($sql);
     $client_name = htmlentities($row['client_name']);
@@ -70,7 +66,7 @@ if (isset($_GET['client_id'])) {
       if (empty($client_tag_icon)) {
         $client_tag_icon = "tag";
       }
-    
+
       $client_tag_id_array[] = $client_tag_id;
       $client_tag_name_display_array[] = "$client_tag_name ";
     }
@@ -84,7 +80,7 @@ if (isset($_GET['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'];
 
     $balance = $invoice_amounts - $amount_paid;
@@ -92,13 +88,13 @@ if (isset($_GET['client_id'])) {
     //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");
     $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");
     $row = mysqli_fetch_array($sql_recurring_yearly_total);
-    
+
     $recurring_yearly_total = $row['recurring_yearly_total'] / 12;
 
     $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total;
@@ -107,10 +103,10 @@ if (isset($_GET['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"));
     $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"));
     $num_assets = $row['num'];
 
@@ -122,25 +118,25 @@ if (isset($_GET['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"));
     $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"));
     $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"));
     $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"));
     $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"));
     $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"));
     $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"));
     $num_invoices_open = $row['num'];
 
@@ -170,10 +166,10 @@ if (isset($_GET['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"));
     $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"));
     $num_documents = $row['num'];
 
@@ -237,14 +233,8 @@ if (isset($_GET['client_id'])) {
   }
 }
 
-?>
-
-<?php
-
-include("client_side_nav.php");
-include("inc_wrapper.php");
-include("inc_alert_feedback.php");
-include("inc_client_top_head.php");
-include("pagination_head.php");
-
-?>
\ No newline at end of file
+require_once("client_side_nav.php");
+require_once("inc_wrapper.php");
+require_once("inc_alert_feedback.php");
+require_once("inc_client_top_head.php");
+require_once("pagination_head.php");
diff --git a/invoice.php b/invoice.php
index 21610614..99aa7e9e 100644
--- a/invoice.php
+++ b/invoice.php
@@ -82,19 +82,7 @@ if (isset($_GET['invoice_id'])) {
         }
 
         //Set Badge color based off of invoice status
-        if ($invoice_status == "Sent") {
-            $invoice_badge_color = "warning text-white";
-        } elseif ($invoice_status == "Viewed") {
-            $invoice_badge_color = "info";
-        } elseif ($invoice_status == "Partial") {
-            $invoice_badge_color = "primary";
-        } elseif ($invoice_status == "Paid") {
-            $invoice_badge_color = "success";
-        } elseif ($invoice_status == "Cancelled") {
-            $invoice_badge_color = "danger";
-        } else {
-            $invoice_badge_color = "secondary";
-        }
+        $invoice_badge_color = getInvoiceBadgeColor($invoice_status);
 
         //Product autocomplete
         $products_sql = mysqli_query($mysqli, "SELECT product_name AS label, product_description AS description, product_price AS price FROM products WHERE company_id = $session_company_id");
diff --git a/invoice_add_modal.php b/invoice_add_modal.php
index 4b33a802..2ebda3c1 100644
--- a/invoice_add_modal.php
+++ b/invoice_add_modal.php
@@ -1,98 +1,98 @@
 <div class="modal" id="addInvoiceModal" 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-file"></i> New Invoice</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">
-          <?php if (isset($_GET['client_id'])) { ?>
-          <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-          <?php }else{ ?>
-
-          <div class="form-group">
-            <label>Client <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>
-              <select class="form-control select2" name="client" required>
-                <option value="">- Client -</option>
-                <?php 
-                
-                $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']);
-                ?>
-                  <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-file"></i> New Invoice</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
+            <form action="post.php" method="post" autocomplete="off">
 
-          <?php } ?>
-         
-          <div class="form-group">
-            <label>Invoice 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="modal-body bg-white">
+                    <?php if (isset($_GET['client_id'])) { ?>
+                        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+                    <?php }else{ ?>
 
-          <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="">- 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 class="form-group">
+                            <label>Client <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>
+                                <select class="form-control select2" name="client" required>
+                                    <option value="">- Client -</option>
+                                    <?php
 
-          <div class="form-group">
-            <label>Scope</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
-              </div>
-              <input type="text" class="form-control" name="scope" placeholder="Quick description">
-            </div>
-          </div>
+                                    $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']);
+                                        ?>
+                                        <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option>
 
+                                        <?php
+                                    }
+                                    ?>
+                                </select>
+                            </div>
+                        </div>
+
+                    <?php } ?>
+
+                    <div class="form-group">
+                        <label>Invoice 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">
+                        <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="">- 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 class="form-group">
+                        <label>Scope</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="scope" placeholder="Quick description">
+                        </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="add_invoice" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</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_invoice" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/invoices.php b/invoices.php
index ee5b0307..6d5ae4e9 100644
--- a/invoices.php
+++ b/invoices.php
@@ -1,7 +1,7 @@
-<?php 
-  
+<?php
+
   include("inc_all.php");
-  
+
   $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent' AND company_id = $session_company_id"));
   $sent_count = $row['num'];
 
@@ -35,7 +35,7 @@
   $sql_total_cancelled = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_cancelled FROM invoices WHERE invoice_status = 'Cancelled' AND company_id = $session_company_id");
   $row = mysqli_fetch_array($sql_total_cancelled);
   $total_cancelled = $row['total_cancelled'];
-  
+
   $sql_total_partial = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_partial FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' AND invoices.company_id = $session_company_id");
   $row = mysqli_fetch_array($sql_total_partial);
   $total_partial = $row['total_partial'];
@@ -82,7 +82,7 @@
   }else{
     $status_query = '%';
   }
-  
+
   //Date Filter
   if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
     $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf']));
@@ -110,12 +110,12 @@
     $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"));  
+    $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)));
 
@@ -243,7 +243,7 @@
               <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo $dtt; ?>">
             </div>
           </div>
-        </div>    
+        </div>
       </div>
     </form>
     <hr>
@@ -264,7 +264,7 @@
         </thead>
         <tbody>
           <?php
-      
+
           while ($row = mysqli_fetch_array($sql)) {
             $invoice_id = $row['invoice_id'];
             $invoice_prefix = htmlentities($row['invoice_prefix']);
@@ -295,23 +295,11 @@
 
             if (($invoice_status == "Sent" || $invoice_status == "Partial" || $invoice_status == "Viewed") && strtotime($invoice_due) + 86400 < $now ) {
               $overdue_color = "text-danger font-weight-bold";
-            }else{
+            } else {
               $overdue_color = "";
             }
 
-            if ($invoice_status == "Sent") {
-              $invoice_badge_color = "warning text-white";
-            }elseif ($invoice_status == "Viewed") {
-              $invoice_badge_color = "info";
-            }elseif ($invoice_status == "Partial") {
-              $invoice_badge_color = "primary";
-            }elseif ($invoice_status == "Paid") {
-              $invoice_badge_color = "success";
-            }elseif ($invoice_status == "Cancelled") {
-              $invoice_badge_color = "danger";
-            }else{
-              $invoice_badge_color = "secondary";
-            }
+          $invoice_badge_color = getInvoiceBadgeColor($invoice_status);
 
           ?>
 
@@ -349,10 +337,10 @@
 
           <?php
 
-            
+
             include("invoice_edit_modal.php");
             include("invoice_copy_modal.php");
-          
+
           }
 
           ?>
@@ -364,11 +352,11 @@
   </div>
 </div>
 
-<?php 
-  
+<?php
+
   include("invoice_add_modal.php");
   include("category_quick_add_modal.php");
 
   include("footer.php");
 
-?>
\ No newline at end of file
+?>
diff --git a/js/client_delete_confirm.js b/js/client_delete_confirm.js
new file mode 100644
index 00000000..3c43c439
--- /dev/null
+++ b/js/client_delete_confirm.js
@@ -0,0 +1,9 @@
+// Force the user to correctly type the client name to be deleted before activating the button to delete a client
+function validateClientNameDelete(client_id) {
+    if (document.getElementById("clientNameProvided" + client_id).value === document.getElementById("clientName" + client_id).value) {
+        document.getElementById("clientDeleteButton" + client_id).className = "btn btn-danger btn-lg px-5";
+    }
+    else{
+        document.getElementById("clientDeleteButton" + client_id).className = "btn btn-danger btn-lg px-5 disabled";
+    }
+}
diff --git a/js/domain_edit_modal.js b/js/domain_edit_modal.js
new file mode 100644
index 00000000..41977a03
--- /dev/null
+++ b/js/domain_edit_modal.js
@@ -0,0 +1,74 @@
+function populateDomainEditModal(client_id, domain_id) {
+
+    // Send a GET request to post.php as post.php?domain_get_json_details=true&client_id=NUM&domain_id=NUM
+    jQuery.get(
+        "ajax.php",
+        {domain_get_json_details: 'true', client_id: client_id, domain_id: domain_id},
+        function(data) {
+
+            // If we get a response from post.php, parse it as JSON
+            const response = JSON.parse(data);
+
+            // Access the domain info (one), registrars (multiple) and webhosts (multiple)
+            const domain = response.domain[0];
+            const vendors = response.vendors;
+
+            // Populate the domain modal fields
+            document.getElementById("editHeader").innerText = domain.domain_name;
+            document.getElementById("editDomainId").value = domain_id;
+            document.getElementById("editDomainName").value = domain.domain_name;
+            document.getElementById("editExpire").value = domain.domain_expire;
+            document.getElementById("editDomainIP").value = domain.domain_ip;
+            document.getElementById("editNameServers").value = domain.domain_name_servers;
+            document.getElementById("editMailServers").value = domain.domain_mail_servers;
+            document.getElementById("editTxtRecords").value = domain.domain_txt;
+            document.getElementById("editRawWhois").value = domain.domain_raw_whois;
+
+            /* DROPDOWNS */
+
+            // Registrar dropdown
+            var registrarDropdown = document.getElementById("editRegistrarId");
+
+            // Clear registrar dropdown
+            var i, L = registrarDropdown.options.length -1;
+            for(i = L; i >= 0; i--) {
+                registrarDropdown.remove(i);
+            }
+            registrarDropdown[registrarDropdown.length] = new Option('- Vendor -', '0');
+
+            // Populate dropdown
+            vendors.forEach(vendor => {
+                if (parseInt(vendor.vendor_id) == parseInt(domain.domain_registrar)) {
+                    // Selected domain
+                    registrarDropdown[registrarDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id, true, true);
+                }
+                else{
+                    registrarDropdown[registrarDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id);
+                }
+            });
+
+            // Webhost dropdown
+            var webhostDropdown = document.getElementById("editWebhostId");
+
+            // Clear registrar dropdown
+            var i, L = webhostDropdown.options.length -1;
+            for(i = L; i >= 0; i--) {
+                webhostDropdown.remove(i);
+            }
+            webhostDropdown[webhostDropdown.length] = new Option('- Vendor -', '0');
+
+            // Populate dropdown
+            vendors.forEach(vendor => {
+                if (parseInt(vendor.vendor_id) == parseInt(domain.domain_webhost)) {
+                    // Selected domain
+                    webhostDropdown[webhostDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id, true, true);
+                }
+                else{
+                    webhostDropdown[webhostDropdown.length] = new Option(vendor.vendor_name, vendor.vendor_id);
+                }
+            });
+
+
+        }
+    );
+}
diff --git a/js/scheduledTickets.js b/js/scheduled_tickets_edit_modal.js
similarity index 100%
rename from js/scheduledTickets.js
rename to js/scheduled_tickets_edit_modal.js
diff --git a/logs.php b/logs.php
index 8274a395..bb62e9cf 100644
--- a/logs.php
+++ b/logs.php
@@ -1,4 +1,6 @@
-<?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']));
@@ -148,14 +150,14 @@ $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;
                         }
                         $client_name = htmlentities($row['client_name']);
                         $client_id = $row['client_id'];
                         if (empty($client_name)) {
                             $client_name_display = "-";
-                        }else{
+                        } else {
                             $client_name_display = "<a href='client_logs.php?client_id=$client_id&tab=logs'>$client_name</a>";
                         }
 
@@ -179,8 +181,9 @@ $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/notifications.php b/notifications.php
index 2240845c..79211e0d 100644
--- a/notifications.php
+++ b/notifications.php
@@ -1,4 +1,6 @@
-<?php require_once("inc_all.php");
+<?php
+
+require_once("inc_all.php");
 
 $sql = 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");
 
@@ -52,9 +54,8 @@ $sql = mysqli_query($mysqli, "SELECT * FROM notifications LEFT JOIN clients ON n
                             <td class="text-center"><a class="btn btn-info btn-sm" href="post.php?dismiss_notification=<?php echo $notification_id; ?>"><i class="fa fa-check"></a></td>
                         </tr>
 
-                        <?php
-                    }
-                    ?>
+                    <?php } ?>
+
 
                     </tbody>
                 </table>
@@ -69,4 +70,5 @@ $sql = mysqli_query($mysqli, "SELECT * FROM notifications LEFT JOIN clients ON n
 
     </div>
 
-<?php require_once("footer.php");
+<?php
+require_once("footer.php");
diff --git a/notifications_dismissed.php b/notifications_dismissed.php
index 2ceed34d..14f13747 100644
--- a/notifications_dismissed.php
+++ b/notifications_dismissed.php
@@ -1,25 +1,26 @@
-<?php include("inc_all.php");
+<?php
+require_once("inc_all.php");
 
 //Column Filter
 if (!empty($_GET['sb'])) {
-  $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-}else{
-  $sb = "notification_timestamp";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+} else {
+    $sb = "notification_timestamp";
 }
 
 // Reverse default sort
 if (!isset($_GET['o'])) {
-  $o = "DESC";
-  $disp = "ASC";
+    $o = "DESC";
+    $disp = "ASC";
 }
 
 //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
@@ -36,99 +37,97 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM notifications
   AND notification_dismissed_at IS NOT NULL 
   ORDER BY $sb $o 
   LIMIT $record_from, $record_to
-"); 
+");
 
 $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-bell"></i> Dismissed Notications</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 Dismissed Notifications">
-            <div class="input-group-append">
-              <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-bell"></i> Dismissed Notications</h3>
         </div>
-        <div class="col-sm-8">
-          <button class="btn btn-primary float-right" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
+        <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 Dismissed Notifications">
+                            <div class="input-group-append">
+                                <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-8">
+                        <button class="btn btn-primary float-right" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
+                    </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>
+            <div class="table-responsive">
+                <table class="table table-hover">
+                    <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=notification_timestamp&o=<?php echo $disp; ?>">Timestamp <i class="fa fa-sort-numeric<?php if ($disp=='ASC') { echo "-up"; }else{ echo "-down"; }?>"></i></a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=notification_type&o=<?php echo $disp; ?>">Type <i class="fa fa-sort-alpha<?php if ($disp=='ASC') { echo "-up"; }else{ echo "-down"; }?>"></i></a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=notification&o=<?php echo $disp; ?>">Notification <i class="fa fa-sort-alpha<?php if ($disp=='ASC') { echo "-up"; }else{ echo "-down"; }?>"></i></a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client <i class="fa fa-sort-numeric<?php if ($disp=='ASC') { echo "-up"; }else{ echo "-down"; }?>"></i></a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=notification_dismissed_at&o=<?php echo $disp; ?>">Dismissed At <i class="fa fa-sort-numeric<?php if ($disp=='ASC') { echo "-up"; }else{ echo "-down"; }?>"></i></a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=user_name&o=<?php echo $disp; ?>">Dismissed By <i class="fa fa-sort-numeric<?php if ($disp=='ASC') { echo "-up"; }else{ echo "-down"; }?>"></i></a></th>
+
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
+
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $notification_id = $row['notification_id'];
+                        $notification_timestamp = $row['notification_timestamp'];
+                        $notification_type = htmlentities($row['notification_type']);
+                        $notification = htmlentities($row['notification']);
+                        $notification_dismissed_at = $row['notification_dismissed_at'];
+                        $user_name = htmlentities($row['user_name']);
+                        $client_name = htmlentities($row['client_name']);
+                        $client_id = $row['client_id'];
+                        if (empty($client_name)) {
+                            $client_name_display = "-";
+                        } else {
+                            $client_name_display = "<a href='client_overview.php?client_id=$client_id'>$client_name</a>";
+                        }
+
+                        ?>
+                        <tr>
+                            <td><?php echo $notification_timestamp; ?></td>
+                            <td><?php echo $notification_type; ?></td>
+                            <td><?php echo $notification; ?></td>
+                            <td><?php echo $client_name_display; ?></td>
+                            <td><?php echo $notification_dismissed_at; ?></td>
+                            <td><?php echo $user_name; ?></td>
+
+                    <?php } ?>
+
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once("pagination.php"); ?>
         </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>
-    <div class="table-responsive">
-      <table class="table table-hover">
-        <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=notification_timestamp&o=<?php echo $disp; ?>">Timestamp <i class="fa fa-sort-numeric<?php if ($disp=='ASC') { echo "-up"; }else{ echo "-down"; }?>"></i></a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=notification_type&o=<?php echo $disp; ?>">Type <i class="fa fa-sort-alpha<?php if ($disp=='ASC') { echo "-up"; }else{ echo "-down"; }?>"></i></a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=notification&o=<?php echo $disp; ?>">Notification <i class="fa fa-sort-alpha<?php if ($disp=='ASC') { echo "-up"; }else{ echo "-down"; }?>"></i></a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client <i class="fa fa-sort-numeric<?php if ($disp=='ASC') { echo "-up"; }else{ echo "-down"; }?>"></i></a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=notification_dismissed_at&o=<?php echo $disp; ?>">Dismissed At <i class="fa fa-sort-numeric<?php if ($disp=='ASC') { echo "-up"; }else{ echo "-down"; }?>"></i></a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=user_name&o=<?php echo $disp; ?>">Dismissed By <i class="fa fa-sort-numeric<?php if ($disp=='ASC') { echo "-up"; }else{ echo "-down"; }?>"></i></a></th>
-            
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $notification_id = $row['notification_id'];
-            $notification_timestamp = $row['notification_timestamp'];
-            $notification_type = htmlentities($row['notification_type']);
-            $notification = htmlentities($row['notification']);
-            $notification_dismissed_at = $row['notification_dismissed_at'];
-            $user_name = htmlentities($row['user_name']);
-            $client_name = htmlentities($row['client_name']);
-            $client_id = $row['client_id'];
-            if (empty($client_name)) {
-              $client_name_display = "-";
-            }else{
-              $client_name_display = "<a href='client_overview.php?client_id=$client_id'>$client_name</a>";
-            }
-
-          ?>
-          <tr>
-            <td><?php echo $notification_timestamp; ?></td>
-            <td><?php echo $notification_type; ?></td>
-            <td><?php echo $notification; ?></td>
-            <td><?php echo $client_name_display; ?></td>
-            <td><?php echo $notification_dismissed_at; ?></td>
-            <td><?php echo $user_name; ?></td>
-
-          <?php
-          
-          }
-          
-          ?>
-
-        </tbody>
-      </table> 
     </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/post.php b/post.php
index d7c283a6..5682173c 100644
--- a/post.php
+++ b/post.php
@@ -1159,11 +1159,11 @@ if(isset($_POST['send_telemetry_data'])){
 
     // Invoice Count
     $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices"));
-    $invoice_count = $row['num'];  
+    $invoice_count = $row['num'];
 
     // Revenue Count
     $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('revenue_id') AS num FROM revenues"));
-    $revenue_count = $row['num'];  
+    $revenue_count = $row['num'];
 
     // Recurring Count
     $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('recurring_id') AS num FROM recurring"));
@@ -1184,7 +1184,7 @@ if(isset($_POST['send_telemetry_data'])){
     // Payment Count
     $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"));
     $company_vendor_count = $row['num'];
@@ -1259,7 +1259,7 @@ if(isset($_POST['send_telemetry_data'])){
 
     // Document Template Count
     $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('document_id') AS num FROM documents WHERE document_template = 1"));
-    $document_template_count = $row['num'];       
+    $document_template_count = $row['num'];
 
     // Shared Item Count
     $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('item_id') AS num FROM shared_items"));
@@ -1586,11 +1586,11 @@ if(isset($_GET['update'])){
 
         // Invoice Count
         $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices"));
-        $invoice_count = $row['num'];  
+        $invoice_count = $row['num'];
 
         // Revenue Count
         $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('revenue_id') AS num FROM revenues"));
-        $revenue_count = $row['num'];  
+        $revenue_count = $row['num'];
 
         // Recurring Count
         $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('recurring_id') AS num FROM recurring"));
@@ -1611,7 +1611,7 @@ if(isset($_GET['update'])){
         // Payment Count
         $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"));
         $company_vendor_count = $row['num'];
@@ -1686,7 +1686,7 @@ if(isset($_GET['update'])){
 
         // Document Template Count
         $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('document_id') AS num FROM documents WHERE document_template = 1"));
-        $document_template_count = $row['num'];       
+        $document_template_count = $row['num'];
 
         // Shared Item Count
         $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('item_id') AS num FROM shared_items"));
@@ -2343,7 +2343,7 @@ if(isset($_POST['edit_vendor_template'])){
         $sql_update_vendors = "";
     }
 
-    //Update the exisiting template and all templates bassed of this vendor template 
+    //Update the exisiting template and all templates bassed of this vendor template
     mysqli_query($mysqli,"UPDATE vendors SET vendor_name = '$name', vendor_description = '$description', vendor_contact_name = '$contact_name', vendor_phone = '$phone', vendor_extension = '$extension', vendor_email = '$email', vendor_website = '$website', vendor_hours = '$hours', vendor_sla = '$sla', vendor_code = '$code',vendor_account_number = '$account_number', vendor_notes = '$notes' WHERE (vendor_id = $vendor_id $sql_update_vendors) AND company_id = $session_company_id");
 
     //Logging
@@ -2477,7 +2477,7 @@ if(isset($_GET['delete_vendor'])){
     $vendor_name = strip_tags(mysqli_real_escape_string($mysqli, $row['vendor_name']));
     $client_id = intval($row['vendor_client_id']);
     $vendor_template_id = intval($row['vendor_template_id']);
-    
+
     // If its a template reset all vendors based off this template to no template base
     if ($vendor_template_id > 0){
         mysqli_query($mysqli,"UPDATE vendors SET vendor_template_id = 0 WHERE vendor_template_id = $vendor_template_id");
@@ -5396,8 +5396,8 @@ if(isset($_POST['edit_asset'])){
         $install_date = "0000-00-00";
     }
     $notes = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes'])));
-    $username = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['username'])));
-    $password = trim(mysqli_real_escape_string($mysqli,encryptLoginEntry($_POST['password'])));
+    $username = trim(mysqli_real_escape_string($mysqli, encryptLoginEntry($_POST['username'])));
+    $password = trim(mysqli_real_escape_string($mysqli, encryptLoginEntry($_POST['password'])));
 
     mysqli_query($mysqli,"UPDATE assets SET asset_name = '$name', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_os = '$os', asset_ip = '$ip', asset_mac = '$mac', asset_location_id = $location, asset_vendor_id = $vendor, asset_contact_id = $contact, asset_status = '$status', asset_purchase_date = '$purchase_date', asset_warranty_expire = '$warranty_expire', asset_install_date = '$install_date', asset_notes = '$notes', asset_network_id = $network WHERE asset_id = $asset_id AND company_id = $session_company_id");
 
diff --git a/quote_add_modal.php b/quote_add_modal.php
index d8489d2e..f95008b4 100644
--- a/quote_add_modal.php
+++ b/quote_add_modal.php
@@ -1,99 +1,96 @@
 <div class="modal" id="addQuoteModal" 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-file"></i> New Quote</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="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-file"></i> New Quote</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
 
-          <?php if (isset($_GET['client_id'])) { ?>
-          <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-          <?php }else{ ?>
-          
-          <div class="form-group">
-            <label>Client <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>
-              <select class="form-control select2" name="client" required>
-                <option value="">- Client -</option>
-                <?php 
-                
-                $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']);
-                ?>
-                  <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
+                <div class="modal-body bg-white">
 
-          <?php } ?>
-          
-          <div class="form-group">
-            <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">
-            <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="">- 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>
+                    <?php if (isset($_GET['client_id'])) { ?>
+                        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+                    <?php } else { ?>
 
-          <div class="form-group">
-            <label>Scope</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
-              </div>
-              <input type="text" class="form-control" name="scope" placeholder="Quick description">
-            </div>
-          </div>
-        
+                        <div class="form-group">
+                            <label>Client <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>
+                                <select class="form-control select2" name="client" required>
+                                    <option value="">- Client -</option>
+                                    <?php
+
+                                    $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']);
+                                        ?>
+                                        <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+                                    <?php } ?>
+
+                                </select>
+                            </div>
+                        </div>
+
+                    <?php } ?>
+
+                    <div class="form-group">
+                        <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">
+                        <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="">- 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 class="form-group">
+                        <label>Scope</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="scope" placeholder="Quick description">
+                        </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="add_quote" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</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_quote" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/revenues.php b/revenues.php
index a3a26347..c9b95772 100644
--- a/revenues.php
+++ b/revenues.php
@@ -1,54 +1,56 @@
-<?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 = "revenue_date";
+    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+} else {
+    $sb = "revenue_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
@@ -67,141 +69,138 @@ $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-credit-card"></i> Revenues</h3>
-    <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRevenueModal"><i class="fas fa-fw fa-plus"></i> Add Revenue</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 Revenues">
-            <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-header py-2">
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-credit-card"></i> Revenues</h3>
+        <div class="card-tools">
+            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRevenueModal"><i class="fas fa-fw fa-plus"></i> Add Revenue</button>
         </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="<?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-          <tr>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=revenue_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 class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=revenue_amount&o=<?php echo $disp; ?>">Amount</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=revenue_payment_method&o=<?php echo $disp; ?>">Method</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=revenue_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>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $revenue_id = $row['revenue_id'];
-            $revenue_description = htmlentities($row['revenue_description']);
-            $revenue_reference = htmlentities($row['revenue_reference']);
-            if (empty($revenue_reference)) {
-              $revenue_reference_display = "-";
-            }else{
-              $revenue_reference_display = $revenue_reference;
-            }
-            $revenue_date = $row['revenue_date'];
-            $revenue_payment_method = htmlentities($row['revenue_payment_method']);
-            $revenue_amount = floatval($row['revenue_amount']);
-            $revenue_currency_code = htmlentities($row['revenue_currency_code']);
-            $revenue_created_at = $row['revenue_created_at'];
-            $account_id = $row['account_id'];
-            $account_name = htmlentities($row['account_name']);
-            $category_id = $row['category_id'];
-            $category_name = htmlentities($row['category_name']);
-
-          ?>
-
-          <tr>
-            <td><a href="#" data-toggle="modal" data-target="#editRevenueModal<?php echo $revenue_id; ?>"><?php echo $revenue_date; ?></a></td>
-            <td><?php echo $category_name; ?></td>
-            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $revenue_amount, $revenue_currency_code); ?></td>
-            <td><?php echo $revenue_payment_method; ?></td>
-            <td><?php echo $revenue_reference_display; ?></td>
-            <td><?php echo $account_name; ?></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="#editRevenueModal<?php echo $revenue_id; ?>">Edit</a>
-                  <div class="dropdown-divider"></div>
-                  <a class="dropdown-item text-danger" href="post.php?delete_revenue=<?php echo $revenue_id; ?>">Delete</a>
-                </div>
-              </div>
-              <?php
-
-              include("revenue_edit_modal.php");
-
-              ?>      
-            </td>
-          </tr>
-
-          <?php
-
-          }
-
-          ?>
-
-        </tbody>
-      </table>
     </div>
-    <?php include("pagination.php"); ?>
-  </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 Revenues">
+                        <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="<?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                <tr>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=revenue_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 class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=revenue_amount&o=<?php echo $disp; ?>">Amount</a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=revenue_payment_method&o=<?php echo $disp; ?>">Method</a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=revenue_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>
+                    <th class="text-center">Action</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
+
+                while ($row = mysqli_fetch_array($sql)) {
+                    $revenue_id = $row['revenue_id'];
+                    $revenue_description = htmlentities($row['revenue_description']);
+                    $revenue_reference = htmlentities($row['revenue_reference']);
+                    if (empty($revenue_reference)) {
+                        $revenue_reference_display = "-";
+                    } else {
+                        $revenue_reference_display = $revenue_reference;
+                    }
+                    $revenue_date = $row['revenue_date'];
+                    $revenue_payment_method = htmlentities($row['revenue_payment_method']);
+                    $revenue_amount = floatval($row['revenue_amount']);
+                    $revenue_currency_code = htmlentities($row['revenue_currency_code']);
+                    $revenue_created_at = $row['revenue_created_at'];
+                    $account_id = $row['account_id'];
+                    $account_name = htmlentities($row['account_name']);
+                    $category_id = $row['category_id'];
+                    $category_name = htmlentities($row['category_name']);
+
+                    ?>
+
+                    <tr>
+                        <td><a href="#" data-toggle="modal" data-target="#editRevenueModal<?php echo $revenue_id; ?>"><?php echo $revenue_date; ?></a></td>
+                        <td><?php echo $category_name; ?></td>
+                        <td class="text-right"><?php echo numfmt_format_currency($currency_format, $revenue_amount, $revenue_currency_code); ?></td>
+                        <td><?php echo $revenue_payment_method; ?></td>
+                        <td><?php echo $revenue_reference_display; ?></td>
+                        <td><?php echo $account_name; ?></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="#editRevenueModal<?php echo $revenue_id; ?>">Edit</a>
+                                    <div class="dropdown-divider"></div>
+                                    <a class="dropdown-item text-danger" href="post.php?delete_revenue=<?php echo $revenue_id; ?>">Delete</a>
+                                </div>
+                            </div>
+                            <?php
+
+                            require("revenue_edit_modal.php");
+
+                            ?>
+                        </td>
+                    </tr>
+
+                <?php } ?>
+
+
+                </tbody>
+            </table>
+        </div>
+        <?php require_once("pagination.php"); ?>
+    </div>
 </div>
 
-<?php 
+<?php
 
-  include("revenue_add_modal.php");
-  include("category_quick_add_modal.php");
+require_once("revenue_add_modal.php");
+require_once("category_quick_add_modal.php");
 
-  include("footer.php");
+require_once("footer.php");
 
-?>
\ No newline at end of file
+?>
diff --git a/scheduled_tickets.php b/scheduled_tickets.php
index 2134a94d..6aca2c11 100644
--- a/scheduled_tickets.php
+++ b/scheduled_tickets.php
@@ -20,7 +20,7 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM scheduled_tickets
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 ?>
 
-<script src="js/scheduledTickets.js"></script>
+<script src="js/scheduled_tickets_edit_modal.js"></script>
 
 <div class="card card-dark">
   <div class="card-header">
@@ -112,4 +112,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 <?php
 include("scheduled_ticket_edit_modal.php");
-include("footer.php");
\ No newline at end of file
+include("footer.php");
diff --git a/settings_api.php b/settings_api.php
index 6f69bfe8..64025385 100644
--- a/settings_api.php
+++ b/settings_api.php
@@ -1,109 +1,103 @@
-<?php require_once("inc_all_settings.php");
+<?php
 
-  if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-  }else{
+require_once("inc_all_settings.php");
+
+if (!empty($_GET['sb'])) {
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
+} else {
     $sb = "api_key_name";
-  }
+}
 
-  //Rebuild URL
-  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+//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()"));
 
 ?>
 
-<div class="card card-dark">
-  <div class="card-header py-2">
-    <h3 class="card-title mt-2"><i class="fa fa-fw fa-key"></i> API Keys</h3>
-    <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addApiKeyModal"><i class="fas fa-fw fa-plus"></i> New Key</button>
-    </div>
-  </div>
-  <div class="card-body">
-    <form autocomplete="off">
-      <div class="input-group">
-        <input type="search" class="form-control col-md-4" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search keys">
-        <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-key"></i> API Keys</h3>
+            <div class="card-tools">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addApiKeyModal"><i class="fas fa-fw fa-plus"></i> New Key</button>
+            </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=api_key_name&o=<?php echo $disp; ?>">Name</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=api_key_client_id&o=<?php echo $disp; ?>">Client</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=api_key_secret&o=<?php echo $disp; ?>">Secret</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=api_key_created_at&o=<?php echo $disp; ?>">Created</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=api_key_expire&o=<?php echo $disp; ?>">Expire</a></th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $api_key_id = $row['api_key_id'];
-            $api_key_name = htmlentities($row['api_key_name']);
-            $api_key_secret = htmlentities("************" . substr($row['api_key_secret'], -4));
-            $api_key_created_at = $row['api_key_created_at'];
-            $api_key_expire = $row['api_key_expire'];
-            if ($api_key_expire < date("Y-m-d H:i:s")) {
-              $api_key_expire = $api_key_expire . " (Expired)";
-            }
-
-            if ($row['api_key_client_id'] == 0) {
-              $api_key_client = "<i>All Clients</i>";
-            }
-            else{
-              $api_key_client = htmlentities($row['client_name']);
-            }
-  
-          ?>
-          <tr>
-            <td><?php echo $api_key_name; ?></td>
-            <td><?php echo $api_key_client; ?></td>
-            <td><?php echo $api_key_secret; ?></td>
-            <td><?php echo $api_key_created_at; ?></td>
-            <td><?php echo $api_key_expire; ?></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 text-danger" href="post.php?delete_api_key=<?php echo $api_key_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">Revoke</a>
+        <div class="card-body">
+            <form autocomplete="off">
+                <div class="input-group">
+                    <input type="search" class="form-control col-md-4" name="q" value="<?php if (isset($q)) { echo strip_tags(htmlentities($q)); } ?>" placeholder="Search keys">
+                    <div class="input-group-append">
+                        <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+                    </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=api_key_name&o=<?php echo $disp; ?>">Name</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=api_key_client_id&o=<?php echo $disp; ?>">Client</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=api_key_secret&o=<?php echo $disp; ?>">Secret</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=api_key_created_at&o=<?php echo $disp; ?>">Created</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=api_key_expire&o=<?php echo $disp; ?>">Expire</a></th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
 
-          <?php
-          
-          }
-      
-          ?>
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $api_key_id = $row['api_key_id'];
+                        $api_key_name = htmlentities($row['api_key_name']);
+                        $api_key_secret = htmlentities("************" . substr($row['api_key_secret'], -4));
+                        $api_key_created_at = $row['api_key_created_at'];
+                        $api_key_expire = $row['api_key_expire'];
+                        if ($api_key_expire < date("Y-m-d H:i:s")) {
+                            $api_key_expire = $api_key_expire . " (Expired)";
+                        }
 
-        </tbody>
-      </table>
+                        if ($row['api_key_client_id'] == 0) {
+                            $api_key_client = "<i>All Clients</i>";
+                        } else {
+                            $api_key_client = htmlentities($row['client_name']);
+                        }
+
+                        ?>
+                        <tr>
+                            <td><?php echo $api_key_name; ?></td>
+                            <td><?php echo $api_key_client; ?></td>
+                            <td><?php echo $api_key_secret; ?></td>
+                            <td><?php echo $api_key_created_at; ?></td>
+                            <td><?php echo $api_key_expire; ?></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 text-danger" href="post.php?delete_api_key=<?php echo $api_key_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">Revoke</a>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                    <?php } ?>
+
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once("pagination.php"); ?>
+        </div>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
-</div>
 
 <?php
-  
-  include("api_key_add_modal.php");
-  
-  include("footer.php");
-
-?>
+require_once("api_key_add_modal.php");
+require_once("footer.php");
diff --git a/settings_backup.php b/settings_backup.php
index ce21b22d..6b056eab 100644
--- a/settings_backup.php
+++ b/settings_backup.php
@@ -1,4 +1,5 @@
-<?php require_once("inc_all_settings.php"); ?>
+<?php
+require_once("inc_all_settings.php"); ?>
 
     <div class="card card-dark mb-3">
         <div class="card-header py-3">
@@ -30,4 +31,5 @@
         </div>
     </div>
 
-<?php require_once("footer.php");
+<?php
+require_once("footer.php");
diff --git a/settings_defaults.php b/settings_defaults.php
index 00a65ae2..7323d381 100644
--- a/settings_defaults.php
+++ b/settings_defaults.php
@@ -1,205 +1,180 @@
-<?php require_once("inc_all_settings.php"); ?>
+<?php
 
-<div class="card card-dark">
-  <div class="card-header py-3">
-    <h3 class="card-title"><i class="fa fa-fw fa-cog"></i> Defaults</h3>
-  </div>
-  <div class="card-body">
-    <form action="post.php" method="post" autocomplete="off">
+require_once("inc_all_settings.php"); ?>
 
-      <div class="form-group">
-        <label>Transfer From Account</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
-          </div>
-          <select class="form-control select2" name="transfer_from_account">
-            <option value="0">- None -</option>
-            <?php 
-            
-            $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']);
-
-            ?>
-              <option <?php if ($config_default_transfer_from_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
-            
-            <?php
-            }
-            ?>
-          </select>
+    <div class="card card-dark">
+        <div class="card-header py-3">
+            <h3 class="card-title"><i class="fa fa-fw fa-cog"></i> Defaults</h3>
         </div>
-      </div>
-      
-      <div class="form-group">
-        <label>Transfer To Account</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
-          </div>
-          <select class="form-control select2" name="transfer_to_account">
-            <option value="0">- None -</option>
-            <?php 
-            
-            $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']);
+        <div class="card-body">
+            <form action="post.php" method="post" autocomplete="off">
 
-            ?>
-              <option <?php if ($config_default_transfer_to_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
-            
-            <?php
-            }
-            ?>
-          </select>
+                <div class="form-group">
+                    <label>Transfer From Account</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
+                        </div>
+                        <select class="form-control select2" name="transfer_from_account">
+                            <option value="0">- None -</option>
+                            <?php
+
+                            $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']); ?>
+                                <option <?php if ($config_default_transfer_from_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Transfer To Account</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
+                        </div>
+                        <select class="form-control select2" name="transfer_to_account">
+                            <option value="0">- None -</option>
+                            <?php
+
+                            $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']); ?>
+                                <option <?php if ($config_default_transfer_to_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Payment Account</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
+                        </div>
+                        <select class="form-control select2" name="payment_account">
+                            <option value="0">- None -</option>
+                            <?php
+
+                            $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']); ?>
+                                <option <?php if ($config_default_payment_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Expense Account</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                        </div>
+                        <select class="form-control select2" name="expense_account">
+                            <option value="0">- None -</option>
+                            <?php
+
+                            $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']); ?>
+                                <option <?php if ($config_default_expense_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Payment Method</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
+                        </div>
+                        <select class="form-control select2" name="payment_method">
+                            <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");
+                            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>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Expense Payment Method</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
+                        </div>
+                        <select class="form-control select2" name="expense_payment_method">
+                            <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");
+                            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>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Calendar</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>
+                        <select class="form-control select2" name="calendar">
+                            <option value="0">- None -</option>
+                            <?php
+
+                            $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']); ?>
+                                <option <?php if ($config_default_calendar == $calendar_id) { echo "selected"; } ?> value="<?php echo $calendar_id; ?>"><?php echo $calendar_name; ?></option>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Net Terms</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>
+                        <select class="form-control select2" name="net_terms">
+                            <?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
+                                <option <?php if ($config_default_net_terms == $net_term_value) { echo "selected"; } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+                <hr>
+
+                <button type="submit" name="edit_default_settings" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
+
+            </form>
         </div>
-      </div>
+    </div>
 
-      <div class="form-group">
-        <label>Payment Account</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
-          </div>
-          <select class="form-control select2" name="payment_account">
-            <option value="0">- None -</option>
-            <?php 
-            
-            $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']);
-
-            ?>
-              <option <?php if ($config_default_payment_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
-            
-            <?php
-            }
-            ?>
-          </select>
-        </div>
-      </div>
-
-      <div class="form-group">
-        <label>Expense Account</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-          </div>
-          <select class="form-control select2" name="expense_account">
-            <option value="0">- None -</option>
-            <?php 
-            
-            $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']);
-
-            ?>
-              <option <?php if ($config_default_expense_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
-            
-            <?php
-            }
-            ?>
-          </select>
-        </div>
-      </div>
-
-      <div class="form-group">
-        <label>Payment Method</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
-          </div>
-          <select class="form-control select2" name="payment_method">
-            <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"); 
-            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>
-            
-            <?php
-            }
-            ?>
-          </select>
-        </div>
-      </div>
-
-      <div class="form-group">
-        <label>Expense Payment Method</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
-          </div>
-          <select class="form-control select2" name="expense_payment_method">
-            <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"); 
-            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>
-            
-            <?php
-            }
-            ?>
-          </select>
-        </div>
-      </div>
-
-      <div class="form-group">
-        <label>Calendar</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>
-          <select class="form-control select2" name="calendar">
-            <option value="0">- None -</option>
-            <?php 
-            
-            $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']);
-
-            ?>
-              <option <?php if ($config_default_calendar == $calendar_id) { echo "selected"; } ?> value="<?php echo $calendar_id; ?>"><?php echo $calendar_name; ?></option>
-            
-            <?php
-            }
-            ?>
-          </select>
-        </div>
-      </div>
-
-      <div class="form-group">
-        <label>Net Terms</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>
-          <select class="form-control select2" name="net_terms">
-            <?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
-            <option <?php if ($config_default_net_terms == $net_term_value) { echo "selected"; } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
-            <?php } ?>
-          </select>
-        </div>
-      </div>
-
-      <hr>
-      
-      <button type="submit" name="edit_default_settings" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
-        
-    </form>
-  </div>
-</div>
-
-<?php include("footer.php");
+<?php
+require_once("footer.php");
diff --git a/settings_modules.php b/settings_modules.php
index 5756a95e..8082387a 100644
--- a/settings_modules.php
+++ b/settings_modules.php
@@ -1,39 +1,42 @@
-<?php require_once("inc_all_settings.php"); ?>
+<?php
 
-<div class="card card-dark">
-  <div class="card-header py-3">
-    <h3 class="card-title"><i class="fa fa-fw fa-puzzle-piece"></i> Modules</h3>
-  </div>
-  <div class="card-body">
-    <form action="post.php" method="post" autocomplete="off">
+require_once("inc_all_settings.php"); ?>
 
-      <div class="form-group">
-        <div class="custom-control custom-switch">
-          <input type="checkbox" class="custom-control-input" name="config_module_enable_itdoc" <?php if ($config_module_enable_itdoc == 1) { echo "checked"; } ?> value="1" id="customSwitch1">
-          <label class="custom-control-label" for="customSwitch1">Show IT Documentation</label>
+    <div class="card card-dark">
+        <div class="card-header py-3">
+            <h3 class="card-title"><i class="fa fa-fw fa-puzzle-piece"></i> Modules</h3>
         </div>
-      </div>
+        <div class="card-body">
+            <form action="post.php" method="post" autocomplete="off">
 
-      <div class="form-group">
-        <div class="custom-control custom-switch">
-          <input type="checkbox" class="custom-control-input" name="config_module_enable_ticketing" <?php if ($config_module_enable_ticketing == 1) { echo "checked"; } ?> value="1" id="customSwitch2">
-          <label class="custom-control-label" for="customSwitch2">Show Ticketing</label>
+                <div class="form-group">
+                    <div class="custom-control custom-switch">
+                        <input type="checkbox" class="custom-control-input" name="config_module_enable_itdoc" <?php if ($config_module_enable_itdoc == 1) { echo "checked"; } ?> value="1" id="customSwitch1">
+                        <label class="custom-control-label" for="customSwitch1">Show IT Documentation</label>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <div class="custom-control custom-switch">
+                        <input type="checkbox" class="custom-control-input" name="config_module_enable_ticketing" <?php if ($config_module_enable_ticketing == 1) { echo "checked"; } ?> value="1" id="customSwitch2">
+                        <label class="custom-control-label" for="customSwitch2">Show Ticketing</label>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <div class="custom-control custom-switch">
+                        <input type="checkbox" class="custom-control-input" name="config_module_enable_accounting" <?php if ($config_module_enable_accounting == 1) { echo "checked"; } ?> value="1" id="customSwitch3">
+                        <label class="custom-control-label" for="customSwitch3">Show Invoicing / Accounting</label>
+                    </div>
+                </div>
+
+                <hr>
+
+                <button type="submit" name="edit_module_settings" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
+
+            </form>
         </div>
-      </div>
+    </div>
 
-      <div class="form-group">
-        <div class="custom-control custom-switch">
-          <input type="checkbox" class="custom-control-input" name="config_module_enable_accounting" <?php if ($config_module_enable_accounting == 1) { echo "checked"; } ?> value="1" id="customSwitch3">
-          <label class="custom-control-label" for="customSwitch3">Show Invoicing / Accounting</label>
-        </div>
-      </div>
-
-      <hr>
-
-      <button type="submit" name="edit_module_settings" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
-        
-    </form>
-  </div>
-</div>
-
-<?php include("footer.php");
+<?php
+require_once("footer.php");
diff --git a/settings_online_payment.php b/settings_online_payment.php
index 2a5d54bd..8afc97fc 100644
--- a/settings_online_payment.php
+++ b/settings_online_payment.php
@@ -1,53 +1,55 @@
-<?php require_once("inc_all_settings.php"); ?>
+<?php
 
-<div class="alert alert-warning">
-  Work in Progress
-</div>
+require_once("inc_all_settings.php"); ?>
 
-<div class="card card-dark">
-  <div class="card-header py-3">
-    <h3 class="card-title"><i class="fa fa-fw fa-credit-card"></i> Online Payment</h3>
-  </div>
-  <div class="card-body">
-    <form action="post.php" method="post" autocomplete="off">
+    <div class="alert alert-warning">
+        Work in Progress - Not yet functioning
+    </div>
 
-      <div class="form-group">
-        <div class="custom-control custom-switch">
-          <input type="checkbox" class="custom-control-input" name="config_stripe_enable" <?php if ($config_stripe_enable == 1) { echo "checked"; } ?> value="1" id="enableStripeSwitch">
-          <label class="custom-control-label" for="enableStripeSwitch">Enable Stripe</label>
+    <div class="card card-dark">
+        <div class="card-header py-3">
+            <h3 class="card-title"><i class="fa fa-fw fa-credit-card"></i> Online Payment</h3>
         </div>
-      </div>
+        <div class="card-body">
+            <form action="post.php" method="post" autocomplete="off">
 
-      <?php if ($config_stripe_enable == 1) { ?>
+                <div class="form-group">
+                    <div class="custom-control custom-switch">
+                        <input type="checkbox" class="custom-control-input" name="config_stripe_enable" <?php if ($config_stripe_enable == 1) { echo "checked"; } ?> value="1" id="enableStripeSwitch">
+                        <label class="custom-control-label" for="enableStripeSwitch">Enable Stripe</label>
+                    </div>
+                </div>
 
-      <div class="form-group">
-        <label>Publishable</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-          </div>
-          <input type="text" class="form-control" name="config_stripe_publishable" placeholder="Stripe Publishable API Key" value="<?php echo htmlentities($config_stripe_publishable); ?>">
+                <?php if ($config_stripe_enable == 1) { ?>
+
+                    <div class="form-group">
+                        <label>Publishable</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="config_stripe_publishable" placeholder="Stripe Publishable API Key" value="<?php echo htmlentities($config_stripe_publishable); ?>">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Secret</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="text" class="form-control" name="config_stripe_secret" placeholder="Stripe Secret API Key" value="<?php echo htmlentities($config_stripe_secret); ?>">
+                        </div>
+                    </div>
+
+                <?php } ?>
+
+                <hr>
+
+                <button type="submit" name="edit_online_payment_settings" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
+
+            </form>
         </div>
-      </div>
+    </div>
 
-      <div class="form-group">
-        <label>Secret</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="text" class="form-control" name="config_stripe_secret" placeholder="Stripe Secret API Key" value="<?php echo htmlentities($config_stripe_secret); ?>">
-        </div>
-      </div>
-
-      <?php } ?>
-      
-      <hr>
-      
-      <button type="submit" name="edit_online_payment_settings" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
-        
-    </form>
-  </div>
-</div>
-
-<?php include("footer.php");
+<?php require_once("footer.php");
diff --git a/settings_ticket.php b/settings_ticket.php
index 5049255a..df30ca9a 100644
--- a/settings_ticket.php
+++ b/settings_ticket.php
@@ -1,4 +1,5 @@
-<?php require_once("inc_all_settings.php"); ?>
+<?php
+require_once("inc_all_settings.php"); ?>
 
     <div class="card card-dark">
         <div class="card-header py-3">
@@ -69,4 +70,5 @@
         </div>
     </div>
 
-<?php include("footer.php");
+<?php
+require_once("footer.php");
diff --git a/setup.php b/setup.php
index eb088d1c..9f1650a5 100644
--- a/setup.php
+++ b/setup.php
@@ -1,1079 +1,1079 @@
 <?php
 
 if (file_exists("config.php")) {
-  include("config.php");
+    include("config.php");
 }
 
 include("functions.php");
 include("database_version.php");
 
 if (!isset($config_enable_setup)) {
-  $config_enable_setup = 1;
+    $config_enable_setup = 1;
 }
 
 if ($config_enable_setup == 0) {
-  header("Location: login.php");
-  exit;
+    header("Location: login.php");
+    exit;
 }
 
 $countries_array = array(
-  "Afghanistan",
-  "Albania",
-  "Algeria",
-  "Andorra",
-  "Angola",
-  "Antigua and Barbuda",
-  "Argentina",
-  "Armenia",
-  "Australia",
-  "Austria",
-  "Azerbaijan",
-  "Bahamas",
-  "Bahrain",
-  "Bangladesh",
-  "Barbados",
-  "Belarus",
-  "Belgium",
-  "Belize",
-  "Benin",
-  "Bhutan",
-  "Bolivia",
-  "Bosnia and Herzegovina",
-  "Botswana",
-  "Brazil",
-  "Brunei",
-  "Bulgaria",
-  "Burkina Faso",
-  "Burundi",
-  "Cambodia",
-  "Cameroon",
-  "Canada",
-  "Cape Verde",
-  "Central African Republic",
-  "Chad",
-  "Chile",
-  "China",
-  "Colombi",
-  "Comoros",
-  "Congo (Brazzaville)",
-  "Congo",
-  "Costa Rica",
-  "Cote d'Ivoire",
-  "Croatia",
-  "Cuba",
-  "Cyprus",
-  "Czech Republic",
-  "Denmark",
-  "Djibouti",
-  "Dominica",
-  "Dominican Republic",
-  "East Timor (Timor Timur)",
-  "Ecuador",
-  "Egypt",
-  "El Salvador",
-  "Equatorial Guinea",
-  "Eritrea",
-  "Estonia",
-  "Ethiopia",
-  "Fiji",
-  "Finland",
-  "France",
-  "Gabon",
-  "Gambia, The",
-  "Georgia",
-  "Germany",
-  "Ghana",
-  "Greece",
-  "Grenada",
-  "Guatemala",
-  "Guinea",
-  "Guinea-Bissau",
-  "Guyana",
-  "Haiti",
-  "Honduras",
-  "Hungary",
-  "Iceland",
-  "India",
-  "Indonesia",
-  "Iran",
-  "Iraq",
-  "Ireland",
-  "Israel",
-  "Italy",
-  "Jamaica",
-  "Japan",
-  "Jordan",
-  "Kazakhstan",
-  "Kenya",
-  "Kiribati",
-  "Korea, North",
-  "Korea, South",
-  "Kuwait",
-  "Kyrgyzstan",
-  "Laos",
-  "Latvia",
-  "Lebanon",
-  "Lesotho",
-  "Liberia",
-  "Libya",
-  "Liechtenstein",
-  "Lithuania",
-  "Luxembourg",
-  "Macedonia",
-  "Madagascar",
-  "Malawi",
-  "Malaysia",
-  "Maldives",
-  "Mali",
-  "Malta",
-  "Marshall Islands",
-  "Mauritania",
-  "Mauritius",
-  "Mexico",
-  "Micronesia",
-  "Moldova",
-  "Monaco",
-  "Mongolia",
-  "Morocco",
-  "Mozambique",
-  "Myanmar",
-  "Namibia",
-  "Nauru",
-  "Nepal",
-  "Netherlands",
-  "New Zealand",
-  "Nicaragua",
-  "Niger",
-  "Nigeria",
-  "Norway",
-  "Oman",
-  "Pakistan",
-  "Palau",
-  "Panama",
-  "Papua New Guinea",
-  "Paraguay",
-  "Peru",
-  "Philippines",
-  "Poland",
-  "Portugal",
-  "Qatar",
-  "Romania",
-  "Russia",
-  "Rwanda",
-  "Saint Kitts and Nevis",
-  "Saint Lucia",
-  "Saint Vincent",
-  "Samoa",
-  "San Marino",
-  "Sao Tome and Principe",
-  "Saudi Arabia",
-  "Senegal",
-  "Serbia and Montenegro",
-  "Seychelles",
-  "Sierra Leone",
-  "Singapore",
-  "Slovakia",
-  "Slovenia",
-  "Solomon Islands",
-  "Somalia",
-  "South Africa",
-  "Spain",
-  "Sri Lanka",
-  "Sudan",
-  "Suriname",
-  "Swaziland",
-  "Sweden",
-  "Switzerland",
-  "Syria",
-  "Taiwan",
-  "Tajikistan",
-  "Tanzania",
-  "Thailand",
-  "Togo",
-  "Tonga",
-  "Trinidad and Tobago",
-  "Tunisia",
-  "Turkey",
-  "Turkmenistan",
-  "Tuvalu",
-  "Uganda",
-  "Ukraine",
-  "United Arab Emirates",
-  "United Kingdom",
-  "United States",
-  "Uruguay",
-  "Uzbekistan",
-  "Vanuatu",
-  "Vatican City",
-  "Venezuela",
-  "Vietnam",
-  "Yemen",
-  "Zambia",
-  "Zimbabwe"
+    "Afghanistan",
+    "Albania",
+    "Algeria",
+    "Andorra",
+    "Angola",
+    "Antigua and Barbuda",
+    "Argentina",
+    "Armenia",
+    "Australia",
+    "Austria",
+    "Azerbaijan",
+    "Bahamas",
+    "Bahrain",
+    "Bangladesh",
+    "Barbados",
+    "Belarus",
+    "Belgium",
+    "Belize",
+    "Benin",
+    "Bhutan",
+    "Bolivia",
+    "Bosnia and Herzegovina",
+    "Botswana",
+    "Brazil",
+    "Brunei",
+    "Bulgaria",
+    "Burkina Faso",
+    "Burundi",
+    "Cambodia",
+    "Cameroon",
+    "Canada",
+    "Cape Verde",
+    "Central African Republic",
+    "Chad",
+    "Chile",
+    "China",
+    "Colombi",
+    "Comoros",
+    "Congo (Brazzaville)",
+    "Congo",
+    "Costa Rica",
+    "Cote d'Ivoire",
+    "Croatia",
+    "Cuba",
+    "Cyprus",
+    "Czech Republic",
+    "Denmark",
+    "Djibouti",
+    "Dominica",
+    "Dominican Republic",
+    "East Timor (Timor Timur)",
+    "Ecuador",
+    "Egypt",
+    "El Salvador",
+    "Equatorial Guinea",
+    "Eritrea",
+    "Estonia",
+    "Ethiopia",
+    "Fiji",
+    "Finland",
+    "France",
+    "Gabon",
+    "Gambia, The",
+    "Georgia",
+    "Germany",
+    "Ghana",
+    "Greece",
+    "Grenada",
+    "Guatemala",
+    "Guinea",
+    "Guinea-Bissau",
+    "Guyana",
+    "Haiti",
+    "Honduras",
+    "Hungary",
+    "Iceland",
+    "India",
+    "Indonesia",
+    "Iran",
+    "Iraq",
+    "Ireland",
+    "Israel",
+    "Italy",
+    "Jamaica",
+    "Japan",
+    "Jordan",
+    "Kazakhstan",
+    "Kenya",
+    "Kiribati",
+    "Korea, North",
+    "Korea, South",
+    "Kuwait",
+    "Kyrgyzstan",
+    "Laos",
+    "Latvia",
+    "Lebanon",
+    "Lesotho",
+    "Liberia",
+    "Libya",
+    "Liechtenstein",
+    "Lithuania",
+    "Luxembourg",
+    "Macedonia",
+    "Madagascar",
+    "Malawi",
+    "Malaysia",
+    "Maldives",
+    "Mali",
+    "Malta",
+    "Marshall Islands",
+    "Mauritania",
+    "Mauritius",
+    "Mexico",
+    "Micronesia",
+    "Moldova",
+    "Monaco",
+    "Mongolia",
+    "Morocco",
+    "Mozambique",
+    "Myanmar",
+    "Namibia",
+    "Nauru",
+    "Nepal",
+    "Netherlands",
+    "New Zealand",
+    "Nicaragua",
+    "Niger",
+    "Nigeria",
+    "Norway",
+    "Oman",
+    "Pakistan",
+    "Palau",
+    "Panama",
+    "Papua New Guinea",
+    "Paraguay",
+    "Peru",
+    "Philippines",
+    "Poland",
+    "Portugal",
+    "Qatar",
+    "Romania",
+    "Russia",
+    "Rwanda",
+    "Saint Kitts and Nevis",
+    "Saint Lucia",
+    "Saint Vincent",
+    "Samoa",
+    "San Marino",
+    "Sao Tome and Principe",
+    "Saudi Arabia",
+    "Senegal",
+    "Serbia and Montenegro",
+    "Seychelles",
+    "Sierra Leone",
+    "Singapore",
+    "Slovakia",
+    "Slovenia",
+    "Solomon Islands",
+    "Somalia",
+    "South Africa",
+    "Spain",
+    "Sri Lanka",
+    "Sudan",
+    "Suriname",
+    "Swaziland",
+    "Sweden",
+    "Switzerland",
+    "Syria",
+    "Taiwan",
+    "Tajikistan",
+    "Tanzania",
+    "Thailand",
+    "Togo",
+    "Tonga",
+    "Trinidad and Tobago",
+    "Tunisia",
+    "Turkey",
+    "Turkmenistan",
+    "Tuvalu",
+    "Uganda",
+    "Ukraine",
+    "United Arab Emirates",
+    "United Kingdom",
+    "United States",
+    "Uruguay",
+    "Uzbekistan",
+    "Vanuatu",
+    "Vatican City",
+    "Venezuela",
+    "Vietnam",
+    "Yemen",
+    "Zambia",
+    "Zimbabwe"
 );
 
 $currencies_array = array(
-  'ALL' => 'Albania Lek',
-  'AFN' => 'Afghanistan Afghani',
-  'ARS' => 'Argentina Peso',
-  'AWG' => 'Aruba Guilder',
-  'AUD' => 'Australia Dollar',
-  'AZN' => 'Azerbaijan New Manat',
-  'BSD' => 'Bahamas Dollar',
-  'BBD' => 'Barbados Dollar',
-  'BDT' => 'Bangladeshi taka',
-  'BYR' => 'Belarus Ruble',
-  'BZD' => 'Belize Dollar',
-  'BMD' => 'Bermuda Dollar',
-  'BOB' => 'Bolivia Boliviano',
-  'BAM' => 'Bosnia and Herzegovina Convertible Marka',
-  'BWP' => 'Botswana Pula',
-  'BGN' => 'Bulgaria Lev',
-  'BRL' => 'Brazil Real',
-  'BND' => 'Brunei Darussalam Dollar',
-  'KHR' => 'Cambodia Riel',
-  'CAD' => 'Canada Dollar',
-  'KYD' => 'Cayman Islands Dollar',
-  'CLP' => 'Chile Peso',
-  'CNY' => 'China Yuan Renminbi',
-  'COP' => 'Colombia Peso',
-  'CRC' => 'Costa Rica Colon',
-  'HRK' => 'Croatia Kuna',
-  'CUP' => 'Cuba Peso',
-  'CZK' => 'Czech Republic Koruna',
-  'DKK' => 'Denmark Krone',
-  'DOP' => 'Dominican Republic Peso',
-  'XCD' => 'East Caribbean Dollar',
-  'EGP' => 'Egypt Pound',
-  'SVC' => 'El Salvador Colon',
-  'EEK' => 'Estonia Kroon',
-  'EUR' => 'Euro Member Countries',
-  'FKP' => 'Falkland Islands (Malvinas) Pound',
-  'FJD' => 'Fiji Dollar',
-  'GHC' => 'Ghana Cedis',
-  'GIP' => 'Gibraltar Pound',
-  'GTQ' => 'Guatemala Quetzal',
-  'GGP' => 'Guernsey Pound',
-  'GYD' => 'Guyana Dollar',
-  'HNL' => 'Honduras Lempira',
-  'HKD' => 'Hong Kong Dollar',
-  'HUF' => 'Hungary Forint',
-  'ISK' => 'Iceland Krona',
-  'INR' => 'India Rupee',
-  'IDR' => 'Indonesia Rupiah',
-  'IRR' => 'Iran Rial',
-  'IMP' => 'Isle of Man Pound',
-  'ILS' => 'Israel Shekel',
-  'JMD' => 'Jamaica Dollar',
-  'JPY' => 'Japan Yen',
-  'JEP' => 'Jersey Pound',
-  'KZT' => 'Kazakhstan Tenge',
-  'KPW' => 'Korea (North) Won',
-  'KRW' => 'Korea (South) Won',
-  'KGS' => 'Kyrgyzstan Som',
-  'LAK' => 'Laos Kip',
-  'LVL' => 'Latvia Lat',
-  'LBP' => 'Lebanon Pound',
-  'LRD' => 'Liberia Dollar',
-  'LTL' => 'Lithuania Litas',
-  'MKD' => 'Macedonia Denar',
-  'MYR' => 'Malaysia Ringgit',
-  'MUR' => 'Mauritius Rupee',
-  'MXN' => 'Mexico Peso',
-  'MNT' => 'Mongolia Tughrik',
-  'MZN' => 'Mozambique Metical',
-  'NAD' => 'Namibia Dollar',
-  'NPR' => 'Nepal Rupee',
-  'ANG' => 'Netherlands Antilles Guilder',
-  'NZD' => 'New Zealand Dollar',
-  'NIO' => 'Nicaragua Cordoba',
-  'NGN' => 'Nigeria Naira',
-  'NOK' => 'Norway Krone',
-  'OMR' => 'Oman Rial',
-  'PKR' => 'Pakistan Rupee',
-  'PAB' => 'Panama Balboa',
-  'PYG' => 'Paraguay Guarani',
-  'PEN' => 'Peru Nuevo Sol',
-  'PHP' => 'Philippines Peso',
-  'PLN' => 'Poland Zloty',
-  'QAR' => 'Qatar Riyal',
-  'RON' => 'Romania New Leu',
-  'RUB' => 'Russia Ruble',
-  'SHP' => 'Saint Helena Pound',
-  'SAR' => 'Saudi Arabia Riyal',
-  'RSD' => 'Serbia Dinar',
-  'SCR' => 'Seychelles Rupee',
-  'SGD' => 'Singapore Dollar',
-  'SBD' => 'Solomon Islands Dollar',
-  'SOS' => 'Somalia Shilling',
-  'ZAR' => 'South Africa Rand',
-  'LKR' => 'Sri Lanka Rupee',
-  'SEK' => 'Sweden Krona',
-  'CHF' => 'Switzerland Franc',
-  'SRD' => 'Suriname Dollar',
-  'SYP' => 'Syria Pound',
-  'TWD' => 'Taiwan New Dollar',
-  'THB' => 'Thailand Baht',
-  'TTD' => 'Trinidad and Tobago Dollar',
-  'TRY' => 'Turkey Lira',
-  'TRL' => 'Turkey Lira',
-  'TVD' => 'Tuvalu Dollar',
-  'UAH' => 'Ukraine Hryvna',
-  'GBP' => 'United Kingdom Pound',
-  'USD' => 'United States Dollar',
-  'UYU' => 'Uruguay Peso',
-  'UZS' => 'Uzbekistan Som',
-  'VEF' => 'Venezuela Bolivar',
-  'VND' => 'Viet Nam Dong',
-  'YER' => 'Yemen Rial',
-  'ZWD' => 'Zimbabwe Dollar'
+    'ALL' => 'Albania Lek',
+    'AFN' => 'Afghanistan Afghani',
+    'ARS' => 'Argentina Peso',
+    'AWG' => 'Aruba Guilder',
+    'AUD' => 'Australia Dollar',
+    'AZN' => 'Azerbaijan New Manat',
+    'BSD' => 'Bahamas Dollar',
+    'BBD' => 'Barbados Dollar',
+    'BDT' => 'Bangladeshi taka',
+    'BYR' => 'Belarus Ruble',
+    'BZD' => 'Belize Dollar',
+    'BMD' => 'Bermuda Dollar',
+    'BOB' => 'Bolivia Boliviano',
+    'BAM' => 'Bosnia and Herzegovina Convertible Marka',
+    'BWP' => 'Botswana Pula',
+    'BGN' => 'Bulgaria Lev',
+    'BRL' => 'Brazil Real',
+    'BND' => 'Brunei Darussalam Dollar',
+    'KHR' => 'Cambodia Riel',
+    'CAD' => 'Canada Dollar',
+    'KYD' => 'Cayman Islands Dollar',
+    'CLP' => 'Chile Peso',
+    'CNY' => 'China Yuan Renminbi',
+    'COP' => 'Colombia Peso',
+    'CRC' => 'Costa Rica Colon',
+    'HRK' => 'Croatia Kuna',
+    'CUP' => 'Cuba Peso',
+    'CZK' => 'Czech Republic Koruna',
+    'DKK' => 'Denmark Krone',
+    'DOP' => 'Dominican Republic Peso',
+    'XCD' => 'East Caribbean Dollar',
+    'EGP' => 'Egypt Pound',
+    'SVC' => 'El Salvador Colon',
+    'EEK' => 'Estonia Kroon',
+    'EUR' => 'Euro Member Countries',
+    'FKP' => 'Falkland Islands (Malvinas) Pound',
+    'FJD' => 'Fiji Dollar',
+    'GHC' => 'Ghana Cedis',
+    'GIP' => 'Gibraltar Pound',
+    'GTQ' => 'Guatemala Quetzal',
+    'GGP' => 'Guernsey Pound',
+    'GYD' => 'Guyana Dollar',
+    'HNL' => 'Honduras Lempira',
+    'HKD' => 'Hong Kong Dollar',
+    'HUF' => 'Hungary Forint',
+    'ISK' => 'Iceland Krona',
+    'INR' => 'India Rupee',
+    'IDR' => 'Indonesia Rupiah',
+    'IRR' => 'Iran Rial',
+    'IMP' => 'Isle of Man Pound',
+    'ILS' => 'Israel Shekel',
+    'JMD' => 'Jamaica Dollar',
+    'JPY' => 'Japan Yen',
+    'JEP' => 'Jersey Pound',
+    'KZT' => 'Kazakhstan Tenge',
+    'KPW' => 'Korea (North) Won',
+    'KRW' => 'Korea (South) Won',
+    'KGS' => 'Kyrgyzstan Som',
+    'LAK' => 'Laos Kip',
+    'LVL' => 'Latvia Lat',
+    'LBP' => 'Lebanon Pound',
+    'LRD' => 'Liberia Dollar',
+    'LTL' => 'Lithuania Litas',
+    'MKD' => 'Macedonia Denar',
+    'MYR' => 'Malaysia Ringgit',
+    'MUR' => 'Mauritius Rupee',
+    'MXN' => 'Mexico Peso',
+    'MNT' => 'Mongolia Tughrik',
+    'MZN' => 'Mozambique Metical',
+    'NAD' => 'Namibia Dollar',
+    'NPR' => 'Nepal Rupee',
+    'ANG' => 'Netherlands Antilles Guilder',
+    'NZD' => 'New Zealand Dollar',
+    'NIO' => 'Nicaragua Cordoba',
+    'NGN' => 'Nigeria Naira',
+    'NOK' => 'Norway Krone',
+    'OMR' => 'Oman Rial',
+    'PKR' => 'Pakistan Rupee',
+    'PAB' => 'Panama Balboa',
+    'PYG' => 'Paraguay Guarani',
+    'PEN' => 'Peru Nuevo Sol',
+    'PHP' => 'Philippines Peso',
+    'PLN' => 'Poland Zloty',
+    'QAR' => 'Qatar Riyal',
+    'RON' => 'Romania New Leu',
+    'RUB' => 'Russia Ruble',
+    'SHP' => 'Saint Helena Pound',
+    'SAR' => 'Saudi Arabia Riyal',
+    'RSD' => 'Serbia Dinar',
+    'SCR' => 'Seychelles Rupee',
+    'SGD' => 'Singapore Dollar',
+    'SBD' => 'Solomon Islands Dollar',
+    'SOS' => 'Somalia Shilling',
+    'ZAR' => 'South Africa Rand',
+    'LKR' => 'Sri Lanka Rupee',
+    'SEK' => 'Sweden Krona',
+    'CHF' => 'Switzerland Franc',
+    'SRD' => 'Suriname Dollar',
+    'SYP' => 'Syria Pound',
+    'TWD' => 'Taiwan New Dollar',
+    'THB' => 'Thailand Baht',
+    'TTD' => 'Trinidad and Tobago Dollar',
+    'TRY' => 'Turkey Lira',
+    'TRL' => 'Turkey Lira',
+    'TVD' => 'Tuvalu Dollar',
+    'UAH' => 'Ukraine Hryvna',
+    'GBP' => 'United Kingdom Pound',
+    'USD' => 'United States Dollar',
+    'UYU' => 'Uruguay Peso',
+    'UZS' => 'Uzbekistan Som',
+    'VEF' => 'Venezuela Bolivar',
+    'VND' => 'Viet Nam Dong',
+    'YER' => 'Yemen Rial',
+    'ZWD' => 'Zimbabwe Dollar'
 );
 
 // List of locales
 $locales_array = [
-  'af_NA'       => 'Afrikaans (Namibia)',
-  'af_ZA'       => 'Afrikaans (South Africa)',
-  'af'          => 'Afrikaans',
-  'ak_GH'       => 'Akan (Ghana)',
-  'ak'          => 'Akan',
-  'sq_AL'       => 'Albanian (Albania)',
-  'sq'          => 'Albanian',
-  'am_ET'       => 'Amharic (Ethiopia)',
-  'am'          => 'Amharic',
-  'ar_DZ'       => 'Arabic (Algeria)',
-  'ar_BH'       => 'Arabic (Bahrain)',
-  'ar_EG'       => 'Arabic (Egypt)',
-  'ar_IQ'       => 'Arabic (Iraq)',
-  'ar_JO'       => 'Arabic (Jordan)',
-  'ar_KW'       => 'Arabic (Kuwait)',
-  'ar_LB'       => 'Arabic (Lebanon)',
-  'ar_LY'       => 'Arabic (Libya)',
-  'ar_MA'       => 'Arabic (Morocco)',
-  'ar_OM'       => 'Arabic (Oman)',
-  'ar_QA'       => 'Arabic (Qatar)',
-  'ar_SA'       => 'Arabic (Saudi Arabia)',
-  'ar_SD'       => 'Arabic (Sudan)',
-  'ar_SY'       => 'Arabic (Syria)',
-  'ar_TN'       => 'Arabic (Tunisia)',
-  'ar_AE'       => 'Arabic (United Arab Emirates)',
-  'ar_YE'       => 'Arabic (Yemen)',
-  'ar'          => 'Arabic',
-  'hy_AM'       => 'Armenian (Armenia)',
-  'hy'          => 'Armenian',
-  'as_IN'       => 'Assamese (India)',
-  'as'          => 'Assamese',
-  'asa_TZ'      => 'Asu (Tanzania)',
-  'asa'         => 'Asu',
-  'az_Cyrl'     => 'Azerbaijani (Cyrillic)',
-  'az_Cyrl_AZ'  => 'Azerbaijani (Cyrillic, Azerbaijan)',
-  'az_Latn'     => 'Azerbaijani (Latin)',
-  'az_Latn_AZ'  => 'Azerbaijani (Latin, Azerbaijan)',
-  'az'          => 'Azerbaijani',
-  'bm_ML'       => 'Bambara (Mali)',
-  'bm'          => 'Bambara',
-  'eu_ES'       => 'Basque (Spain)',
-  'eu'          => 'Basque',
-  'be_BY'       => 'Belarusian (Belarus)',
-  'be'          => 'Belarusian',
-  'bem_ZM'      => 'Bemba (Zambia)',
-  'bem'         => 'Bemba',
-  'bez_TZ'      => 'Bena (Tanzania)',
-  'bez'         => 'Bena',
-  'bn_BD'       => 'Bengali (Bangladesh)',
-  'bn_IN'       => 'Bengali (India)',
-  'bn'          => 'Bengali',
-  'bs_BA'       => 'Bosnian (Bosnia and Herzegovina)',
-  'bs'          => 'Bosnian',
-  'bg_BG'       => 'Bulgarian (Bulgaria)',
-  'bg'          => 'Bulgarian',
-  'my_MM'       => 'Burmese (Myanmar [Burma])',
-  'my'          => 'Burmese',
-  'ca_ES'       => 'Catalan (Spain)',
-  'ca'          => 'Catalan',
-  'tzm_Latn'    => 'Central Morocco Tamazight (Latin)',
-  'tzm_Latn_MA' => 'Central Morocco Tamazight (Latin, Morocco)',
-  'tzm'         => 'Central Morocco Tamazight',
-  'chr_US'      => 'Cherokee (United States)',
-  'chr'         => 'Cherokee',
-  'cgg_UG'      => 'Chiga (Uganda)',
-  'cgg'         => 'Chiga',
-  'zh_Hans'     => 'Chinese (Simplified Han)',
-  'zh_Hans_CN'  => 'Chinese (Simplified Han, China)',
-  'zh_Hans_HK'  => 'Chinese (Simplified Han, Hong Kong SAR China)',
-  'zh_Hans_MO'  => 'Chinese (Simplified Han, Macau SAR China)',
-  'zh_Hans_SG'  => 'Chinese (Simplified Han, Singapore)',
-  'zh_Hant'     => 'Chinese (Traditional Han)',
-  'zh_Hant_HK'  => 'Chinese (Traditional Han, Hong Kong SAR China)',
-  'zh_Hant_MO'  => 'Chinese (Traditional Han, Macau SAR China)',
-  'zh_Hant_TW'  => 'Chinese (Traditional Han, Taiwan)',
-  'zh'          => 'Chinese',
-  'kw_GB'       => 'Cornish (United Kingdom)',
-  'kw'          => 'Cornish',
-  'hr_HR'       => 'Croatian (Croatia)',
-  'hr'          => 'Croatian',
-  'cs_CZ'       => 'Czech (Czech Republic)',
-  'cs'          => 'Czech',
-  'da_DK'       => 'Danish (Denmark)',
-  'da'          => 'Danish',
-  'nl_BE'       => 'Dutch (Belgium)',
-  'nl_NL'       => 'Dutch (Netherlands)',
-  'nl'          => 'Dutch',
-  'ebu_KE'      => 'Embu (Kenya)',
-  'ebu'         => 'Embu',
-  'en_AS'       => 'English (American Samoa)',
-  'en_AU'       => 'English (Australia)',
-  'en_BE'       => 'English (Belgium)',
-  'en_BZ'       => 'English (Belize)',
-  'en_BW'       => 'English (Botswana)',
-  'en_CA'       => 'English (Canada)',
-  'en_GU'       => 'English (Guam)',
-  'en_HK'       => 'English (Hong Kong SAR China)',
-  'en_IN'       => 'English (India)',
-  'en_IE'       => 'English (Ireland)',
-  'en_JM'       => 'English (Jamaica)',
-  'en_MT'       => 'English (Malta)',
-  'en_MH'       => 'English (Marshall Islands)',
-  'en_MU'       => 'English (Mauritius)',
-  'en_NA'       => 'English (Namibia)',
-  'en_NZ'       => 'English (New Zealand)',
-  'en_MP'       => 'English (Northern Mariana Islands)',
-  'en_PK'       => 'English (Pakistan)',
-  'en_PH'       => 'English (Philippines)',
-  'en_SG'       => 'English (Singapore)',
-  'en_ZA'       => 'English (South Africa)',
-  'en_TT'       => 'English (Trinidad and Tobago)',
-  'en_UM'       => 'English (U.S. Minor Outlying Islands)',
-  'en_VI'       => 'English (U.S. Virgin Islands)',
-  'en_GB'       => 'English (United Kingdom)',
-  'en_US'       => 'English (United States)',
-  'en_ZW'       => 'English (Zimbabwe)',
-  'en'          => 'English',
-  'eo'          => 'Esperanto',
-  'et_EE'       => 'Estonian (Estonia)',
-  'et'          => 'Estonian',
-  'ee_GH'       => 'Ewe (Ghana)',
-  'ee_TG'       => 'Ewe (Togo)',
-  'ee'          => 'Ewe',
-  'fo_FO'       => 'Faroese (Faroe Islands)',
-  'fo'          => 'Faroese',
-  'fil_PH'      => 'Filipino (Philippines)',
-  'fil'         => 'Filipino',
-  'fi_FI'       => 'Finnish (Finland)',
-  'fi'          => 'Finnish',
-  'fr_BE'       => 'French (Belgium)',
-  'fr_BJ'       => 'French (Benin)',
-  'fr_BF'       => 'French (Burkina Faso)',
-  'fr_BI'       => 'French (Burundi)',
-  'fr_CM'       => 'French (Cameroon)',
-  'fr_CA'       => 'French (Canada)',
-  'fr_CF'       => 'French (Central African Republic)',
-  'fr_TD'       => 'French (Chad)',
-  'fr_KM'       => 'French (Comoros)',
-  'fr_CG'       => 'French (Congo - Brazzaville)',
-  'fr_CD'       => 'French (Congo - Kinshasa)',
-  'fr_CI'       => 'French (Côte d’Ivoire)',
-  'fr_DJ'       => 'French (Djibouti)',
-  'fr_GQ'       => 'French (Equatorial Guinea)',
-  'fr_FR'       => 'French (France)',
-  'fr_GA'       => 'French (Gabon)',
-  'fr_GP'       => 'French (Guadeloupe)',
-  'fr_GN'       => 'French (Guinea)',
-  'fr_LU'       => 'French (Luxembourg)',
-  'fr_MG'       => 'French (Madagascar)',
-  'fr_ML'       => 'French (Mali)',
-  'fr_MQ'       => 'French (Martinique)',
-  'fr_MC'       => 'French (Monaco)',
-  'fr_NE'       => 'French (Niger)',
-  'fr_RW'       => 'French (Rwanda)',
-  'fr_RE'       => 'French (Réunion)',
-  'fr_BL'       => 'French (Saint Barthélemy)',
-  'fr_MF'       => 'French (Saint Martin)',
-  'fr_SN'       => 'French (Senegal)',
-  'fr_CH'       => 'French (Switzerland)',
-  'fr_TG'       => 'French (Togo)',
-  'fr'          => 'French',
-  'ff_SN'       => 'Fulah (Senegal)',
-  'ff'          => 'Fulah',
-  'gl_ES'       => 'Galician (Spain)',
-  'gl'          => 'Galician',
-  'lg_UG'       => 'Ganda (Uganda)',
-  'lg'          => 'Ganda',
-  'ka_GE'       => 'Georgian (Georgia)',
-  'ka'          => 'Georgian',
-  'de_AT'       => 'German (Austria)',
-  'de_BE'       => 'German (Belgium)',
-  'de_DE'       => 'German (Germany)',
-  'de_LI'       => 'German (Liechtenstein)',
-  'de_LU'       => 'German (Luxembourg)',
-  'de_CH'       => 'German (Switzerland)',
-  'de'          => 'German',
-  'el_CY'       => 'Greek (Cyprus)',
-  'el_GR'       => 'Greek (Greece)',
-  'el'          => 'Greek',
-  'gu_IN'       => 'Gujarati (India)',
-  'gu'          => 'Gujarati',
-  'guz_KE'      => 'Gusii (Kenya)',
-  'guz'         => 'Gusii',
-  'ha_Latn'     => 'Hausa (Latin)',
-  'ha_Latn_GH'  => 'Hausa (Latin, Ghana)',
-  'ha_Latn_NE'  => 'Hausa (Latin, Niger)',
-  'ha_Latn_NG'  => 'Hausa (Latin, Nigeria)',
-  'ha'          => 'Hausa',
-  'haw_US'      => 'Hawaiian (United States)',
-  'haw'         => 'Hawaiian',
-  'he_IL'       => 'Hebrew (Israel)',
-  'he'          => 'Hebrew',
-  'hi_IN'       => 'Hindi (India)',
-  'hi'          => 'Hindi',
-  'hu_HU'       => 'Hungarian (Hungary)',
-  'hu'          => 'Hungarian',
-  'is_IS'       => 'Icelandic (Iceland)',
-  'is'          => 'Icelandic',
-  'ig_NG'       => 'Igbo (Nigeria)',
-  'ig'          => 'Igbo',
-  'id_ID'       => 'Indonesian (Indonesia)',
-  'id'          => 'Indonesian',
-  'ga_IE'       => 'Irish (Ireland)',
-  'ga'          => 'Irish',
-  'it_IT'       => 'Italian (Italy)',
-  'it_CH'       => 'Italian (Switzerland)',
-  'it'          => 'Italian',
-  'ja_JP'       => 'Japanese (Japan)',
-  'ja'          => 'Japanese',
-  'kea_CV'      => 'Kabuverdianu (Cape Verde)',
-  'kea'         => 'Kabuverdianu',
-  'kab_DZ'      => 'Kabyle (Algeria)',
-  'kab'         => 'Kabyle',
-  'kl_GL'       => 'Kalaallisut (Greenland)',
-  'kl'          => 'Kalaallisut',
-  'kln_KE'      => 'Kalenjin (Kenya)',
-  'kln'         => 'Kalenjin',
-  'kam_KE'      => 'Kamba (Kenya)',
-  'kam'         => 'Kamba',
-  'kn_IN'       => 'Kannada (India)',
-  'kn'          => 'Kannada',
-  'kk_Cyrl'     => 'Kazakh (Cyrillic)',
-  'kk_Cyrl_KZ'  => 'Kazakh (Cyrillic, Kazakhstan)',
-  'kk'          => 'Kazakh',
-  'km_KH'       => 'Khmer (Cambodia)',
-  'km'          => 'Khmer',
-  'ki_KE'       => 'Kikuyu (Kenya)',
-  'ki'          => 'Kikuyu',
-  'rw_RW'       => 'Kinyarwanda (Rwanda)',
-  'rw'          => 'Kinyarwanda',
-  'kok_IN'      => 'Konkani (India)',
-  'kok'         => 'Konkani',
-  'ko_KR'       => 'Korean (South Korea)',
-  'ko'          => 'Korean',
-  'khq_ML'      => 'Koyra Chiini (Mali)',
-  'khq'         => 'Koyra Chiini',
-  'ses_ML'      => 'Koyraboro Senni (Mali)',
-  'ses'         => 'Koyraboro Senni',
-  'lag_TZ'      => 'Langi (Tanzania)',
-  'lag'         => 'Langi',
-  'lv_LV'       => 'Latvian (Latvia)',
-  'lv'          => 'Latvian',
-  'lt_LT'       => 'Lithuanian (Lithuania)',
-  'lt'          => 'Lithuanian',
-  'luo_KE'      => 'Luo (Kenya)',
-  'luo'         => 'Luo',
-  'luy_KE'      => 'Luyia (Kenya)',
-  'luy'         => 'Luyia',
-  'mk_MK'       => 'Macedonian (Macedonia)',
-  'mk'          => 'Macedonian',
-  'jmc_TZ'      => 'Machame (Tanzania)',
-  'jmc'         => 'Machame',
-  'kde_TZ'      => 'Makonde (Tanzania)',
-  'kde'         => 'Makonde',
-  'mg_MG'       => 'Malagasy (Madagascar)',
-  'mg'          => 'Malagasy',
-  'ms_BN'       => 'Malay (Brunei)',
-  'ms_MY'       => 'Malay (Malaysia)',
-  'ms'          => 'Malay',
-  'ml_IN'       => 'Malayalam (India)',
-  'ml'          => 'Malayalam',
-  'mt_MT'       => 'Maltese (Malta)',
-  'mt'          => 'Maltese',
-  'gv_GB'       => 'Manx (United Kingdom)',
-  'gv'          => 'Manx',
-  'mr_IN'       => 'Marathi (India)',
-  'mr'          => 'Marathi',
-  'mas_KE'      => 'Masai (Kenya)',
-  'mas_TZ'      => 'Masai (Tanzania)',
-  'mas'         => 'Masai',
-  'mer_KE'      => 'Meru (Kenya)',
-  'mer'         => 'Meru',
-  'mfe_MU'      => 'Morisyen (Mauritius)',
-  'mfe'         => 'Morisyen',
-  'naq_NA'      => 'Nama (Namibia)',
-  'naq'         => 'Nama',
-  'ne_IN'       => 'Nepali (India)',
-  'ne_NP'       => 'Nepali (Nepal)',
-  'ne'          => 'Nepali',
-  'nd_ZW'       => 'North Ndebele (Zimbabwe)',
-  'nd'          => 'North Ndebele',
-  'nb_NO'       => 'Norwegian Bokmål (Norway)',
-  'nb'          => 'Norwegian Bokmål',
-  'nn_NO'       => 'Norwegian Nynorsk (Norway)',
-  'nn'          => 'Norwegian Nynorsk',
-  'nyn_UG'      => 'Nyankole (Uganda)',
-  'nyn'         => 'Nyankole',
-  'or_IN'       => 'Oriya (India)',
-  'or'          => 'Oriya',
-  'om_ET'       => 'Oromo (Ethiopia)',
-  'om_KE'       => 'Oromo (Kenya)',
-  'om'          => 'Oromo',
-  'ps_AF'       => 'Pashto (Afghanistan)',
-  'ps'          => 'Pashto',
-  'fa_AF'       => 'Persian (Afghanistan)',
-  'fa_IR'       => 'Persian (Iran)',
-  'fa'          => 'Persian',
-  'pl_PL'       => 'Polish (Poland)',
-  'pl'          => 'Polish',
-  'pt_BR'       => 'Portuguese (Brazil)',
-  'pt_GW'       => 'Portuguese (Guinea-Bissau)',
-  'pt_MZ'       => 'Portuguese (Mozambique)',
-  'pt_PT'       => 'Portuguese (Portugal)',
-  'pt'          => 'Portuguese',
-  'pa_Arab'     => 'Punjabi (Arabic)',
-  'pa_Arab_PK'  => 'Punjabi (Arabic, Pakistan)',
-  'pa_Guru'     => 'Punjabi (Gurmukhi)',
-  'pa_Guru_IN'  => 'Punjabi (Gurmukhi, India)',
-  'pa'          => 'Punjabi',
-  'ro_MD'       => 'Romanian (Moldova)',
-  'ro_RO'       => 'Romanian (Romania)',
-  'ro'          => 'Romanian',
-  'rm_CH'       => 'Romansh (Switzerland)',
-  'rm'          => 'Romansh',
-  'rof_TZ'      => 'Rombo (Tanzania)',
-  'rof'         => 'Rombo',
-  'ru_MD'       => 'Russian (Moldova)',
-  'ru_RU'       => 'Russian (Russia)',
-  'ru_UA'       => 'Russian (Ukraine)',
-  'ru'          => 'Russian',
-  'rwk_TZ'      => 'Rwa (Tanzania)',
-  'rwk'         => 'Rwa',
-  'saq_KE'      => 'Samburu (Kenya)',
-  'saq'         => 'Samburu',
-  'sg_CF'       => 'Sango (Central African Republic)',
-  'sg'          => 'Sango',
-  'seh_MZ'      => 'Sena (Mozambique)',
-  'seh'         => 'Sena',
-  'sr_Cyrl'     => 'Serbian (Cyrillic)',
-  'sr_Cyrl_BA'  => 'Serbian (Cyrillic, Bosnia and Herzegovina)',
-  'sr_Cyrl_ME'  => 'Serbian (Cyrillic, Montenegro)',
-  'sr_Cyrl_RS'  => 'Serbian (Cyrillic, Serbia)',
-  'sr_Latn'     => 'Serbian (Latin)',
-  'sr_Latn_BA'  => 'Serbian (Latin, Bosnia and Herzegovina)',
-  'sr_Latn_ME'  => 'Serbian (Latin, Montenegro)',
-  'sr_Latn_RS'  => 'Serbian (Latin, Serbia)',
-  'sr'          => 'Serbian',
-  'sn_ZW'       => 'Shona (Zimbabwe)',
-  'sn'          => 'Shona',
-  'ii_CN'       => 'Sichuan Yi (China)',
-  'ii'          => 'Sichuan Yi',
-  'si_LK'       => 'Sinhala (Sri Lanka)',
-  'si'          => 'Sinhala',
-  'sk_SK'       => 'Slovak (Slovakia)',
-  'sk'          => 'Slovak',
-  'sl_SI'       => 'Slovenian (Slovenia)',
-  'sl'          => 'Slovenian',
-  'xog_UG'      => 'Soga (Uganda)',
-  'xog'         => 'Soga',
-  'so_DJ'       => 'Somali (Djibouti)',
-  'so_ET'       => 'Somali (Ethiopia)',
-  'so_KE'       => 'Somali (Kenya)',
-  'so_SO'       => 'Somali (Somalia)',
-  'so'          => 'Somali',
-  'es_AR'       => 'Spanish (Argentina)',
-  'es_BO'       => 'Spanish (Bolivia)',
-  'es_CL'       => 'Spanish (Chile)',
-  'es_CO'       => 'Spanish (Colombia)',
-  'es_CR'       => 'Spanish (Costa Rica)',
-  'es_DO'       => 'Spanish (Dominican Republic)',
-  'es_EC'       => 'Spanish (Ecuador)',
-  'es_SV'       => 'Spanish (El Salvador)',
-  'es_GQ'       => 'Spanish (Equatorial Guinea)',
-  'es_GT'       => 'Spanish (Guatemala)',
-  'es_HN'       => 'Spanish (Honduras)',
-  'es_419'      => 'Spanish (Latin America)',
-  'es_MX'       => 'Spanish (Mexico)',
-  'es_NI'       => 'Spanish (Nicaragua)',
-  'es_PA'       => 'Spanish (Panama)',
-  'es_PY'       => 'Spanish (Paraguay)',
-  'es_PE'       => 'Spanish (Peru)',
-  'es_PR'       => 'Spanish (Puerto Rico)',
-  'es_ES'       => 'Spanish (Spain)',
-  'es_US'       => 'Spanish (United States)',
-  'es_UY'       => 'Spanish (Uruguay)',
-  'es_VE'       => 'Spanish (Venezuela)',
-  'es'          => 'Spanish',
-  'sw_KE'       => 'Swahili (Kenya)',
-  'sw_TZ'       => 'Swahili (Tanzania)',
-  'sw'          => 'Swahili',
-  'sv_FI'       => 'Swedish (Finland)',
-  'sv_SE'       => 'Swedish (Sweden)',
-  'sv'          => 'Swedish',
-  'gsw_CH'      => 'Swiss German (Switzerland)',
-  'gsw'         => 'Swiss German',
-  'shi_Latn'    => 'Tachelhit (Latin)',
-  'shi_Latn_MA' => 'Tachelhit (Latin, Morocco)',
-  'shi_Tfng'    => 'Tachelhit (Tifinagh)',
-  'shi_Tfng_MA' => 'Tachelhit (Tifinagh, Morocco)',
-  'shi'         => 'Tachelhit',
-  'dav_KE'      => 'Taita (Kenya)',
-  'dav'         => 'Taita',
-  'ta_IN'       => 'Tamil (India)',
-  'ta_LK'       => 'Tamil (Sri Lanka)',
-  'ta'          => 'Tamil',
-  'te_IN'       => 'Telugu (India)',
-  'te'          => 'Telugu',
-  'teo_KE'      => 'Teso (Kenya)',
-  'teo_UG'      => 'Teso (Uganda)',
-  'teo'         => 'Teso',
-  'th_TH'       => 'Thai (Thailand)',
-  'th'          => 'Thai',
-  'bo_CN'       => 'Tibetan (China)',
-  'bo_IN'       => 'Tibetan (India)',
-  'bo'          => 'Tibetan',
-  'ti_ER'       => 'Tigrinya (Eritrea)',
-  'ti_ET'       => 'Tigrinya (Ethiopia)',
-  'ti'          => 'Tigrinya',
-  'to_TO'       => 'Tonga (Tonga)',
-  'to'          => 'Tonga',
-  'tr_TR'       => 'Turkish (Turkey)',
-  'tr'          => 'Turkish',
-  'uk_UA'       => 'Ukrainian (Ukraine)',
-  'uk'          => 'Ukrainian',
-  'ur_IN'       => 'Urdu (India)',
-  'ur_PK'       => 'Urdu (Pakistan)',
-  'ur'          => 'Urdu',
-  'uz_Arab'     => 'Uzbek (Arabic)',
-  'uz_Arab_AF'  => 'Uzbek (Arabic, Afghanistan)',
-  'uz_Cyrl'     => 'Uzbek (Cyrillic)',
-  'uz_Cyrl_UZ'  => 'Uzbek (Cyrillic, Uzbekistan)',
-  'uz_Latn'     => 'Uzbek (Latin)',
-  'uz_Latn_UZ'  => 'Uzbek (Latin, Uzbekistan)',
-  'uz'          => 'Uzbek',
-  'vi_VN'       => 'Vietnamese (Vietnam)',
-  'vi'          => 'Vietnamese',
-  'vun_TZ'      => 'Vunjo (Tanzania)',
-  'vun'         => 'Vunjo',
-  'cy_GB'       => 'Welsh (United Kingdom)',
-  'cy'          => 'Welsh',
-  'yo_NG'       => 'Yoruba (Nigeria)',
-  'yo'          => 'Yoruba',
-  'zu_ZA'       => 'Zulu (South Africa)',
-  'zu'          => 'Zulu',
+    'af_NA'       => 'Afrikaans (Namibia)',
+    'af_ZA'       => 'Afrikaans (South Africa)',
+    'af'          => 'Afrikaans',
+    'ak_GH'       => 'Akan (Ghana)',
+    'ak'          => 'Akan',
+    'sq_AL'       => 'Albanian (Albania)',
+    'sq'          => 'Albanian',
+    'am_ET'       => 'Amharic (Ethiopia)',
+    'am'          => 'Amharic',
+    'ar_DZ'       => 'Arabic (Algeria)',
+    'ar_BH'       => 'Arabic (Bahrain)',
+    'ar_EG'       => 'Arabic (Egypt)',
+    'ar_IQ'       => 'Arabic (Iraq)',
+    'ar_JO'       => 'Arabic (Jordan)',
+    'ar_KW'       => 'Arabic (Kuwait)',
+    'ar_LB'       => 'Arabic (Lebanon)',
+    'ar_LY'       => 'Arabic (Libya)',
+    'ar_MA'       => 'Arabic (Morocco)',
+    'ar_OM'       => 'Arabic (Oman)',
+    'ar_QA'       => 'Arabic (Qatar)',
+    'ar_SA'       => 'Arabic (Saudi Arabia)',
+    'ar_SD'       => 'Arabic (Sudan)',
+    'ar_SY'       => 'Arabic (Syria)',
+    'ar_TN'       => 'Arabic (Tunisia)',
+    'ar_AE'       => 'Arabic (United Arab Emirates)',
+    'ar_YE'       => 'Arabic (Yemen)',
+    'ar'          => 'Arabic',
+    'hy_AM'       => 'Armenian (Armenia)',
+    'hy'          => 'Armenian',
+    'as_IN'       => 'Assamese (India)',
+    'as'          => 'Assamese',
+    'asa_TZ'      => 'Asu (Tanzania)',
+    'asa'         => 'Asu',
+    'az_Cyrl'     => 'Azerbaijani (Cyrillic)',
+    'az_Cyrl_AZ'  => 'Azerbaijani (Cyrillic, Azerbaijan)',
+    'az_Latn'     => 'Azerbaijani (Latin)',
+    'az_Latn_AZ'  => 'Azerbaijani (Latin, Azerbaijan)',
+    'az'          => 'Azerbaijani',
+    'bm_ML'       => 'Bambara (Mali)',
+    'bm'          => 'Bambara',
+    'eu_ES'       => 'Basque (Spain)',
+    'eu'          => 'Basque',
+    'be_BY'       => 'Belarusian (Belarus)',
+    'be'          => 'Belarusian',
+    'bem_ZM'      => 'Bemba (Zambia)',
+    'bem'         => 'Bemba',
+    'bez_TZ'      => 'Bena (Tanzania)',
+    'bez'         => 'Bena',
+    'bn_BD'       => 'Bengali (Bangladesh)',
+    'bn_IN'       => 'Bengali (India)',
+    'bn'          => 'Bengali',
+    'bs_BA'       => 'Bosnian (Bosnia and Herzegovina)',
+    'bs'          => 'Bosnian',
+    'bg_BG'       => 'Bulgarian (Bulgaria)',
+    'bg'          => 'Bulgarian',
+    'my_MM'       => 'Burmese (Myanmar [Burma])',
+    'my'          => 'Burmese',
+    'ca_ES'       => 'Catalan (Spain)',
+    'ca'          => 'Catalan',
+    'tzm_Latn'    => 'Central Morocco Tamazight (Latin)',
+    'tzm_Latn_MA' => 'Central Morocco Tamazight (Latin, Morocco)',
+    'tzm'         => 'Central Morocco Tamazight',
+    'chr_US'      => 'Cherokee (United States)',
+    'chr'         => 'Cherokee',
+    'cgg_UG'      => 'Chiga (Uganda)',
+    'cgg'         => 'Chiga',
+    'zh_Hans'     => 'Chinese (Simplified Han)',
+    'zh_Hans_CN'  => 'Chinese (Simplified Han, China)',
+    'zh_Hans_HK'  => 'Chinese (Simplified Han, Hong Kong SAR China)',
+    'zh_Hans_MO'  => 'Chinese (Simplified Han, Macau SAR China)',
+    'zh_Hans_SG'  => 'Chinese (Simplified Han, Singapore)',
+    'zh_Hant'     => 'Chinese (Traditional Han)',
+    'zh_Hant_HK'  => 'Chinese (Traditional Han, Hong Kong SAR China)',
+    'zh_Hant_MO'  => 'Chinese (Traditional Han, Macau SAR China)',
+    'zh_Hant_TW'  => 'Chinese (Traditional Han, Taiwan)',
+    'zh'          => 'Chinese',
+    'kw_GB'       => 'Cornish (United Kingdom)',
+    'kw'          => 'Cornish',
+    'hr_HR'       => 'Croatian (Croatia)',
+    'hr'          => 'Croatian',
+    'cs_CZ'       => 'Czech (Czech Republic)',
+    'cs'          => 'Czech',
+    'da_DK'       => 'Danish (Denmark)',
+    'da'          => 'Danish',
+    'nl_BE'       => 'Dutch (Belgium)',
+    'nl_NL'       => 'Dutch (Netherlands)',
+    'nl'          => 'Dutch',
+    'ebu_KE'      => 'Embu (Kenya)',
+    'ebu'         => 'Embu',
+    'en_AS'       => 'English (American Samoa)',
+    'en_AU'       => 'English (Australia)',
+    'en_BE'       => 'English (Belgium)',
+    'en_BZ'       => 'English (Belize)',
+    'en_BW'       => 'English (Botswana)',
+    'en_CA'       => 'English (Canada)',
+    'en_GU'       => 'English (Guam)',
+    'en_HK'       => 'English (Hong Kong SAR China)',
+    'en_IN'       => 'English (India)',
+    'en_IE'       => 'English (Ireland)',
+    'en_JM'       => 'English (Jamaica)',
+    'en_MT'       => 'English (Malta)',
+    'en_MH'       => 'English (Marshall Islands)',
+    'en_MU'       => 'English (Mauritius)',
+    'en_NA'       => 'English (Namibia)',
+    'en_NZ'       => 'English (New Zealand)',
+    'en_MP'       => 'English (Northern Mariana Islands)',
+    'en_PK'       => 'English (Pakistan)',
+    'en_PH'       => 'English (Philippines)',
+    'en_SG'       => 'English (Singapore)',
+    'en_ZA'       => 'English (South Africa)',
+    'en_TT'       => 'English (Trinidad and Tobago)',
+    'en_UM'       => 'English (U.S. Minor Outlying Islands)',
+    'en_VI'       => 'English (U.S. Virgin Islands)',
+    'en_GB'       => 'English (United Kingdom)',
+    'en_US'       => 'English (United States)',
+    'en_ZW'       => 'English (Zimbabwe)',
+    'en'          => 'English',
+    'eo'          => 'Esperanto',
+    'et_EE'       => 'Estonian (Estonia)',
+    'et'          => 'Estonian',
+    'ee_GH'       => 'Ewe (Ghana)',
+    'ee_TG'       => 'Ewe (Togo)',
+    'ee'          => 'Ewe',
+    'fo_FO'       => 'Faroese (Faroe Islands)',
+    'fo'          => 'Faroese',
+    'fil_PH'      => 'Filipino (Philippines)',
+    'fil'         => 'Filipino',
+    'fi_FI'       => 'Finnish (Finland)',
+    'fi'          => 'Finnish',
+    'fr_BE'       => 'French (Belgium)',
+    'fr_BJ'       => 'French (Benin)',
+    'fr_BF'       => 'French (Burkina Faso)',
+    'fr_BI'       => 'French (Burundi)',
+    'fr_CM'       => 'French (Cameroon)',
+    'fr_CA'       => 'French (Canada)',
+    'fr_CF'       => 'French (Central African Republic)',
+    'fr_TD'       => 'French (Chad)',
+    'fr_KM'       => 'French (Comoros)',
+    'fr_CG'       => 'French (Congo - Brazzaville)',
+    'fr_CD'       => 'French (Congo - Kinshasa)',
+    'fr_CI'       => 'French (Côte d’Ivoire)',
+    'fr_DJ'       => 'French (Djibouti)',
+    'fr_GQ'       => 'French (Equatorial Guinea)',
+    'fr_FR'       => 'French (France)',
+    'fr_GA'       => 'French (Gabon)',
+    'fr_GP'       => 'French (Guadeloupe)',
+    'fr_GN'       => 'French (Guinea)',
+    'fr_LU'       => 'French (Luxembourg)',
+    'fr_MG'       => 'French (Madagascar)',
+    'fr_ML'       => 'French (Mali)',
+    'fr_MQ'       => 'French (Martinique)',
+    'fr_MC'       => 'French (Monaco)',
+    'fr_NE'       => 'French (Niger)',
+    'fr_RW'       => 'French (Rwanda)',
+    'fr_RE'       => 'French (Réunion)',
+    'fr_BL'       => 'French (Saint Barthélemy)',
+    'fr_MF'       => 'French (Saint Martin)',
+    'fr_SN'       => 'French (Senegal)',
+    'fr_CH'       => 'French (Switzerland)',
+    'fr_TG'       => 'French (Togo)',
+    'fr'          => 'French',
+    'ff_SN'       => 'Fulah (Senegal)',
+    'ff'          => 'Fulah',
+    'gl_ES'       => 'Galician (Spain)',
+    'gl'          => 'Galician',
+    'lg_UG'       => 'Ganda (Uganda)',
+    'lg'          => 'Ganda',
+    'ka_GE'       => 'Georgian (Georgia)',
+    'ka'          => 'Georgian',
+    'de_AT'       => 'German (Austria)',
+    'de_BE'       => 'German (Belgium)',
+    'de_DE'       => 'German (Germany)',
+    'de_LI'       => 'German (Liechtenstein)',
+    'de_LU'       => 'German (Luxembourg)',
+    'de_CH'       => 'German (Switzerland)',
+    'de'          => 'German',
+    'el_CY'       => 'Greek (Cyprus)',
+    'el_GR'       => 'Greek (Greece)',
+    'el'          => 'Greek',
+    'gu_IN'       => 'Gujarati (India)',
+    'gu'          => 'Gujarati',
+    'guz_KE'      => 'Gusii (Kenya)',
+    'guz'         => 'Gusii',
+    'ha_Latn'     => 'Hausa (Latin)',
+    'ha_Latn_GH'  => 'Hausa (Latin, Ghana)',
+    'ha_Latn_NE'  => 'Hausa (Latin, Niger)',
+    'ha_Latn_NG'  => 'Hausa (Latin, Nigeria)',
+    'ha'          => 'Hausa',
+    'haw_US'      => 'Hawaiian (United States)',
+    'haw'         => 'Hawaiian',
+    'he_IL'       => 'Hebrew (Israel)',
+    'he'          => 'Hebrew',
+    'hi_IN'       => 'Hindi (India)',
+    'hi'          => 'Hindi',
+    'hu_HU'       => 'Hungarian (Hungary)',
+    'hu'          => 'Hungarian',
+    'is_IS'       => 'Icelandic (Iceland)',
+    'is'          => 'Icelandic',
+    'ig_NG'       => 'Igbo (Nigeria)',
+    'ig'          => 'Igbo',
+    'id_ID'       => 'Indonesian (Indonesia)',
+    'id'          => 'Indonesian',
+    'ga_IE'       => 'Irish (Ireland)',
+    'ga'          => 'Irish',
+    'it_IT'       => 'Italian (Italy)',
+    'it_CH'       => 'Italian (Switzerland)',
+    'it'          => 'Italian',
+    'ja_JP'       => 'Japanese (Japan)',
+    'ja'          => 'Japanese',
+    'kea_CV'      => 'Kabuverdianu (Cape Verde)',
+    'kea'         => 'Kabuverdianu',
+    'kab_DZ'      => 'Kabyle (Algeria)',
+    'kab'         => 'Kabyle',
+    'kl_GL'       => 'Kalaallisut (Greenland)',
+    'kl'          => 'Kalaallisut',
+    'kln_KE'      => 'Kalenjin (Kenya)',
+    'kln'         => 'Kalenjin',
+    'kam_KE'      => 'Kamba (Kenya)',
+    'kam'         => 'Kamba',
+    'kn_IN'       => 'Kannada (India)',
+    'kn'          => 'Kannada',
+    'kk_Cyrl'     => 'Kazakh (Cyrillic)',
+    'kk_Cyrl_KZ'  => 'Kazakh (Cyrillic, Kazakhstan)',
+    'kk'          => 'Kazakh',
+    'km_KH'       => 'Khmer (Cambodia)',
+    'km'          => 'Khmer',
+    'ki_KE'       => 'Kikuyu (Kenya)',
+    'ki'          => 'Kikuyu',
+    'rw_RW'       => 'Kinyarwanda (Rwanda)',
+    'rw'          => 'Kinyarwanda',
+    'kok_IN'      => 'Konkani (India)',
+    'kok'         => 'Konkani',
+    'ko_KR'       => 'Korean (South Korea)',
+    'ko'          => 'Korean',
+    'khq_ML'      => 'Koyra Chiini (Mali)',
+    'khq'         => 'Koyra Chiini',
+    'ses_ML'      => 'Koyraboro Senni (Mali)',
+    'ses'         => 'Koyraboro Senni',
+    'lag_TZ'      => 'Langi (Tanzania)',
+    'lag'         => 'Langi',
+    'lv_LV'       => 'Latvian (Latvia)',
+    'lv'          => 'Latvian',
+    'lt_LT'       => 'Lithuanian (Lithuania)',
+    'lt'          => 'Lithuanian',
+    'luo_KE'      => 'Luo (Kenya)',
+    'luo'         => 'Luo',
+    'luy_KE'      => 'Luyia (Kenya)',
+    'luy'         => 'Luyia',
+    'mk_MK'       => 'Macedonian (Macedonia)',
+    'mk'          => 'Macedonian',
+    'jmc_TZ'      => 'Machame (Tanzania)',
+    'jmc'         => 'Machame',
+    'kde_TZ'      => 'Makonde (Tanzania)',
+    'kde'         => 'Makonde',
+    'mg_MG'       => 'Malagasy (Madagascar)',
+    'mg'          => 'Malagasy',
+    'ms_BN'       => 'Malay (Brunei)',
+    'ms_MY'       => 'Malay (Malaysia)',
+    'ms'          => 'Malay',
+    'ml_IN'       => 'Malayalam (India)',
+    'ml'          => 'Malayalam',
+    'mt_MT'       => 'Maltese (Malta)',
+    'mt'          => 'Maltese',
+    'gv_GB'       => 'Manx (United Kingdom)',
+    'gv'          => 'Manx',
+    'mr_IN'       => 'Marathi (India)',
+    'mr'          => 'Marathi',
+    'mas_KE'      => 'Masai (Kenya)',
+    'mas_TZ'      => 'Masai (Tanzania)',
+    'mas'         => 'Masai',
+    'mer_KE'      => 'Meru (Kenya)',
+    'mer'         => 'Meru',
+    'mfe_MU'      => 'Morisyen (Mauritius)',
+    'mfe'         => 'Morisyen',
+    'naq_NA'      => 'Nama (Namibia)',
+    'naq'         => 'Nama',
+    'ne_IN'       => 'Nepali (India)',
+    'ne_NP'       => 'Nepali (Nepal)',
+    'ne'          => 'Nepali',
+    'nd_ZW'       => 'North Ndebele (Zimbabwe)',
+    'nd'          => 'North Ndebele',
+    'nb_NO'       => 'Norwegian Bokmål (Norway)',
+    'nb'          => 'Norwegian Bokmål',
+    'nn_NO'       => 'Norwegian Nynorsk (Norway)',
+    'nn'          => 'Norwegian Nynorsk',
+    'nyn_UG'      => 'Nyankole (Uganda)',
+    'nyn'         => 'Nyankole',
+    'or_IN'       => 'Oriya (India)',
+    'or'          => 'Oriya',
+    'om_ET'       => 'Oromo (Ethiopia)',
+    'om_KE'       => 'Oromo (Kenya)',
+    'om'          => 'Oromo',
+    'ps_AF'       => 'Pashto (Afghanistan)',
+    'ps'          => 'Pashto',
+    'fa_AF'       => 'Persian (Afghanistan)',
+    'fa_IR'       => 'Persian (Iran)',
+    'fa'          => 'Persian',
+    'pl_PL'       => 'Polish (Poland)',
+    'pl'          => 'Polish',
+    'pt_BR'       => 'Portuguese (Brazil)',
+    'pt_GW'       => 'Portuguese (Guinea-Bissau)',
+    'pt_MZ'       => 'Portuguese (Mozambique)',
+    'pt_PT'       => 'Portuguese (Portugal)',
+    'pt'          => 'Portuguese',
+    'pa_Arab'     => 'Punjabi (Arabic)',
+    'pa_Arab_PK'  => 'Punjabi (Arabic, Pakistan)',
+    'pa_Guru'     => 'Punjabi (Gurmukhi)',
+    'pa_Guru_IN'  => 'Punjabi (Gurmukhi, India)',
+    'pa'          => 'Punjabi',
+    'ro_MD'       => 'Romanian (Moldova)',
+    'ro_RO'       => 'Romanian (Romania)',
+    'ro'          => 'Romanian',
+    'rm_CH'       => 'Romansh (Switzerland)',
+    'rm'          => 'Romansh',
+    'rof_TZ'      => 'Rombo (Tanzania)',
+    'rof'         => 'Rombo',
+    'ru_MD'       => 'Russian (Moldova)',
+    'ru_RU'       => 'Russian (Russia)',
+    'ru_UA'       => 'Russian (Ukraine)',
+    'ru'          => 'Russian',
+    'rwk_TZ'      => 'Rwa (Tanzania)',
+    'rwk'         => 'Rwa',
+    'saq_KE'      => 'Samburu (Kenya)',
+    'saq'         => 'Samburu',
+    'sg_CF'       => 'Sango (Central African Republic)',
+    'sg'          => 'Sango',
+    'seh_MZ'      => 'Sena (Mozambique)',
+    'seh'         => 'Sena',
+    'sr_Cyrl'     => 'Serbian (Cyrillic)',
+    'sr_Cyrl_BA'  => 'Serbian (Cyrillic, Bosnia and Herzegovina)',
+    'sr_Cyrl_ME'  => 'Serbian (Cyrillic, Montenegro)',
+    'sr_Cyrl_RS'  => 'Serbian (Cyrillic, Serbia)',
+    'sr_Latn'     => 'Serbian (Latin)',
+    'sr_Latn_BA'  => 'Serbian (Latin, Bosnia and Herzegovina)',
+    'sr_Latn_ME'  => 'Serbian (Latin, Montenegro)',
+    'sr_Latn_RS'  => 'Serbian (Latin, Serbia)',
+    'sr'          => 'Serbian',
+    'sn_ZW'       => 'Shona (Zimbabwe)',
+    'sn'          => 'Shona',
+    'ii_CN'       => 'Sichuan Yi (China)',
+    'ii'          => 'Sichuan Yi',
+    'si_LK'       => 'Sinhala (Sri Lanka)',
+    'si'          => 'Sinhala',
+    'sk_SK'       => 'Slovak (Slovakia)',
+    'sk'          => 'Slovak',
+    'sl_SI'       => 'Slovenian (Slovenia)',
+    'sl'          => 'Slovenian',
+    'xog_UG'      => 'Soga (Uganda)',
+    'xog'         => 'Soga',
+    'so_DJ'       => 'Somali (Djibouti)',
+    'so_ET'       => 'Somali (Ethiopia)',
+    'so_KE'       => 'Somali (Kenya)',
+    'so_SO'       => 'Somali (Somalia)',
+    'so'          => 'Somali',
+    'es_AR'       => 'Spanish (Argentina)',
+    'es_BO'       => 'Spanish (Bolivia)',
+    'es_CL'       => 'Spanish (Chile)',
+    'es_CO'       => 'Spanish (Colombia)',
+    'es_CR'       => 'Spanish (Costa Rica)',
+    'es_DO'       => 'Spanish (Dominican Republic)',
+    'es_EC'       => 'Spanish (Ecuador)',
+    'es_SV'       => 'Spanish (El Salvador)',
+    'es_GQ'       => 'Spanish (Equatorial Guinea)',
+    'es_GT'       => 'Spanish (Guatemala)',
+    'es_HN'       => 'Spanish (Honduras)',
+    'es_419'      => 'Spanish (Latin America)',
+    'es_MX'       => 'Spanish (Mexico)',
+    'es_NI'       => 'Spanish (Nicaragua)',
+    'es_PA'       => 'Spanish (Panama)',
+    'es_PY'       => 'Spanish (Paraguay)',
+    'es_PE'       => 'Spanish (Peru)',
+    'es_PR'       => 'Spanish (Puerto Rico)',
+    'es_ES'       => 'Spanish (Spain)',
+    'es_US'       => 'Spanish (United States)',
+    'es_UY'       => 'Spanish (Uruguay)',
+    'es_VE'       => 'Spanish (Venezuela)',
+    'es'          => 'Spanish',
+    'sw_KE'       => 'Swahili (Kenya)',
+    'sw_TZ'       => 'Swahili (Tanzania)',
+    'sw'          => 'Swahili',
+    'sv_FI'       => 'Swedish (Finland)',
+    'sv_SE'       => 'Swedish (Sweden)',
+    'sv'          => 'Swedish',
+    'gsw_CH'      => 'Swiss German (Switzerland)',
+    'gsw'         => 'Swiss German',
+    'shi_Latn'    => 'Tachelhit (Latin)',
+    'shi_Latn_MA' => 'Tachelhit (Latin, Morocco)',
+    'shi_Tfng'    => 'Tachelhit (Tifinagh)',
+    'shi_Tfng_MA' => 'Tachelhit (Tifinagh, Morocco)',
+    'shi'         => 'Tachelhit',
+    'dav_KE'      => 'Taita (Kenya)',
+    'dav'         => 'Taita',
+    'ta_IN'       => 'Tamil (India)',
+    'ta_LK'       => 'Tamil (Sri Lanka)',
+    'ta'          => 'Tamil',
+    'te_IN'       => 'Telugu (India)',
+    'te'          => 'Telugu',
+    'teo_KE'      => 'Teso (Kenya)',
+    'teo_UG'      => 'Teso (Uganda)',
+    'teo'         => 'Teso',
+    'th_TH'       => 'Thai (Thailand)',
+    'th'          => 'Thai',
+    'bo_CN'       => 'Tibetan (China)',
+    'bo_IN'       => 'Tibetan (India)',
+    'bo'          => 'Tibetan',
+    'ti_ER'       => 'Tigrinya (Eritrea)',
+    'ti_ET'       => 'Tigrinya (Ethiopia)',
+    'ti'          => 'Tigrinya',
+    'to_TO'       => 'Tonga (Tonga)',
+    'to'          => 'Tonga',
+    'tr_TR'       => 'Turkish (Turkey)',
+    'tr'          => 'Turkish',
+    'uk_UA'       => 'Ukrainian (Ukraine)',
+    'uk'          => 'Ukrainian',
+    'ur_IN'       => 'Urdu (India)',
+    'ur_PK'       => 'Urdu (Pakistan)',
+    'ur'          => 'Urdu',
+    'uz_Arab'     => 'Uzbek (Arabic)',
+    'uz_Arab_AF'  => 'Uzbek (Arabic, Afghanistan)',
+    'uz_Cyrl'     => 'Uzbek (Cyrillic)',
+    'uz_Cyrl_UZ'  => 'Uzbek (Cyrillic, Uzbekistan)',
+    'uz_Latn'     => 'Uzbek (Latin)',
+    'uz_Latn_UZ'  => 'Uzbek (Latin, Uzbekistan)',
+    'uz'          => 'Uzbek',
+    'vi_VN'       => 'Vietnamese (Vietnam)',
+    'vi'          => 'Vietnamese',
+    'vun_TZ'      => 'Vunjo (Tanzania)',
+    'vun'         => 'Vunjo',
+    'cy_GB'       => 'Welsh (United Kingdom)',
+    'cy'          => 'Welsh',
+    'yo_NG'       => 'Yoruba (Nigeria)',
+    'yo'          => 'Yoruba',
+    'zu_ZA'       => 'Zulu (South Africa)',
+    'zu'          => 'Zulu',
 ];
 
 if (isset($_POST['add_database'])) {
 
-  // Check if database has been set up already. If it has, direct user to edit directly instead.
-  if (file_exists('config.php')) {
-    $_SESSION['alert_message'] = "Database already configured. Any further changes should be made by editing the config.php file.";
+    // Check if database has been set up already. If it has, direct user to edit directly instead.
+    if (file_exists('config.php')) {
+        $_SESSION['alert_message'] = "Database already configured. Any further changes should be made by editing the config.php file.";
+        header("Location: setup.php?user");
+        exit;
+    }
+
+    $host = $_POST['host'];
+    $database = $_POST['database'];
+    $username = $_POST['username'];
+    $password = $_POST['password'];
+    $config_base_url = $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']);
+
+    $installation_id = randomString(32);
+
+    // Test database connection before writing it to config.php
+    try {
+        mysqli_connect($host, $username, $password, $database);
+    } catch (Exception $e) {
+        exit("<b>Database connection failed - please check and try again</b> <br> <br> $e");
+    }
+
+    $new_config = array();
+    $new_config[] = "<?php\n\n";
+    $new_config[] = sprintf("\$dbhost = '%s';\n", addslashes($host));
+    $new_config[] = sprintf("\$dbusername = '%s';\n", addslashes($username));
+    $new_config[] = sprintf("\$dbpassword = '%s';\n", addslashes($password));
+    $new_config[] = sprintf("\$database = '%s';\n", addslashes($database));
+    $new_config[] = "\$mysqli = mysqli_connect(\$dbhost, \$dbusername, \$dbpassword, \$database) or die('Database Connection Failed');\n";
+    $new_config[] = "\$config_app_name = 'ITFlow';\n";
+    $new_config[] = sprintf("\$config_base_url = '%s';\n", addslashes($config_base_url));
+    $new_config[] = "\$config_https_only = TRUE;\n";
+    $new_config[] = "\$repo_branch = 'master';\n";
+    $new_config[] = "\$installation_id = '$installation_id';\n";
+
+    file_put_contents("config.php", $new_config);
+
+    include("config.php");
+
+    // Name of the file
+    $filename = 'db.sql';
+    // Temporary variable, used to store current query
+    $templine = '';
+    // Read in entire file
+    $lines = file($filename);
+    // Loop through each line
+    foreach ($lines as $line) {
+        // Skip it if it's a comment
+        if (substr($line, 0, 2) == '--' || $line == '')
+            continue;
+
+        // Add this line to the current segment
+        $templine .= $line;
+        // If it has a semicolon at the end, it's the end of the query
+        if (substr(trim($line), -1, 1) == ';') {
+            // Perform the query
+            mysqli_query($mysqli,$templine);
+            // Reset temp variable to empty
+            $templine = '';
+        }
+    }
+
+    $_SESSION['alert_message'] = "Database successfully added";
+
     header("Location: setup.php?user");
     exit;
-  }
-
-  $host = $_POST['host'];
-  $database = $_POST['database'];
-  $username = $_POST['username'];
-  $password = $_POST['password'];
-  $config_base_url = $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']);
-
-  $installation_id = randomString(32);
-
-  // Test database connection before writing it to config.php
-  try {
-    mysqli_connect($host, $username, $password, $database);
-  } catch (Exception $e) {
-    exit("<b>Database connection failed - please check and try again</b> <br> <br> $e");
-  }
-
-  $new_config = array();
-  $new_config[] = "<?php\n\n";
-  $new_config[] = sprintf("\$dbhost = '%s';\n", addslashes($host));
-  $new_config[] = sprintf("\$dbusername = '%s';\n", addslashes($username));
-  $new_config[] = sprintf("\$dbpassword = '%s';\n", addslashes($password));
-  $new_config[] = sprintf("\$database = '%s';\n", addslashes($database));
-  $new_config[] = "\$mysqli = mysqli_connect(\$dbhost, \$dbusername, \$dbpassword, \$database) or die('Database Connection Failed');\n";
-  $new_config[] = "\$config_app_name = 'ITFlow';\n";
-  $new_config[] = sprintf("\$config_base_url = '%s';\n", addslashes($config_base_url));
-  $new_config[] = "\$config_https_only = TRUE;\n";
-  $new_config[] = "\$repo_branch = 'master';\n";
-  $new_config[] = "\$installation_id = '$installation_id';\n";
-
-  file_put_contents("config.php", $new_config);
-
-  include("config.php");
-
-  // Name of the file
-  $filename = 'db.sql';
-  // Temporary variable, used to store current query
-  $templine = '';
-  // Read in entire file
-  $lines = file($filename);
-  // Loop through each line
-  foreach ($lines as $line) {
-    // Skip it if it's a comment
-    if (substr($line, 0, 2) == '--' || $line == '')
-      continue;
-
-    // Add this line to the current segment
-    $templine .= $line;
-    // If it has a semicolon at the end, it's the end of the query
-    if (substr(trim($line), -1, 1) == ';') {
-      // Perform the query
-      mysqli_query($mysqli,$templine);
-      // Reset temp variable to empty
-      $templine = '';
-    }
-  }
-
-  $_SESSION['alert_message'] = "Database successfully added";
-
-  header("Location: setup.php?user");
-  exit;
 
 }
 
 if (isset($_POST['add_user'])) {
-  $user_count = mysqli_num_rows(mysqli_query($mysqli,"SELECT COUNT(*) FROM users"));
-  if ($user_count < 0) {
-    $_SESSION['alert_message'] = "Users already exist in the database. Clear them to reconfigure here.";
+    $user_count = mysqli_num_rows(mysqli_query($mysqli,"SELECT COUNT(*) FROM users"));
+    if ($user_count < 0) {
+        $_SESSION['alert_message'] = "Users already exist in the database. Clear them to reconfigure here.";
+        header("Location: setup.php?company");
+        exit;
+    }
+
+    $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])));
+    $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email'])));
+    $password = password_hash($_POST['password'], PASSWORD_DEFAULT);
+
+    //Generate master encryption key
+    $site_encryption_master_key = randomString();
+
+    //Generate user specific key
+    $user_specific_encryption_ciphertext = setupFirstUserSpecificKey($_POST['password'], $site_encryption_master_key);
+
+    mysqli_query($mysqli,"INSERT INTO users SET user_name = '$name', user_email = '$email', user_password = '$password', user_specific_encryption_ciphertext = '$user_specific_encryption_ciphertext', user_created_at = NOW()");
+
+    $user_id = mysqli_insert_id($mysqli);
+
+    mkdirMissing("uploads/users/$user_id");
+
+    //Check to see if a file is attached
+    if ($_FILES['file']['tmp_name'] != '') {
+
+        // get details of the uploaded file
+        $file_error = 0;
+        $file_tmp_path = $_FILES['file']['tmp_name'];
+        $file_name = $_FILES['file']['name'];
+        $file_size = $_FILES['file']['size'];
+        $file_type = $_FILES['file']['type'];
+        $file_extension = strtolower(end(explode('.',$_FILES['file']['name'])));
+
+        // sanitize file-name
+        $new_file_name = md5(time() . $file_name) . '.' . $file_extension;
+
+        // check if file has one of the following extensions
+        $allowed_file_extensions = array('jpg', 'gif', 'png');
+
+        if (in_array($file_extension,$allowed_file_extensions) === false) {
+            $file_error = 1;
+        }
+
+        //Check File Size
+        if ($file_size > 2097152) {
+            $file_error = 1;
+        }
+
+        if ($file_error == 0) {
+            // directory in which the uploaded file will be moved
+            $upload_file_dir = "uploads/users/$user_id/";
+            $dest_path = $upload_file_dir . $new_file_name;
+
+            move_uploaded_file($file_tmp_path, $dest_path);
+
+            //Set Avatar
+            mysqli_query($mysqli,"UPDATE users SET user_avatar = '$new_file_name' WHERE user_id = $user_id");
+
+            $_SESSION['alert_message'] = 'File successfully uploaded.';
+        } else {
+
+            $_SESSION['alert_message'] = 'There was an error moving the file to upload directory. Please make sure the upload directory is writable by web server.';
+        }
+    }
+
+    //Create Settings
+    mysqli_query($mysqli,"INSERT INTO user_settings SET user_id = $user_id, user_role = 3, user_default_company = 1");
+
+    $_SESSION['alert_message'] = "User <strong>$name</strong> created!";
+
     header("Location: setup.php?company");
     exit;
-  }
-
-  $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])));
-  $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email'])));
-  $password = password_hash($_POST['password'], PASSWORD_DEFAULT);
-
-  //Generate master encryption key
-  $site_encryption_master_key = randomString();
-
-  //Generate user specific key
-  $user_specific_encryption_ciphertext = setupFirstUserSpecificKey($_POST['password'], $site_encryption_master_key);
-
-  mysqli_query($mysqli,"INSERT INTO users SET user_name = '$name', user_email = '$email', user_password = '$password', user_specific_encryption_ciphertext = '$user_specific_encryption_ciphertext', user_created_at = NOW()");
-
-  $user_id = mysqli_insert_id($mysqli);
-
-  mkdirMissing("uploads/users/$user_id");
-
-  //Check to see if a file is attached
-  if ($_FILES['file']['tmp_name'] != '') {
-
-    // get details of the uploaded file
-    $file_error = 0;
-    $file_tmp_path = $_FILES['file']['tmp_name'];
-    $file_name = $_FILES['file']['name'];
-    $file_size = $_FILES['file']['size'];
-    $file_type = $_FILES['file']['type'];
-    $file_extension = strtolower(end(explode('.',$_FILES['file']['name'])));
-
-    // sanitize file-name
-    $new_file_name = md5(time() . $file_name) . '.' . $file_extension;
-
-    // check if file has one of the following extensions
-    $allowed_file_extensions = array('jpg', 'gif', 'png');
-
-    if (in_array($file_extension,$allowed_file_extensions) === false) {
-      $file_error = 1;
-    }
-
-    //Check File Size
-    if ($file_size > 2097152) {
-      $file_error = 1;
-    }
-
-    if ($file_error == 0) {
-      // directory in which the uploaded file will be moved
-      $upload_file_dir = "uploads/users/$user_id/";
-      $dest_path = $upload_file_dir . $new_file_name;
-
-      move_uploaded_file($file_tmp_path, $dest_path);
-
-      //Set Avatar
-      mysqli_query($mysqli,"UPDATE users SET user_avatar = '$new_file_name' WHERE user_id = $user_id");
-
-      $_SESSION['alert_message'] = 'File successfully uploaded.';
-    }else{
-
-      $_SESSION['alert_message'] = 'There was an error moving the file to upload directory. Please make sure the upload directory is writable by web server.';
-    }
-  }
-
-  //Create Settings
-  mysqli_query($mysqli,"INSERT INTO user_settings SET user_id = $user_id, user_role = 3, user_default_company = 1");
-
-  $_SESSION['alert_message'] = "User <strong>$name</strong> created!";
-
-  header("Location: setup.php?company");
-  exit;
 
 }
 
 if (isset($_POST['add_company_settings'])) {
 
-  $sql = mysqli_query($mysqli,"SELECT user_id FROM users");
-  $row = mysqli_fetch_array($sql);
-  $user_id = $row['user_id'];
+    $sql = mysqli_query($mysqli,"SELECT user_id FROM users");
+    $row = mysqli_fetch_array($sql);
+    $user_id = $row['user_id'];
 
-  $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])));
-  $country = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['country'])));
-  $address = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['address'])));
-  $city = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['city'])));
-  $state = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['state'])));
-  $zip = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['zip'])));
-  $phone = preg_replace("/[^0-9]/", '',$_POST['phone']);
-  $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email'])));
-  $website = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['website'])));
-  $locale = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['locale'])));
-  $currency_code = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['currency_code'])));
+    $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])));
+    $country = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['country'])));
+    $address = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['address'])));
+    $city = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['city'])));
+    $state = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['state'])));
+    $zip = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['zip'])));
+    $phone = preg_replace("/[^0-9]/", '',$_POST['phone']);
+    $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email'])));
+    $website = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['website'])));
+    $locale = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['locale'])));
+    $currency_code = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['currency_code'])));
 
-  mysqli_query($mysqli,"INSERT INTO companies SET company_name = '$name', company_address = '$address', company_city = '$city', company_state = '$state', company_zip = '$zip', company_country = '$country', company_phone = '$phone', company_email = '$email', company_website = '$website', company_locale = '$locale', company_currency = '$currency_code', company_created_at = NOW()");
+    mysqli_query($mysqli,"INSERT INTO companies SET company_name = '$name', company_address = '$address', company_city = '$city', company_state = '$state', company_zip = '$zip', company_country = '$country', company_phone = '$phone', company_email = '$email', company_website = '$website', company_locale = '$locale', company_currency = '$currency_code', company_created_at = NOW()");
 
-  $company_id = mysqli_insert_id($mysqli);
+    $company_id = mysqli_insert_id($mysqli);
 
-  mkdirMissing("uploads/clients/$company_id");
-  file_put_contents("uploads/clients/$company_id/index.php", "");
-  mkdirMissing("uploads/expenses/$company_id");
-  file_put_contents("uploads/expenses/$company_id/index.php", "");
-  mkdirMissing("uploads/settings/$company_id");
-  file_put_contents("uploads/settings/$company_id/index.php", "");
-  mkdirMissing("uploads/tmp/$company_id");
-  file_put_contents("uploads/tmp/$company_id/index.php", "");
+    mkdirMissing("uploads/clients/$company_id");
+    file_put_contents("uploads/clients/$company_id/index.php", "");
+    mkdirMissing("uploads/expenses/$company_id");
+    file_put_contents("uploads/expenses/$company_id/index.php", "");
+    mkdirMissing("uploads/settings/$company_id");
+    file_put_contents("uploads/settings/$company_id/index.php", "");
+    mkdirMissing("uploads/tmp/$company_id");
+    file_put_contents("uploads/tmp/$company_id/index.php", "");
 
-  //Check to see if a file is attached
-  if ($_FILES['file']['tmp_name'] != '') {
+    //Check to see if a file is attached
+    if ($_FILES['file']['tmp_name'] != '') {
 
-    // get details of the uploaded file
-    $file_error = 0;
-    $file_tmp_path = $_FILES['file']['tmp_name'];
-    $file_name = $_FILES['file']['name'];
-    $file_size = $_FILES['file']['size'];
-    $file_type = $_FILES['file']['type'];
-    $file_extension = strtolower(end(explode('.',$_FILES['file']['name'])));
+        // get details of the uploaded file
+        $file_error = 0;
+        $file_tmp_path = $_FILES['file']['tmp_name'];
+        $file_name = $_FILES['file']['name'];
+        $file_size = $_FILES['file']['size'];
+        $file_type = $_FILES['file']['type'];
+        $file_extension = strtolower(end(explode('.',$_FILES['file']['name'])));
 
-    // sanitize file-name
-    $new_file_name = md5(time() . $file_name) . '.' . $file_extension;
+        // sanitize file-name
+        $new_file_name = md5(time() . $file_name) . '.' . $file_extension;
 
-    // check if file has one of the following extensions
-    $allowed_file_extensions = array('jpg', 'gif', 'png');
+        // check if file has one of the following extensions
+        $allowed_file_extensions = array('jpg', 'gif', 'png');
 
-    if (in_array($file_extension,$allowed_file_extensions) === false) {
-      $file_error = 1;
+        if (in_array($file_extension,$allowed_file_extensions) === false) {
+            $file_error = 1;
+        }
+
+        //Check File Size
+        if ($file_size > 2097152) {
+            $file_error = 1;
+        }
+
+        if ($file_error == 0) {
+            // directory in which the uploaded file will be moved
+            $upload_file_dir = "uploads/settings/$company_id/";
+            $dest_path = $upload_file_dir . $new_file_name;
+
+            move_uploaded_file($file_tmp_path, $dest_path);
+
+            mysqli_query($mysqli,"UPDATE companies SET company_logo = '$new_file_name' WHERE company_id = $company_id");
+
+            $_SESSION['alert_message'] = 'File successfully uploaded.';
+        } else {
+
+            $_SESSION['alert_message'] = 'There was an error moving the file to upload directory. Please make sure the upload directory is writable by web server.';
+        }
     }
 
-    //Check File Size
-    if ($file_size > 2097152) {
-      $file_error = 1;
-    }
+    //Set User Company Permissions
+    mysqli_query($mysqli,"INSERT INTO user_companies SET user_id = $user_id, company_id = $company_id");
 
-    if ($file_error == 0) {
-      // directory in which the uploaded file will be moved
-      $upload_file_dir = "uploads/settings/$company_id/";
-      $dest_path = $upload_file_dir . $new_file_name;
+    $latest_database_version = LATEST_DATABASE_VERSION;
+    mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_current_database_version = '$latest_database_version',  config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_recurring_prefix = 'REC-', config_recurring_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_recurring_auto_send_invoice = 1, config_default_net_terms = 30, config_send_invoice_reminders = 1, config_enable_cron = 0, config_ticket_next_number = 1");
 
-      move_uploaded_file($file_tmp_path, $dest_path);
+    //Create Some Data
 
-      mysqli_query($mysqli,"UPDATE companies SET company_logo = '$new_file_name' WHERE company_id = $company_id");
+    mysqli_query($mysqli,"INSERT INTO accounts SET account_name = 'Cash', opening_balance = 0, account_currency_code = '$currency_code', account_created_at = NOW(), company_id = $company_id");
 
-      $_SESSION['alert_message'] = 'File successfully uploaded.';
-    }else{
+    mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Office Supplies', category_type = 'Expense', category_color = 'blue', category_created_at = NOW(), company_id = $company_id");
+    mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Travel', category_type = 'Expense', category_color = 'red', category_created_at = NOW(), company_id = $company_id");
+    mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Advertising', category_type = 'Expense', category_color = 'green', category_created_at = NOW(), company_id = $company_id");
 
-      $_SESSION['alert_message'] = 'There was an error moving the file to upload directory. Please make sure the upload directory is writable by web server.';
-    }
-  }
+    mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Service', category_type = 'Income', category_color = 'blue', category_created_at = NOW(), company_id = $company_id");
 
-  //Set User Company Permissions
-  mysqli_query($mysqli,"INSERT INTO user_companies SET user_id = $user_id, company_id = $company_id");
+    mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Friend', category_type = 'Referral', category_color = 'blue', category_created_at = NOW(), company_id = $company_id");
+    mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Search Engine', category_type = 'Referral', category_color = 'red', category_created_at = NOW(), company_id = $company_id");
 
-  $latest_database_version = LATEST_DATABASE_VERSION;
-  mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_current_database_version = '$latest_database_version',  config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_recurring_prefix = 'REC-', config_recurring_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_recurring_auto_send_invoice = 1, config_default_net_terms = 30, config_send_invoice_reminders = 1, config_enable_cron = 0, config_ticket_next_number = 1");
+    mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Cash', category_type = 'Payment Method', category_color = 'blue', category_created_at = NOW(), company_id = $company_id");
+    mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Check', category_type = 'Payment Method', category_color = 'red', category_created_at = NOW(), company_id = $company_id");
 
-  //Create Some Data
-
-  mysqli_query($mysqli,"INSERT INTO accounts SET account_name = 'Cash', opening_balance = 0, account_currency_code = '$currency_code', account_created_at = NOW(), company_id = $company_id");
-
-  mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Office Supplies', category_type = 'Expense', category_color = 'blue', category_created_at = NOW(), company_id = $company_id");
-  mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Travel', category_type = 'Expense', category_color = 'red', category_created_at = NOW(), company_id = $company_id");
-  mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Advertising', category_type = 'Expense', category_color = 'green', category_created_at = NOW(), company_id = $company_id");
-
-  mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Service', category_type = 'Income', category_color = 'blue', category_created_at = NOW(), company_id = $company_id");
-
-  mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Friend', category_type = 'Referral', category_color = 'blue', category_created_at = NOW(), company_id = $company_id");
-  mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Search Engine', category_type = 'Referral', category_color = 'red', category_created_at = NOW(), company_id = $company_id");
-
-  mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Cash', category_type = 'Payment Method', category_color = 'blue', category_created_at = NOW(), company_id = $company_id");
-  mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Check', category_type = 'Payment Method', category_color = 'red', category_created_at = NOW(), company_id = $company_id");
-
-  mysqli_query($mysqli,"INSERT INTO calendars SET calendar_name = 'Default', calendar_color = 'blue', calendar_created_at = NOW(), company_id = $company_id");
+    mysqli_query($mysqli,"INSERT INTO calendars SET calendar_name = 'Default', calendar_color = 'blue', calendar_created_at = NOW(), company_id = $company_id");
 
 
-  $_SESSION['alert_message'] = "Company <strong>$name</strong> created!";
+    $_SESSION['alert_message'] = "Company <strong>$name</strong> created!";
 
-  header("Location: setup.php?telemetry");
+    header("Location: setup.php?telemetry");
 
 }
 
 if (isset($_POST['add_telemetry'])) {
 
-  if ($_POST['share_data'] == 1) {
+    if ($_POST['share_data'] == 1) {
 
-    $comments = trim(strip_tags($_POST['comments']));
+        $comments = trim(strip_tags($_POST['comments']));
 
-    $sql = mysqli_query($mysqli,"SELECT * FROM companies LIMIT 1");
-    $row = mysqli_fetch_array($sql);
+        $sql = mysqli_query($mysqli,"SELECT * FROM companies LIMIT 1");
+        $row = mysqli_fetch_array($sql);
 
-    $company_name = $row['company_name'];
-    $city = $row['company_city'];
-    $state = $row['company_state'];
-    $country = $row['company_country'];
-    $currency = $row['company_currency'];
+        $company_name = $row['company_name'];
+        $city = $row['company_city'];
+        $state = $row['company_state'];
+        $country = $row['company_country'];
+        $currency = $row['company_currency'];
 
-    $postdata = http_build_query(
-      array(
-        'installation_id' => "$installation_id",
-        'company_name' => "$company_name",
-        'city' => "$city",
-        'state' => "$state",
-        'country' => "$country",
-        'currency' => "$currency",
-        'comments' => "$comments",
-        'collection_method' => 1
-      )
-    );
+        $postdata = http_build_query(
+            array(
+                'installation_id' => "$installation_id",
+                'company_name' => "$company_name",
+                'city' => "$city",
+                'state' => "$state",
+                'country' => "$country",
+                'currency' => "$currency",
+                'comments' => "$comments",
+                'collection_method' => 1
+            )
+        );
 
-    $opts = array('http' =>
-      array(
-        'method' => 'POST',
-        'header' => 'Content-type: application/x-www-form-urlencoded',
-        'content' => $postdata
-      )
-    );
+        $opts = array('http' =>
+            array(
+                'method' => 'POST',
+                'header' => 'Content-type: application/x-www-form-urlencoded',
+                'content' => $postdata
+            )
+        );
 
-    $context = stream_context_create($opts);
+        $context = stream_context_create($opts);
 
-    $result = file_get_contents('https://telemetry.itflow.org', false, $context);
+        $result = file_get_contents('https://telemetry.itflow.org', false, $context);
 
-    echo $result;
+        echo $result;
 
-  }
+    }
 
-  //final setup stages
-  $myfile = fopen("config.php", "a");
+    //final setup stages
+    $myfile = fopen("config.php", "a");
 
-  $txt = "\$config_enable_setup = 0;\n\n";
+    $txt = "\$config_enable_setup = 0;\n\n";
 
-  fwrite($myfile, $txt);
+    fwrite($myfile, $txt);
 
-  fclose($myfile);
+    fclose($myfile);
 
-  header("Location: login.php");
-  exit;
+    header("Location: login.php");
+    exit;
 
 }
 
@@ -1170,66 +1170,135 @@ if (isset($_POST['add_telemetry'])) {
         <div class="content mt-3">
             <div class="container-fluid">
 
-              <?php
-              //Alert Feedback
-              if (!empty($_SESSION['alert_message'])) {
-                ?>
-                  <div class="alert alert-info" id="alert">
-                    <?php echo $_SESSION['alert_message']; ?>
-                      <button class='close' data-dismiss='alert'>&times;</button>
-                  </div>
                 <?php
-                $_SESSION['alert_type'] = '';
-                $_SESSION['alert_message'] = '';
-              }
-              ?>
-              <?php if (isset($_GET['setup_checks'])) { ?>
+                //Alert Feedback
+                if (!empty($_SESSION['alert_message'])) {
+                    ?>
+                    <div class="alert alert-info" id="alert">
+                        <?php echo $_SESSION['alert_message']; ?>
+                        <button class='close' data-dismiss='alert'>&times;</button>
+                    </div>
+                    <?php
+                    $_SESSION['alert_type'] = '';
+                    $_SESSION['alert_message'] = '';
+                }
+                ?>
+                <?php if (isset($_GET['setup_checks'])) { ?>
 
-                  <div class="card mb-3">
-                      <div class="card-header">
-                          <h6 class="mt-1"><i class="fa fa-fw fa-checkmark"></i> Setup Checks</h6>
-                      </div>
-                      <div class="card-body">
-                          <ul class="mb-4">
-                              <li>Upload is readable and writeable</li>
-                              <li>PHP 7+ Installed</li>
-                          </ul>
-                          <div style="text-align: center;"><a href="?database" class="btn btn-lg btn-primary mb-5">Install</a></div>
-                      </div>
-                  </div>
+                    <div class="card mb-3">
+                        <div class="card-header">
+                            <h6 class="mt-1"><i class="fa fa-fw fa-checkmark"></i> Setup Checks</h6>
+                        </div>
+                        <div class="card-body">
+                            <ul class="mb-4">
+                                <li>Upload is readable and writeable</li>
+                                <li>PHP 7+ Installed</li>
+                            </ul>
+                            <div style="text-align: center;"><a href="?database" class="btn btn-lg btn-primary mb-5">Install</a></div>
+                        </div>
+                    </div>
 
-              <?php } ?>
+                <?php } ?>
 
-              <?php if (isset($_GET['database'])) { ?>
+                <?php if (isset($_GET['database'])) { ?>
 
-                  <div class="card card-dark">
-                      <div class="card-header">
-                          <h3 class="card-title"><i class="fa fa-fw fa-database"></i> Connect your Database</h3>
-                      </div>
-                      <div class="card-body">
-                        <?php if (file_exists('config.php')) { ?>
-                            Database already configured. Any further changes should be made by editing the config.php file,
-                            or deleting it and refreshing this page.
-                        <?php }else{ ?>
-                            <form method="post" autocomplete="off">
+                    <div class="card card-dark">
+                        <div class="card-header">
+                            <h3 class="card-title"><i class="fa fa-fw fa-database"></i> Connect your Database</h3>
+                        </div>
+                        <div class="card-body">
+                            <?php if (file_exists('config.php')) { ?>
+                                Database already configured. Any further changes should be made by editing the config.php file,
+                                or deleting it and refreshing this page.
+                            <?php }else{ ?>
+                                <form method="post" autocomplete="off">
 
+                                    <div class="form-group">
+                                        <label>Database User <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="username" placeholder="Database User" autofocus required>
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>Database Password <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-lock"></i></span>
+                                            </div>
+                                            <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Enter a Database Password" autocomplete="new-password" required>
+                                            <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>Database 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-database"></i></span>
+                                            </div>
+                                            <input type="text" class="form-control" name="database" placeholder="Database Name" required>
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>Database Host <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-server"></i></span>
+                                            </div>
+                                            <input type="text" class="form-control" name="host" value="localhost" placeholder="Database Host" required>
+                                        </div>
+                                    </div>
+
+                                    <hr>
+                                    <button type="submit" name="add_database" class="btn btn-primary">Next <i class="fa fa-fw fa-arrow-circle-right"></i></button>
+                                </form>
+                            <?php } ?>
+                        </div>
+                    </div>
+
+                <?php } elseif (isset($_GET['user'])) { ?>
+
+                    <div class="card card-dark">
+                        <div class="card-header">
+                            <h3 class="card-title"><i class="fa fa-fw fa-user"></i> Create your first user</h3>
+                        </div>
+                        <div class="card-body">
+
+                            <form method="post" enctype="multipart/form-data" autocomplete="off">
                                 <div class="form-group">
-                                    <label>Database User <strong class="text-danger">*</strong></label>
+                                    <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="username" placeholder="Database User" autofocus required>
+                                        <input type="text" class="form-control" name="name" placeholder="Full Name" autofocus required>
                                     </div>
                                 </div>
 
                                 <div class="form-group">
-                                    <label>Database Password <strong class="text-danger">*</strong></label>
+                                    <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>Password <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-lock"></i></span>
                                         </div>
-                                        <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Enter a Database Password" autocomplete="new-password" required>
+                                        <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Enter a Password" autocomplete="new-password" required minlength="8">
                                         <div class="input-group-append">
                                             <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
                                         </div>
@@ -1237,303 +1306,234 @@ if (isset($_POST['add_telemetry'])) {
                                 </div>
 
                                 <div class="form-group">
-                                    <label>Database 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-database"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" name="database" placeholder="Database Name" required>
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Database Host <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-server"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" name="host" value="localhost" placeholder="Database Host" required>
-                                    </div>
-                                </div>
-
-                                <hr>
-                                <button type="submit" name="add_database" class="btn btn-primary">Next <i class="fa fa-fw fa-arrow-circle-right"></i></button>
-                            </form>
-                        <?php } ?>
-                      </div>
-                  </div>
-
-              <?php }elseif (isset($_GET['user'])) { ?>
-
-                  <div class="card card-dark">
-                      <div class="card-header">
-                          <h3 class="card-title"><i class="fa fa-fw fa-user"></i> Create your first user</h3>
-                      </div>
-                      <div class="card-body">
-
-                          <form method="post" enctype="multipart/form-data" autocomplete="off">
-                              <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" autofocus required>
-                                  </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>Password <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-lock"></i></span>
-                                      </div>
-                                      <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Enter a Password" autocomplete="new-password" required minlength="8">
-                                      <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>Avatar</label>
-                                  <input type="file" class="form-control-file" accept="image/*;capture=camera" name="file">
-                              </div>
-
-                              <hr>
-
-                              <button type="submit" name="add_user" class="btn btn-primary">Next <i class="fa fa-fw fa-arrow-circle-right"></i></button>
-                          </form>
-                      </div>
-                  </div>
-
-              <?php }elseif (isset($_GET['company'])) { ?>
-
-                  <div class="card card-dark">
-                      <div class="card-header">
-                          <h3 class="card-title"><i class="fa fa-fw fa-building"></i> Company Details</h3>
-                      </div>
-                      <div class="card-body">
-                        <?php if (mysqli_num_rows(mysqli_query($mysqli,"SELECT COUNT(*) FROM users")) < 0) { ?>
-                            Database config invalid, or users already exist in the database.
-                        <?php }else{ ?>
-                            <form method="post" enctype="multipart/form-data" autocomplete="off">
-
-                                <div class="form-group">
-                                    <label>Company 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-building"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" name="name" placeholder="Company Name" autofocus required>
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Address</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" name="address" placeholder="Street Address">
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>City</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" name="city" placeholder="City">
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>State / Province</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" name="state" placeholder="State or Province">
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Zip / Postal Code</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code">
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Country <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-flag"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="country" required>
-                                            <option value="">- Country -</option>
-                                          <?php foreach($countries_array as $country_name) { ?>
-                                              <option><?php echo $country_name; ?></option>
-                                          <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Phone</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" name="phone" placeholder="Phone Number">
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Email</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">
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Website</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" name="website" placeholder="Website address">
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Locale <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-flag"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="locale" required>
-                                            <option value="">- Select a Locale -</option>
-                                          <?php foreach($locales_array as $locale_code => $locale_name) { ?>
-                                              <option value="<?php echo $locale_code; ?>"><?php echo "$locale_code - $locale_name"; ?></option>
-                                          <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <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 value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
-                                          <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Logo</label>
-                                    <input type="file" class="form-control-file" name="file">
+                                    <label>Avatar</label>
+                                    <input type="file" class="form-control-file" accept="image/*;capture=camera" name="file">
                                 </div>
 
                                 <hr>
 
-                                <button type="submit" name="add_company_settings" class="btn btn-primary">Next <i class="fa fa-fw fa-arrow-circle-right"></i></button>
+                                <button type="submit" name="add_user" class="btn btn-primary">Next <i class="fa fa-fw fa-arrow-circle-right"></i></button>
+                            </form>
+                        </div>
+                    </div>
+
+                <?php } elseif (isset($_GET['company'])) { ?>
+
+                    <div class="card card-dark">
+                        <div class="card-header">
+                            <h3 class="card-title"><i class="fa fa-fw fa-building"></i> Company Details</h3>
+                        </div>
+                        <div class="card-body">
+                            <?php if (mysqli_num_rows(mysqli_query($mysqli,"SELECT COUNT(*) FROM users")) < 0) { ?>
+                                Database config invalid, or users already exist in the database.
+                            <?php } else { ?>
+                                <form method="post" enctype="multipart/form-data" autocomplete="off">
+
+                                    <div class="form-group">
+                                        <label>Company 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-building"></i></span>
+                                            </div>
+                                            <input type="text" class="form-control" name="name" placeholder="Company Name" autofocus required>
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>Address</label>
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                                            </div>
+                                            <input type="text" class="form-control" name="address" placeholder="Street Address">
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>City</label>
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
+                                            </div>
+                                            <input type="text" class="form-control" name="city" placeholder="City">
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>State / Province</label>
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                                            </div>
+                                            <input type="text" class="form-control" name="state" placeholder="State or Province">
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>Zip / Postal Code</label>
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
+                                            </div>
+                                            <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code">
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>Country <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-flag"></i></span>
+                                            </div>
+                                            <select class="form-control select2" name="country" required>
+                                                <option value="">- Country -</option>
+                                                <?php foreach($countries_array as $country_name) { ?>
+                                                    <option><?php echo $country_name; ?></option>
+                                                <?php } ?>
+                                            </select>
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>Phone</label>
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                            </div>
+                                            <input type="text" class="form-control" name="phone" placeholder="Phone Number">
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>Email</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">
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>Website</label>
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                                            </div>
+                                            <input type="text" class="form-control" name="website" placeholder="Website address">
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>Locale <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-flag"></i></span>
+                                            </div>
+                                            <select class="form-control select2" name="locale" required>
+                                                <option value="">- Select a Locale -</option>
+                                                <?php foreach($locales_array as $locale_code => $locale_name) { ?>
+                                                    <option value="<?php echo $locale_code; ?>"><?php echo "$locale_code - $locale_name"; ?></option>
+                                                <?php } ?>
+                                            </select>
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <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 value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
+                                                <?php } ?>
+                                            </select>
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>Logo</label>
+                                        <input type="file" class="form-control-file" name="file">
+                                    </div>
+
+                                    <hr>
+
+                                    <button type="submit" name="add_company_settings" class="btn btn-primary">Next <i class="fa fa-fw fa-arrow-circle-right"></i></button>
+
+                                </form>
+                            <?php } ?>
+                        </div>
+                    </div>
+
+
+                <?php } elseif (isset($_GET['telemetry'])) { ?>
+
+                    <div class="card card-dark">
+                        <div class="card-header">
+                            <h3 class="card-title"><i class="fa fa-fw fa-share-alt"></i> Telemetry</h3>
+                        </div>
+                        <div class="card-body">
+                            <form method="post" autocomplete="off">
+                                <h5>Would you like to share some data with us?</h5>
+
+                                <hr>
+
+                                <div class="form-check">
+                                    <input type="checkbox" class="form-check-input" name="share_data" value="1">
+                                    <label class="form-check-label ml-2">Share <small class="text-secondary"> (Including City, State/Province, Country, Currency and your comments)</small></label>
+                                </div>
+
+                                <br>
+
+                                <div class="form-group">
+                                    <label>Comments</label>
+                                    <textarea class="form-control" rows="4" name="comments" placeholder="Any Comments?"></textarea>
+                                </div>
+
+                                <hr>
+
+                                <p>Housekeeping: <b>Post installation, <a href="https://wiki.itflow.org/doku.php?id=wiki:installation#essential_housekeeping">a few additional steps</a> are required</b></p>
+
+                                <hr>
+
+                                <button type="submit" name="add_telemetry" class="btn btn-primary">Finish and Sign in <i class="fa fa-fw fa-check-circle"></i></button>
 
                             </form>
-                        <?php } ?>
-                      </div>
-                  </div>
 
+                        </div>
+                    </div>
 
-              <?php }elseif (isset($_GET['telemetry'])) { ?>
+                <?php } else { ?>
 
-                  <div class="card card-dark">
-                      <div class="card-header">
-                          <h3 class="card-title"><i class="fa fa-fw fa-share-alt"></i> Telemetry</h3>
-                      </div>
-                      <div class="card-body">
-                          <form method="post" autocomplete="off">
-                              <h5>Would you like to share some data with us?</h5>
+                    <div class="card card-dark">
+                        <div class="card-header">
+                            <h3 class="card-title"><i class="fa fa-fw fa-cube"></i> Welcome to ITFlow Setup</h3>
+                        </div>
+                        <div class="card-body">
+                            <p><b>Thank you for choosing to try ITFlow!</b> Feel free to reach out on the <a href="https://forum.itflow.org/t/support" target="_blank">forums</a> if you have any questions.</p>
+                            <p>A database must be created before proceeding - click on the button below to get started! </p>
+                            <hr>
+                            <p class="text-muted">ITFlow is <b>free software</b>: you can redistribute and/or modify it under the terms of the <a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank">GNU General Public License</a>. <br> It is distributed in the hope that it will be useful, but <b>without any warranty</b>; without even the implied warranty of merchantability or fitness for a particular purpose.</p>
+                            <?php
+                            // Check that there is access to write config.php
+                            if (!file_put_contents("config.php", "Test")) {
+                                echo "<div class='alert alert-danger'>Warning: config.php is not writable. Ensure the webserver process has write access (chmod/chown). Check the <a href='https://wiki.itflow.org/doku.php?id=wiki:installation#ubuntu_setup_guide'>docs</a> for info.</div>";
+                            } else {
+                                // Else, able to write. Tidy up
+                                unlink("config.php");
+                            }
+                            ?>
+                            <hr>
+                            <div style="text-align: center;">
+                                <a href="?database" class="btn btn-primary">Begin Setup <i class="fa fa-fw fa-arrow-alt-circle-right"></i></a>
+                            </div>
+                        </div>
+                    </div>
 
-                              <hr>
-
-                              <div class="form-check">
-                                  <input type="checkbox" class="form-check-input" name="share_data" value="1">
-                                  <label class="form-check-label ml-2">Share <small class="text-secondary"> (Including City, State/Province, Country, Currency and your comments)</small></label>
-                              </div>
-
-                              <br>
-
-                              <div class="form-group">
-                                  <label>Comments</label>
-                                  <textarea class="form-control" rows="4" name="comments" placeholder="Any Comments?"></textarea>
-                              </div>
-
-                              <hr>
-
-                              <p>Housekeeping: <b>Post installation, <a href="https://wiki.itflow.org/doku.php?id=wiki:installation#essential_housekeeping">a few additional steps</a> are required</b></p>
-
-                              <hr>
-
-                              <button type="submit" name="add_telemetry" class="btn btn-primary">Finish and Sign in <i class="fa fa-fw fa-check-circle"></i></button>
-
-                          </form>
-
-                      </div>
-                  </div>
-
-              <?php }else{ ?>
-
-                  <div class="card card-dark">
-                      <div class="card-header">
-                          <h3 class="card-title"><i class="fa fa-fw fa-cube"></i> Welcome to ITFlow Setup</h3>
-                      </div>
-                      <div class="card-body">
-                          <p><b>Thank you for choosing to try ITFlow!</b> Feel free to reach out on the <a href="https://forum.itflow.org/t/support" target="_blank">forums</a> if you have any questions.</p>
-                          <p>A database must be created before proceeding - click on the button below to get started! </p>
-                          <hr>
-                          <p class="text-muted">ITFlow is <b>free software</b>: you can redistribute and/or modify it under the terms of the <a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank">GNU General Public License</a>. <br> It is distributed in the hope that it will be useful, but <b>without any warranty</b>; without even the implied warranty of merchantability or fitness for a particular purpose.</p>
-                        <?php
-                        // Check that there is access to write config.php
-                        if (!file_put_contents("config.php", "Test")) {
-                          echo "<div class='alert alert-danger'>Warning: config.php is not writable. Ensure the webserver process has write access (chmod/chown). Check the <a href='https://wiki.itflow.org/doku.php?id=wiki:installation#ubuntu_setup_guide'>docs</a> for info.</div>";
-                        }else{
-                          // Else, able to write. Tidy up
-                          unlink("config.php");
-                        }
-                        ?>
-                          <hr>
-                          <div style="text-align: center;">
-                            <a href="?database" class="btn btn-primary">Begin Setup <i class="fa fa-fw fa-arrow-alt-circle-right"></i></a>
-                          </div>
-                      </div>
-                  </div>
-
-              <?php } ?>
+                <?php } ?>
 
             </div><!-- /.container-fluid -->
         </div>
diff --git a/transfer_add_modal.php b/transfer_add_modal.php
index 352f1de3..f18b7766 100644
--- a/transfer_add_modal.php
+++ b/transfer_add_modal.php
@@ -1,129 +1,126 @@
 <div class="modal" id="addTransferModal" 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-exchange-alt"></i> Transfering Funds</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="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-exchange-alt"></i> Transfering Funds</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">
+                            <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">
+                            <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" name="amount" placeholder="Amount to transfer" required autofocus>
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group">
+                        <label>Transfer <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_from" required>
+                                <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");
+                                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_transfer_from_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">
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-arrow-right"></i></span>
+                            </div>
+                            <select class="form-control select2" name="account_to" required>
+                                <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");
+                                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_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>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <textarea class="form-control" rows="5" name="notes" placeholder="Enter some notes"></textarea>
+                    </div>
 
-          <div class="form-row">
-            
-            <div class="form-group col">
-              <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">
-              <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 class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_transfer" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Transfer</button>
                 </div>
-                <input type="number" class="form-control" step="0.01" min="0" name="amount" placeholder="Amount to transfer" required autofocus>
-              </div>
-            </div>
-          
-          </div>
-       
-          <div class="form-group">
-            <label>Transfer <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_from" required>
-                <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"); 
-                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_transfer_from_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">
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-arrow-right"></i></span>
-              </div>
-              <select class="form-control select2" name="account_to" required>
-                <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"); 
-                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_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>
-            </div>
-          </div>
-
-          <div class="form-group">
-            <textarea class="form-control" rows="5" name="notes" placeholder="Enter some notes"></textarea>
-          </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_transfer" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Transfer</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/transfer_edit_modal.php b/transfer_edit_modal.php
index a2dd2ed4..b0e9e7be 100644
--- a/transfer_edit_modal.php
+++ b/transfer_edit_modal.php
@@ -1,132 +1,132 @@
 <div class="modal" id="editTransferModal<?php echo $transfer_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-exchange-alt"></i> Modify Transfer</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="transfer_id" value="<?php echo $transfer_id; ?>">
-        <input type="hidden" name="expense_id" value="<?php echo $expense_id; ?>">
-        <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-sm">
-              <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">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-exchange-alt"></i> Modify Transfer</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="transfer_id" value="<?php echo $transfer_id; ?>">
+                <input type="hidden" name="expense_id" value="<?php echo $expense_id; ?>">
+                <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-sm">
+                            <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 $transfer_date; ?>" required>
+                            </div>
+                        </div>
+
+                        <div class="form-group col-sm">
+                            <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" name="amount" placeholder="Amount to transfer" value="<?php echo $transfer_amount; ?>" required>
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group">
+                        <label>Transfer <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_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");
+                                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 ($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
+                                }
+
+                                ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-arrow-right"></i></span>
+                            </div>
+                            <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");
+                                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");
+                                    $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");
+                                    $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");
+                                    $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>
+                                    <?php
+                                }
+
+                                ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <textarea class="form-control" rows="5" name="notes" placeholder="Enter some notes"><?php echo $transfer_notes; ?></textarea>
+                    </div>
+
+
                 </div>
-                <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo $transfer_date; ?>" required>
-              </div>
-            </div>
-            
-            <div class="form-group col-sm">
-              <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 class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="edit_transfer" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
                 </div>
-                <input type="number" class="form-control" step="0.01" min="0" name="amount" placeholder="Amount to transfer" value="<?php echo $transfer_amount; ?>" required>
-              </div>
-            </div>
-          
-          </div>
-          
-          <div class="form-group">
-            <label>Transfer <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_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"); 
-                  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 ($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
-                }
-                
-                ?>
-              </select>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-arrow-right"></i></span>
-              </div>
-              <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"); 
-                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");
-                  $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");
-                  $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");
-                  $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>
-                <?php
-                }
-                
-                ?>
-              </select>
-            </div>
-          </div>
-            
-          <div class="form-group">
-            <textarea class="form-control" rows="5" name="notes" placeholder="Enter some notes"><?php echo $transfer_notes; ?></textarea>
-          </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_transfer" 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/trip_add_modal.php b/trip_add_modal.php
index 30a072a1..ca791518 100644
--- a/trip_add_modal.php
+++ b/trip_add_modal.php
@@ -1,128 +1,128 @@
 <div class="modal" id="addTripModal" 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-route"></i> New Trip</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">
-              <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">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-route"></i> New Trip</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">
+                            <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">
+                            <label>Miles <strong class="text-danger">*</strong> / <span class="text-secondary">Roundtrip</span></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
+                                </div>
+                                <input type="number" step="0.1" min="0" class="form-control" name="miles" placeholder="Enter miles" required autofocus>
+                                <div class="input-group-append">
+                                    <div class="input-group-text">
+                                        <input type="checkbox" name="roundtrip" value="1">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Location <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-map-marker-alt"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="source" placeholder="Enter your starting location" required>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-arrow-right"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="destination" placeholder="Enter your destination" required>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Purpose <strong class="text-danger">*</strong></label>
+                        <textarea rows="4" class="form-control" placeholder="Enter a purpose" name="purpose" required></textarea>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Driver</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>
+                            <select class="form-control select2" name="user" required>
+                                <option value="">- Driver -</option>
+                                <?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");
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $user_id = $row['user_id'];
+                                    $user_name = htmlentities($row['user_name']);
+                                    ?>
+                                    <option <?php if ($session_user_id == $user_id) { echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
+
+                                    <?php
+                                }
+                                ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <?php if (isset($_GET['client_id'])) { ?>
+                        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+                    <?php }else{ ?>
+
+                        <div class="form-group">
+                            <label>Client</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>
+                                <select class="form-control select2" name="client" required>
+                                    <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");
+                                    while ($row = mysqli_fetch_array($sql)) {
+                                        $client_id = $row['client_id'];
+                                        $client_name = htmlentities($row['client_name']);
+                                        ?>
+                                        <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+
+                                        <?php
+                                    }
+                                    ?>
+                                </select>
+                            </div>
+                        </div>
+
+                    <?php } ?>
+
                 </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">
-              <label>Miles <strong class="text-danger">*</strong> / <span class="text-secondary">Roundtrip</span></label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></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_trip" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Create</button>
                 </div>
-                <input type="number" step="0.1" min="0" class="form-control" name="miles" placeholder="Enter miles" required autofocus>
-                <div class="input-group-append">
-                  <div class="input-group-text">
-                    <input type="checkbox" name="roundtrip" value="1">
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Location <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-map-marker-alt"></i></span>
-              </div>
-              <input type="text" class="form-control" name="source" placeholder="Enter your starting location" required>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-arrow-right"></i></span>
-              </div>
-              <input type="text" class="form-control" name="destination" placeholder="Enter your destination" required>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Purpose <strong class="text-danger">*</strong></label>
-            <textarea rows="4" class="form-control" placeholder="Enter a purpose" name="purpose" required></textarea>
-          </div>
-
-          <div class="form-group">
-            <label>Driver</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>
-              <select class="form-control select2" name="user" required>
-                <option value="">- Driver -</option>
-                <?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"); 
-                while ($row = mysqli_fetch_array($sql)) {
-                  $user_id = $row['user_id'];
-                  $user_name = htmlentities($row['user_name']);
-                ?>
-                  <option <?php if ($session_user_id == $user_id) { echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-
-          <?php if (isset($_GET['client_id'])) { ?>
-          <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-          <?php }else{ ?>
-          
-          <div class="form-group">
-            <label>Client</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>
-              <select class="form-control select2" name="client" required>
-                <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"); 
-                while ($row = mysqli_fetch_array($sql)) {
-                  $client_id = $row['client_id'];
-                  $client_name = htmlentities($row['client_name']);
-                ?>
-                  <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-
-          <?php } ?>
-
-        </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_trip" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Create</button>
-        </div>
-      </form>
-    </div> <!-- Modal Content -->
-  </div> <!-- Modal Dialog -->
-</div> <!-- Modal -->
\ No newline at end of file
+            </form>
+        </div> <!-- Modal Content -->
+    </div> <!-- Modal Dialog -->
+</div> <!-- Modal -->
diff --git a/trip_copy_modal.php b/trip_copy_modal.php
index 63920499..0d040a9b 100644
--- a/trip_copy_modal.php
+++ b/trip_copy_modal.php
@@ -1,129 +1,125 @@
 <div class="modal" id="addTripCopyModal<?php echo $trip_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-route"></i> Copying Trip</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="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-route"></i> Copying Trip</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">
+                            <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">
+                            <label>Miles <strong class="text-danger">*</strong> / <span class="text-secondary">Roundtrip</span></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
+                                </div>
+                                <input type="number" step="0.1" min="0" class="form-control" name="miles" value="<?php echo $trip_miles; ?>" required>
+                                <div class="input-group-append">
+                                    <div class="input-group-text">
+                                        <input type="checkbox" name="roundtrip" value="1" <?php if ($round_trip == 1) { echo "checked"; } ?>>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group">
+                        <label>Location <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-map-marker-alt"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="source" value="<?php echo $trip_source; ?>" required>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-arrow-right"></i></span>
+                            </div>
+                            <input type="text" class="form-control" placeholder="Enter a purpose" name="destination" value="<?php echo $trip_destination; ?>" required>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Purpose <strong class="text-danger">*</strong></label>
+                        <textarea rows="4" class="form-control" name="purpose" required><?php echo $trip_purpose; ?></textarea>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Driver</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>
+                            <select class="form-control select2" name="user" required>
+                                <option value="">- Driver -</option>
+                                <?php
+
+                                // WIP Need to only show users within the session company
+                                $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']);
+                                    ?>
+                                    <option <?php if ($trip_user_id == $user_id_select) { echo "selected"; } ?> value="<?php echo $user_id_select; ?>"><?php echo $user_name_select; ?></option>
+
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <?php if (isset($_GET['client_id'])) { ?>
+                        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+                    <?php } else { ?>
+
+                        <div class="form-group">
+                            <label>Client</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>
+                                <select class="form-control select2" name="client">
+                                    <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");
+                                    while ($row = mysqli_fetch_array($sql_clients)) {
+                                        $client_id_select = $row['client_id'];
+                                        $client_name_select = htmlentities($row['client_name']);
+                                        ?>
+                                        <option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
+
+                                    <?php } ?>
+                                </select>
+                            </div>
+                        </div>
+
+                    <?php } ?>
 
-          <div class="form-row">
-            
-            <div class="form-group col">
-              <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">
-              <label>Miles <strong class="text-danger">*</strong> / <span class="text-secondary">Roundtrip</span></label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></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_trip" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Copy</button>
                 </div>
-                <input type="number" step="0.1" min="0" class="form-control" name="miles" value="<?php echo $trip_miles; ?>" required>
-                <div class="input-group-append">
-                  <div class="input-group-text">
-                    <input type="checkbox" name="roundtrip" value="1" <?php if ($round_trip == 1) { echo "checked"; } ?>>
-                  </div>
-                </div>
-              </div>
-            </div>
-          
-          </div>
-
-          <div class="form-group">
-            <label>Location <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-map-marker-alt"></i></span>
-              </div>
-              <input type="text" class="form-control" name="source" value="<?php echo $trip_source; ?>" required>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-arrow-right"></i></span>
-              </div>
-              <input type="text" class="form-control" placeholder="Enter a purpose" name="destination" value="<?php echo $trip_destination; ?>" required>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Purpose <strong class="text-danger">*</strong></label>
-            <textarea rows="4" class="form-control" name="purpose" required><?php echo $trip_purpose; ?></textarea>
-          </div>
-
-          <div class="form-group">
-            <label>Driver</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>
-              <select class="form-control select2" name="user" required>
-                <option value="">- Driver -</option>
-                <?php 
-                
-                // WIP Need to only show users within the session company
-                $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']);
-                ?>
-                  <option <?php if ($trip_user_id == $user_id_select) { echo "selected"; } ?> value="<?php echo $user_id_select; ?>"><?php echo $user_name_select; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-
-          <?php if (isset($_GET['client_id'])) { ?>
-          <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-          <?php }else{ ?>
-
-          <div class="form-group">
-            <label>Client</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>
-              <select class="form-control select2" name="client">
-                <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");
-                while ($row = mysqli_fetch_array($sql_clients)) {
-                  $client_id_select = $row['client_id'];
-                  $client_name_select = htmlentities($row['client_name']);
-                ?>
-                  <option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-
-          <?php } ?>
-
+            </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_trip" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Copy</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/trip_edit_modal.php b/trip_edit_modal.php
index 5a6dcd3d..9a77a5b2 100644
--- a/trip_edit_modal.php
+++ b/trip_edit_modal.php
@@ -1,131 +1,130 @@
 <div class="modal" id="editTripModal<?php echo $trip_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-route"></i> Edit Trip</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">
-          <input type="hidden" name="trip_id" value="<?php echo $trip_id; ?>">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-route"></i> Edit Trip</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">
+                    <input type="hidden" name="trip_id" value="<?php echo $trip_id; ?>">
+
+                    <div class="form-row">
+
+                        <div class="form-group col">
+                            <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 $trip_date; ?>" required>
+                            </div>
+                        </div>
+
+                        <div class="form-group col">
+                            <label>Miles <strong class="text-danger">*</strong> / <span class="text-secondary">Roundtrip</span></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
+                                </div>
+                                <input type="number" step="0.1" min="0" class="form-control" name="miles" value="<?php echo $trip_miles; ?>" required>
+                                <div class="input-group-append">
+                                    <div class="input-group-text">
+                                        <input type="checkbox" name="roundtrip" value="1" <?php if ($round_trip == 1) { echo "checked"; } ?>>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div class="form-group">
+                        <label>Location <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-map-marker-alt"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="source" value="<?php echo $trip_source; ?>" required>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-arrow-right"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="destination" value="<?php echo $trip_destination; ?>" required>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Purpose <strong class="text-danger">*</strong></label>
+                        <textarea rows="4" class="form-control" placeholder="Enter a purpose" name="purpose" required><?php echo $trip_purpose; ?></textarea>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Driver</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>
+                            <select class="form-control select2" name="user" required>
+                                <option value="">- Driver -</option>
+                                <?php
+
+                                // WIP Need to only show users within the session company
+                                $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']);
+                                    ?>
+                                    <option <?php if ($trip_user_id == $user_id_select) { echo "selected"; } ?> value="<?php echo $user_id_select; ?>"><?php echo $user_name_select; ?></option>
+
+                                <?php } ?>
+
+                            </select>
+                        </div>
+                    </div>
+
+                    <?php if (isset($_GET['client_id'])) { ?>
+                        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+                    <?php } else { ?>
+
+                        <div class="form-group">
+                            <label>Client</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>
+                                <select class="form-control select2" name="client">
+                                    <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");
+                                    while ($row = mysqli_fetch_array($sql_clients)) {
+                                        $client_id_select = $row['client_id'];
+                                        $client_name_select = htmlentities($row['client_name']);
+                                        ?>
+                                        <option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
+
+                                        <?php
+                                    }
+                                    ?>
+                                </select>
+                            </div>
+                        </div>
+
+                    <?php } ?>
 
-          <div class="form-row">
-            
-            <div class="form-group col">
-              <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 $trip_date; ?>" required>
-              </div>
-            </div>
-            
-            <div class="form-group col">
-              <label>Miles <strong class="text-danger">*</strong> / <span class="text-secondary">Roundtrip</span></label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></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_trip" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Save</button>
                 </div>
-                <input type="number" step="0.1" min="0" class="form-control" name="miles" value="<?php echo $trip_miles; ?>" required>
-                <div class="input-group-append">
-                  <div class="input-group-text">
-                    <input type="checkbox" name="roundtrip" value="1" <?php if ($round_trip == 1) { echo "checked"; } ?>>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-          </div>
-      
-          <div class="form-group">
-            <label>Location <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-map-marker-alt"></i></span>
-              </div>
-              <input type="text" class="form-control" name="source" value="<?php echo $trip_source; ?>" required>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-arrow-right"></i></span>
-              </div>
-              <input type="text" class="form-control" name="destination" value="<?php echo $trip_destination; ?>" required>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Purpose <strong class="text-danger">*</strong></label>
-            <textarea rows="4" class="form-control" placeholder="Enter a purpose" name="purpose" required><?php echo $trip_purpose; ?></textarea>
-          </div>
-
-          <div class="form-group">
-            <label>Driver</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>
-              <select class="form-control select2" name="user" required>
-                <option value="">- Driver -</option>
-                <?php 
-                
-                // WIP Need to only show users within the session company
-                $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']);
-                ?>
-                  <option <?php if ($trip_user_id == $user_id_select) { echo "selected"; } ?> value="<?php echo $user_id_select; ?>"><?php echo $user_name_select; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-
-          <?php if (isset($_GET['client_id'])) { ?>
-          <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-          <?php }else{ ?>
-
-          <div class="form-group">
-            <label>Client</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>
-              <select class="form-control select2" name="client">
-                <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");
-                while ($row = mysqli_fetch_array($sql_clients)) {
-                  $client_id_select = $row['client_id'];
-                  $client_name_select = htmlentities($row['client_name']);
-                ?>
-                  <option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-
-          <?php } ?>
-
+            </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_trip" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Save</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/trip_export_modal.php b/trip_export_modal.php
index bf6020fc..d4501280 100644
--- a/trip_export_modal.php
+++ b/trip_export_modal.php
@@ -1,41 +1,41 @@
 <div class="modal" id="exportTripsModal" 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-download"></i> Export Trips to CSV</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>Date From</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_from" max="2999-12-31" value="<?php echo $dtf; ?>">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-download"></i> Export Trips to CSV</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
-   
-          <div class="form-group">
-            <label>Date To</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_to" max="2999-12-31" value="<?php echo $dtt; ?>">
-            </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="export_trips_csv" class="btn btn-primary text-bold"><i class="fa fa-fw fa-download"></i> Download CSV</button>
-				</div>
-			</form>
-		</div>
-	</div>
-</div>
\ No newline at end of file
+            <form action="post.php" method="post" autocomplete="off">
+                <div class="modal-body bg-white">
+
+                    <div class="form-group">
+                        <label>Date From</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_from" max="2999-12-31" value="<?php echo $dtf; ?>">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Date To</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_to" max="2999-12-31" value="<?php echo $dtt; ?>">
+                        </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="export_trips_csv" class="btn btn-primary text-bold"><i class="fa fa-fw fa-download"></i> Download CSV</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/trips.php b/trips.php
index 3f65841c..b6906163 100644
--- a/trips.php
+++ b/trips.php
@@ -1,224 +1,223 @@
 <?php include("inc_all.php");
 
-  if (!empty($_GET['sb'])) {
+if (!empty($_GET['sb'])) {
     $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
-  }else{
+} else {
     $sb = "trip_date";
-  }
+}
 
-  // Reverse default sort
-  if (!isset($_GET['o'])) {
+// Reverse default sort
+if (!isset($_GET['o'])) {
     $o = "DESC";
     $disp = "ASC";
-  }
+}
 
-  if (empty($_GET['canned_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';
-  }
+}
 
-  //Date Filter
-  if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
+//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") {
+} elseif ($_GET['canned_date'] == "today") {
     $dtf = date('Y-m-d');
     $dtt = date('Y-m-d');
-  }elseif ($_GET['canned_date'] == "yesterday") {
+} elseif ($_GET['canned_date'] == "yesterday") {
     $dtf = date('Y-m-d',strtotime("yesterday"));
     $dtt = date('Y-m-d',strtotime("yesterday"));
-  }elseif ($_GET['canned_date'] == "thisweek") {
+} elseif ($_GET['canned_date'] == "thisweek") {
     $dtf = date('Y-m-d',strtotime("monday this week"));
     $dtt = date('Y-m-d');
-  }elseif ($_GET['canned_date'] == "lastweek") {
+} 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") {
+} elseif ($_GET['canned_date'] == "thismonth") {
     $dtf = date('Y-m-01');
     $dtt = date('Y-m-d');
-  }elseif ($_GET['canned_date'] == "lastmonth") {
+} 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") {
+} elseif ($_GET['canned_date'] == "thisyear") {
     $dtf = date('Y-01-01');
     $dtt = date('Y-m-d');
-  }elseif ($_GET['canned_date'] == "lastyear") {
+} 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{
+    $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 * FROM trips 
+//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 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%')
     AND DATE(trip_date) BETWEEN '$dtf' AND '$dtt'
     AND trips.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()"));
-  $total_found_rows = $num_rows[0];
-  $total_pages = ceil($total_found_rows / 10);
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$total_found_rows = $num_rows[0];
+$total_pages = ceil($total_found_rows / 10);
 
 ?>
 
-<div class="card card-dark">
-  <div class="card-header py-2">
-    <h3 class="card-title mt-2"><i class="fa fa-fw fa-route"></i> Trips</h3>
-    <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTripModal"><i class="fas fa-fw fa-plus"></i> New Trip</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 Trips">
-            <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-route"></i> Trips</h3>
+            <div class="card-tools">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTripModal"><i class="fas fa-fw fa-plus"></i> New Trip</button>
             </div>
-          </div>
         </div>
-        <div class="col-sm-8">
-          <div class="float-right">
-            <button type="button" class="btn btn-default btn-lg" data-toggle="modal" data-target="#exportTripsModal"><i class="fa fa-fw fa-download"></i> Export</button>
-          </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=trip_date&o=<?php echo $disp; ?>">Date</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><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=user_name&o=<?php echo $disp; ?>">Driver</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_purpose&o=<?php echo $disp; ?>">Purpose</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_source&o=<?php echo $disp; ?>">Source</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_destination&o=<?php echo $disp; ?>">Destination</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_miles&o=<?php echo $disp; ?>">Miles</a></th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $trip_id = $row['trip_id'];
-            $trip_date = $row['trip_date'];
-            $trip_purpose = htmlentities($row['trip_purpose']);
-            $trip_source = htmlentities($row['trip_source']);
-            $trip_destination = htmlentities($row['trip_destination']);
-            $trip_miles = htmlentities($row['trip_miles']);
-            $trip_user_id = $row['trip_user_id'];
-            $round_trip = htmlentities($row['round_trip']);
-            $client_id = $row['client_id'];
-            $client_name = htmlentities($row['client_name']);
-            if (empty($client_name)) {
-              $client_name_display = "-";
-            }else{
-              $client_name_display = "<a href='client_trips.php?client_id=$client_id'>$client_name</a>";
-            }
-            if ($round_trip == 1) {
-              $round_trip_display = "<i class='fa fa-fw fa-sync-alt text-secondary'></i>";
-            }else{
-              $round_trip_display = "";
-            }
-            $user_name = htmlentities($row['user_name']);
-            if (empty($user_name)) {
-              $user_name_display = "-";
-            }else{
-              $user_name_display = $user_name;
-            }
 
-          ?>
-          <tr>
-            <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editTripModal<?php echo $trip_id; ?>"><?php echo $trip_date; ?></a></td>
-            <td><?php echo $client_name_display; ?></td>
-            <td><?php echo $user_name_display; ?></td>
-            <td><?php echo $trip_purpose; ?></td>
-            <td><?php echo $trip_source; ?></td>
-            <td><?php echo $trip_destination; ?></td>
-            <td><?php echo "$trip_miles $round_trip_display"; ?></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="//maps.google.com?q=<?php echo $trip_source; ?> to <?php echo $trip_destination; ?>" target="_blank">Map it</a>
-                  <div class="dropdown-divider"></div>
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTripModal<?php echo $trip_id; ?>">Edit</a>
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addTripCopyModal<?php echo $trip_id; ?>">Copy</a>
-                  <div class="dropdown-divider"></div>
-                  <a class="dropdown-item text-danger" href="post.php?delete_trip=<?php echo $trip_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 Trips">
+                            <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 class="col-sm-8">
+                        <div class="float-right">
+                            <button type="button" class="btn btn-default btn-lg" data-toggle="modal" data-target="#exportTripsModal"><i class="fa fa-fw fa-download"></i> Export</button>
+                        </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=trip_date&o=<?php echo $disp; ?>">Date</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><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=user_name&o=<?php echo $disp; ?>">Driver</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_purpose&o=<?php echo $disp; ?>">Purpose</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_source&o=<?php echo $disp; ?>">Source</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_destination&o=<?php echo $disp; ?>">Destination</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_miles&o=<?php echo $disp; ?>">Miles</a></th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
 
-          <?php
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $trip_id = $row['trip_id'];
+                        $trip_date = $row['trip_date'];
+                        $trip_purpose = htmlentities($row['trip_purpose']);
+                        $trip_source = htmlentities($row['trip_source']);
+                        $trip_destination = htmlentities($row['trip_destination']);
+                        $trip_miles = htmlentities($row['trip_miles']);
+                        $trip_user_id = $row['trip_user_id'];
+                        $round_trip = htmlentities($row['round_trip']);
+                        $client_id = $row['client_id'];
+                        $client_name = htmlentities($row['client_name']);
+                        if (empty($client_name)) {
+                            $client_name_display = "-";
+                        } else {
+                            $client_name_display = "<a href='client_trips.php?client_id=$client_id'>$client_name</a>";
+                        }
+                        if ($round_trip == 1) {
+                            $round_trip_display = "<i class='fa fa-fw fa-sync-alt text-secondary'></i>";
+                        } else {
+                            $round_trip_display = "";
+                        }
+                        $user_name = htmlentities($row['user_name']);
+                        if (empty($user_name)) {
+                            $user_name_display = "-";
+                        } else {
+                            $user_name_display = $user_name;
+                        }
 
-          include("trip_copy_modal.php");
-          include("trip_edit_modal.php");
-          include("trip_export_modal.php");
-          
-          }
-          
-          ?>
+                        ?>
+                        <tr>
+                            <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editTripModal<?php echo $trip_id; ?>"><?php echo $trip_date; ?></a></td>
+                            <td><?php echo $client_name_display; ?></td>
+                            <td><?php echo $user_name_display; ?></td>
+                            <td><?php echo $trip_purpose; ?></td>
+                            <td><?php echo $trip_source; ?></td>
+                            <td><?php echo $trip_destination; ?></td>
+                            <td><?php echo "$trip_miles $round_trip_display"; ?></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="//maps.google.com?q=<?php echo $trip_source; ?> to <?php echo $trip_destination; ?>" target="_blank">Map it</a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTripModal<?php echo $trip_id; ?>">Edit</a>
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addTripCopyModal<?php echo $trip_id; ?>">Copy</a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger" href="post.php?delete_trip=<?php echo $trip_id; ?>">Delete</a>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
 
-        </tbody>
-      </table>
+                        <?php
+
+                        require("trip_copy_modal.php");
+                        require("trip_edit_modal.php");
+                        require("trip_export_modal.php");
+
+                    }
+                    ?>
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once("pagination.php"); ?>
+        </div>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
-</div>
 
-<?php include("trip_add_modal.php"); ?>
-
-<?php include("footer.php");
\ No newline at end of file
+<?php
+require_once("trip_add_modal.php");
+require_once("footer.php");
diff --git a/user_profile.php b/user_profile.php
index b1429b55..01fa2805 100644
--- a/user_profile.php
+++ b/user_profile.php
@@ -1,4 +1,5 @@
-<?php include("inc_all.php");
+<?php
+require_once("inc_all.php");
 
 $sql_recent_logins = mysqli_query($mysqli, "SELECT * FROM logs
     WHERE log_type = 'Login' OR log_type = 'Login 2FA' AND log_action = 'Success' AND log_user_id = $session_user_id
@@ -167,9 +168,7 @@ $sql_recent_logs = mysqli_query($mysqli, "SELECT * FROM logs
                         <td><?php echo "<strong>$log_user_os</strong><br>$log_user_browser<br><i class='fa fa-fw fa-globe text-secondary'></i> $log_ip"; ?></td>
 
                     </tr>
-                    <?php
-                }
-                ?>
+                <?php } ?>
                 </tbody>
             </table>
             <div class="card-footer">
@@ -229,4 +228,5 @@ $sql_recent_logs = mysqli_query($mysqli, "SELECT * FROM logs
 
 </div>
 
-<?php include("footer.php"); ?>
+<?php
+require_once("footer.php");
diff --git a/vendor_add_from_template_modal.php b/vendor_add_from_template_modal.php
index 73f0ff34..e611cb49 100644
--- a/vendor_add_from_template_modal.php
+++ b/vendor_add_from_template_modal.php
@@ -1,51 +1,49 @@
 <div class="modal" id="addVendorFromTemplateModal" 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> New Vendor from Template</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="client_id" value="<?php if (isset($_GET['client_id'])) { echo $client_id; }else{ echo 0; } ?>">
-        
-        <div class="modal-body bg-white">
-
-          <label>Template</label>
-          <div class="form-group">
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-puzzle-piece"></i></span>
-              </div>
-              <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");
-                while ($row = mysqli_fetch_array($sql_vendor_templates)) {
-                  $vendor_template_id = $row['vendor_id'];
-                  $vendor_template_name = htmlentities($row['vendor_name']);
-
-                ?>
-                <option value="<?php echo $vendor_template_id ?>"><?php echo $vendor_template_name; ?></option>
-                <?php
-                } 
-                ?>
-                
-              </select>
+    <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> New Vendor from Template</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
-        
-        </div>
-        
-        <div class="modal-footer bg-white">
+            <form action="post.php" method="post" autocomplete="off">
 
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_vendor_from_template" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create Vendor</button>
+                <input type="hidden" name="client_id" value="<?php if (isset($_GET['client_id'])) { echo $client_id; } else { echo 0; } ?>">
 
+                <div class="modal-body bg-white">
+
+                    <label>Template</label>
+                    <div class="form-group">
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-puzzle-piece"></i></span>
+                            </div>
+                            <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");
+                                while ($row = mysqli_fetch_array($sql_vendor_templates)) {
+                                    $vendor_template_id = $row['vendor_id'];
+                                    $vendor_template_name = htmlentities($row['vendor_name']);
+
+                                    ?>
+                                    <option value="<?php echo $vendor_template_id ?>"><?php echo $vendor_template_name; ?></option>
+                                <?php } ?>
+
+                            </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="add_vendor_from_template" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create Vendor</button>
+
+                </div>
+            </form>
         </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/vendor_template_add_modal.php b/vendor_template_add_modal.php
index 961bed4d..174d5574 100644
--- a/vendor_template_add_modal.php
+++ b/vendor_template_add_modal.php
@@ -1,165 +1,165 @@
 <div class="modal" id="addVendorTemplateModal" 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> New Vendor Template</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="client_id" value="<?php if (isset($_GET['client_id'])) { echo $client_id; } else { echo 0; } ?>">
-
-        <div class="modal-body bg-white">
-
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-support">Support</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
-            </li>
-          </ul>
-
-          <hr>
-
-          <div class="tab-content">
-
-            <div class="tab-pane fade show active" id="pills-details">
-
-              <div class="form-group">
-                <label>Vendor 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-building"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="name" placeholder="Vendor Name" required autofocus>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Description</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="description" placeholder="Description">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Account Number</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-fingerprint"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="account_number" placeholder="Account number">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Account Manager</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="contact_name" placeholder="Account manager's name">
-                </div>
-              </div>
-
+    <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> New Vendor Template</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="tab-pane fade" id="pills-support">
+                <input type="hidden" name="client_id" value="<?php if (isset($_GET['client_id'])) { echo $client_id; } else { echo 0; } ?>">
+
+                <div class="modal-body bg-white">
+
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-support">Support</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
+                        </li>
+                    </ul>
+
+                    <hr>
+
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-details">
+
+                            <div class="form-group">
+                                <label>Vendor 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-building"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Vendor Name" required autofocus>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Description</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="description" placeholder="Description">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Account Number</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-fingerprint"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="account_number" placeholder="Account number">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Account Manager</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="contact_name" placeholder="Account manager's name">
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-support">
+
+                            <label>Support Phone</label>
+                            <div class="form-row">
+                                <div class="col-8">
+                                    <div class="form-group">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                            </div>
+                                            <input type="text" class="form-control" name="phone" placeholder="Phone Number">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-4">
+                                    <input type="text" class="form-control" name="extension" placeholder="Prompts">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Support Hours</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="text" class="form-control" name="hours" placeholder="Support Hours">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Support Email</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="Support Email">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Support Website URL</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="website" placeholder="Do not include http(s)://">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Pin/Code</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="code" placeholder="Access Code or Pin">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>SLA</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-handshake"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="sla" placeholder="SLA Response Time">
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-notes">
+
+                            <div class="form-group">
+                                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
+                            </div>
+
+                        </div>
 
-              <label>Support Phone</label>
-              <div class="form-row">
-                <div class="col-8">
-                  <div class="form-group">
-                    <div class="input-group">
-                      <div class="input-group-prepend">
-                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                      </div>
-                      <input type="text" class="form-control" name="phone" placeholder="Phone Number">
                     </div>
-                  </div>
+
                 </div>
-                <div class="col-4">
-                  <input type="text" class="form-control" name="extension" placeholder="Prompts">
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_vendor_template" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create Template</button>
                 </div>
-              </div>
-
-              <div class="form-group">
-                <label>Support Hours</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="text" class="form-control" name="hours" placeholder="Support Hours">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Support Email</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="Support Email">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Support Website URL</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="website" placeholder="Do not include http(s)://">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Pin/Code</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="code" placeholder="Access Code or Pin">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>SLA</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-handshake"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="sla" placeholder="SLA Response Time">
-                </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-notes">
-
-              <div class="form-group">
-                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
-              </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_vendor_template" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create Template</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/vendor_template_edit_modal.php b/vendor_template_edit_modal.php
index 27942ac4..6751a5e2 100644
--- a/vendor_template_edit_modal.php
+++ b/vendor_template_edit_modal.php
@@ -1,170 +1,170 @@
 <div class="modal" id="editVendorTemplateModal<?php echo $vendor_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> Editing vendor template: <strong><?php echo $vendor_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="vendor_id" value="<?php echo $vendor_id; ?>">
-        <div class="modal-body bg-white">
-
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $vendor_id; ?>">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-support<?php echo $vendor_id; ?>">Support</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $vendor_id; ?>">Notes</a>
-            </li>
-          </ul>
-
-          <hr>
-          
-          <div class="tab-content">
-
-            <div class="tab-pane fade show active" id="pills-details<?php echo $vendor_id; ?>">
-
-              <div class="form-group">
-                <label>Vendor 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-building"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="name" placeholder="Vendor Name" value="<?php echo "$vendor_name"; ?>" required>
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Description</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="description" placeholder="Description" value="<?php echo $vendor_description; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Account Number</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-fingerprint"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="account_number" placeholder="Account number" value="<?php echo $vendor_account_number; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Account Manager</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="contact_name" value="<?php echo $vendor_contact_name; ?>" placeholder="Vendor contact name">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <div class="custom-control custom-checkbox">
-                  <input type="checkbox" class="custom-control-input" id="updateVendorsCheckbox<?php echo $vendor_id; ?>" name="update_base_vendors" value="1" >
-                  <label class="custom-control-label" for="updateVendorsCheckbox<?php echo $vendor_id; ?>">Update All Base Vendors</label>
-                </div>
-              </div>
-
+    <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> Editing vendor template: <strong><?php echo $vendor_name; ?></strong></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-            
-            <div class="tab-pane fade" id="pills-support<?php echo $vendor_id; ?>">
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="vendor_id" value="<?php echo $vendor_id; ?>">
+                <div class="modal-body bg-white">
+
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $vendor_id; ?>">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-support<?php echo $vendor_id; ?>">Support</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $vendor_id; ?>">Notes</a>
+                        </li>
+                    </ul>
+
+                    <hr>
+
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-details<?php echo $vendor_id; ?>">
+
+                            <div class="form-group">
+                                <label>Vendor 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-building"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Vendor Name" value="<?php echo "$vendor_name"; ?>" required>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Description</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="description" placeholder="Description" value="<?php echo $vendor_description; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Account Number</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-fingerprint"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="account_number" placeholder="Account number" value="<?php echo $vendor_account_number; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Account Manager</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="contact_name" value="<?php echo $vendor_contact_name; ?>" placeholder="Vendor contact name">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <div class="custom-control custom-checkbox">
+                                    <input type="checkbox" class="custom-control-input" id="updateVendorsCheckbox<?php echo $vendor_id; ?>" name="update_base_vendors" value="1" >
+                                    <label class="custom-control-label" for="updateVendorsCheckbox<?php echo $vendor_id; ?>">Update All Base Vendors</label>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-support<?php echo $vendor_id; ?>">
+
+                            <label>Support Phone</label>
+                            <div class="form-row">
+                                <div class="col-8">
+                                    <div class="form-group">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                            </div>
+                                            <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $vendor_phone; ?>">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-4">
+                                    <input type="text" class="form-control" name="extension" placeholder="Prompts" value="<?php echo $vendor_extension; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Support Hours</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="text" class="form-control" name="hours" placeholder="Support Hours" value="<?php echo $vendor_hours; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Support Email</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="Support Email" value="<?php echo $vendor_email; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Support Website URL</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="website" placeholder="Do not include http(s)://" value="<?php echo $vendor_website; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>SLA</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-handshake"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="sla" placeholder="SLA Response Time" value="<?php echo $vendor_sla; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Pin/Code</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="code" placeholder="Access Code or Pin" value="<?php echo $vendor_code; ?>">
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-notes<?php echo $vendor_id; ?>">
+
+                            <div class="form-group">
+                                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $vendor_notes; ?></textarea>
+                            </div>
+
+                        </div>
 
-              <label>Support Phone</label>
-              <div class="form-row">
-                <div class="col-8">
-                  <div class="form-group">
-                    <div class="input-group">
-                      <div class="input-group-prepend">
-                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                      </div>
-                      <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $vendor_phone; ?>"> 
                     </div>
-                  </div>
-                </div>
-                <div class="col-4">
-                  <input type="text" class="form-control" name="extension" placeholder="Prompts" value="<?php echo $vendor_extension; ?>">
-                </div>
-              </div>
 
-              <div class="form-group">
-                <label>Support Hours</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="text" class="form-control" name="hours" placeholder="Support Hours" value="<?php echo $vendor_hours; ?>">
                 </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Support Email</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="Support Email" value="<?php echo $vendor_email; ?>">
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" class="btn btn-primary text-bold" name="edit_vendor_template"><i class="fa fa-fw fa-check"></i>Update Template</button>
                 </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Support Website URL</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="website" placeholder="Do not include http(s)://" value="<?php echo $vendor_website; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>SLA</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-handshake"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="sla" placeholder="SLA Response Time" value="<?php echo $vendor_sla; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Pin/Code</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="code" placeholder="Access Code or Pin" value="<?php echo $vendor_code; ?>">
-                </div>
-              </div>
-            
-            </div>
-
-            <div class="tab-pane fade" id="pills-notes<?php echo $vendor_id; ?>">
-              
-              <div class="form-group">
-                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $vendor_notes; ?></textarea>
-              </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" class="btn btn-primary text-bold" name="edit_vendor_template"><i class="fa fa-fw fa-check"></i>Update Template</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>