diff --git a/README.md b/README.md
index 5966d429..9a3414e4 100644
--- a/README.md
+++ b/README.md
@@ -60,3 +60,11 @@ CRM, Accounting and Invoicing System for small managed IT companies
 * mPDF
 * EasyMDE forked from SimpleMDE
 * parsedown
+
+### Future Todo
+* FreePBX "Asterisk" Integration (For CallerID and to track client calls within the app)
+* MeshCentral Integation to assign devices and easily access remote desktop within the app
+* HestiaCP Integration for intergrating domains and webclients
+* CalDAV to integrate with 3rd party calendars
+* CardDAV to integrate with 3rd party Address books
+* Unifi and UNMS integration
diff --git a/accounts.php b/accounts.php
index beb5b2c5..57be8799 100644
--- a/accounts.php
+++ b/accounts.php
@@ -5,7 +5,7 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-piggy-bank"></i> Accounts</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-piggy-bank mr-2"></i>Accounts</h6>
     <button type="button" class="btn btn-primary btn-sm mr-auto float-right" data-toggle="modal" data-target="#addAccountModal"><i class="fas fa-plus"></i></button>
   </div>
   <div class="card-body">
diff --git a/add_account_modal.php b/add_account_modal.php
index 88571702..71ff282e 100644
--- a/add_account_modal.php
+++ b/add_account_modal.php
@@ -1,19 +1,19 @@
 <div class="modal" id="addAccountModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-piggy-bank"></i> New Account</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-piggy-bank mr-2"></i>New Account</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" autocomplete="off">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-group">
             <label>Account Name</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-university"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-university"></i></span>
               </div>
               <input type="text" class="form-control" name="name" placeholder="Account name" required autofocus>
             </div>
@@ -22,13 +22,13 @@
             <label>Opening Balance</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-dollar-sign"></i></span>
+                <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>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_account" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_calendar_event_modal.php b/add_calendar_event_modal.php
index 10301749..42a7c520 100644
--- a/add_calendar_event_modal.php
+++ b/add_calendar_event_modal.php
@@ -1,26 +1,31 @@
 <div class="modal" id="addCalendarEventModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-calendar-plus"></i> New Event</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-calendar-plus mr-2"></i>New Event</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" autocomplete="off">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-group">
             <label>Title</label>
-            <input type="text" class="form-control" name="title" placeholder="Title of the event" required>
+            <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="title" placeholder="Title of the event" required autofocus>
+            </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-calendar"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
               </div>
               <select class="form-control" name="calendar" required>
-                <option value="">- Select Calendar -</option>
+                <option value="">- Calendar -</option>
                 <?php 
                 
                 $sql = mysqli_query($mysqli,"SELECT * FROM calendars"); 
@@ -41,7 +46,7 @@
               <label>Starts</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-clock"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
                 </div>
                 <input type="datetime-local" class="form-control" name="start" required>
               </div>
@@ -50,14 +55,14 @@
               <label>Ends</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-stopwatch"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-stopwatch"></i></span>
                 </div>
                 <input type="datetime-local" class="form-control" name="end" required>
               </div>
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_calendar_event" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_category_modal.php b/add_category_modal.php
index 35c21aaf..42e1fe46 100644
--- a/add_category_modal.php
+++ b/add_category_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addCategoryModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-plus"></i> New category</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-list mr-2"></i>New Category</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" autocomplete="off">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-group">
             <label>Name</label>
             <input type="text" class="form-control" name="name" required autofocus>
@@ -27,7 +27,7 @@
             <input type="color" class="form-control" name="color">
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_category" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_client_application_modal.php b/add_client_application_modal.php
index 195ae3e7..0bbc0afb 100644
--- a/add_client_application_modal.php
+++ b/add_client_application_modal.php
@@ -1,21 +1,21 @@
 <div class="modal" id="addClientApplicationModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-rocket"></i> New Application</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-rocket mr-2"></i>New Application</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" autocomplete="off">
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body">    
+        <div class="modal-body bg-white">    
           
           <div class="form-group">
             <label>Application Name</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-cube"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
               </div>
               <input type="text" class="form-control" name="name" placeholder="Application name" required autofocus>
             </div>
@@ -28,7 +28,7 @@
                 <span class="input-group-text"><i class="fa fa-tag"></i></span>
               </div>
               <select class="form-control" name="type" required>
-                <option value="">- Select a type -</option>
+                <option value="">- Type -</option>
                 <?php foreach($application_types_array as $application_type) { ?>
                 <option><?php echo $application_type; ?></option>
                 <?php } ?>
@@ -40,9 +40,9 @@
             <label>License</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-key"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
               </div>
-              <input type="text" class="form-control" name="license" required> 
+              <input type="text" class="form-control" name="license" placeholder="License key" required> 
             </div>
           </div>
 
@@ -52,24 +52,24 @@
               <label>Username</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-user"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                 </div>
-                <input type="text" class="form-control" name="username">
+                <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-lock"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                 </div>
-                <input type="text" class="form-control" name="password">
+                <input type="text" class="form-control" name="password" placeholder="Password">
               </div>
             </div>
           </div>
 
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_client_application" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_client_asset_modal.php b/add_client_asset_modal.php
index e60b2414..b57aa2d2 100644
--- a/add_client_asset_modal.php
+++ b/add_client_asset_modal.php
@@ -1,20 +1,20 @@
 <div class="modal" id="addClientAssetModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-tag"></i> New Asset</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-tag mr-2"></i>New Asset</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" autocomplete="off">
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-group">
             <label>Asset Name</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-tag"></i></span>
+                <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>
@@ -23,7 +23,7 @@
             <label>Asset Type</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-tags"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
               </div>
               <select class="form-control" name="type" required>
                 <option value="">- Type -</option>
@@ -37,7 +37,7 @@
             <label>Make</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-tag"></i></span>
+                <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" required>
             </div>
@@ -46,7 +46,7 @@
             <label>Model</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-tag"></i></span>
+                <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" required>
             </div>
@@ -55,7 +55,7 @@
             <label>Serial Number</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-barcode"></i></span>
+                <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" required>
             </div>
@@ -66,23 +66,23 @@
               <label>Username</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-user"></i></span>
+                  <span class="input-group-text"><i class="fa  fa-fw fa-user"></i></span>
                 </div>
-                <input type="text" class="form-control" name="username">
+                <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-lock"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                 </div>
-                <input type="text" class="form-control" name="password">
+                <input type="text" class="form-control" name="password" placeholder="Password">
               </div>
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_client_asset" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_client_contact_modal.php b/add_client_contact_modal.php
index 9db59079..7f6c0118 100644
--- a/add_client_contact_modal.php
+++ b/add_client_contact_modal.php
@@ -1,20 +1,20 @@
 <div class="modal" id="addClientContactModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-user-plus"></i> New Contact</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>New Contact</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" autocomplete="off">
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body">    
+        <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-user"></i></span>
+                <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>
@@ -24,7 +24,7 @@
             <label>Title</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-id-badge"></i></span>
+                <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" required>
             </div>
@@ -34,7 +34,7 @@
             <label>Phone</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-phone"></i></span>
+                <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" data-inputmask="'mask': '999-999-9999'" required> 
             </div>
@@ -44,13 +44,13 @@
             <label>Email</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-envelope"></i></span>
+                <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>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_client_contact" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_client_domain_modal.php b/add_client_domain_modal.php
index 135fa9e6..82979035 100644
--- a/add_client_domain_modal.php
+++ b/add_client_domain_modal.php
@@ -1,20 +1,20 @@
 <div class="modal" id="addClientDomainModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-globe"></i> New Domain</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-globe mr-2"></i>New Domain</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" autocomplete="off">
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body">    
+        <div class="modal-body bg-white">    
           <div class="form-group">
             <label>Domain Name</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-globe"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
               </div>
               <input type="text" class="form-control" name="name" placeholder="Domain name exmaple.com" required autofocus>
             </div>
@@ -24,7 +24,7 @@
             <label>Domain Registrar</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-server"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
               </div>
               <input type="text" class="form-control" name="registrar" placeholder="ex GoDaddy" required>
             </div>
@@ -34,7 +34,7 @@
             <label>Expire Date</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
               </div>
               <input type="date" class="form-control" name="expire" required> 
             </div>
@@ -44,13 +44,13 @@
             <label>Server</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-server"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
               </div>
               <input type="text" class="form-control" name="server" placeholder="ex ns1.pittpc.com" required>
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_client_domain" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_client_file_modal.php b/add_client_file_modal.php
index 482d1de7..2f697af7 100644
--- a/add_client_file_modal.php
+++ b/add_client_file_modal.php
@@ -1,49 +1,26 @@
 <div class="modal" id="addClientFileModal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-cloud-upload-alt"></i> Upload File</h5>
-        <button type="button" class="close" data-dismiss="modal">
+  <div class="modal-dialog modal-sm">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-cloud-upload-alt mr-2"></i>Upload File</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">
         <input type="hidden" name="client_id" value="<?php echo $_GET['client_id']; ?>">
-        <div class="modal-body">    
+        <div class="modal-body bg-white">    
           
           <div class="form-group">
-            <label>New Name</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-id-badge"></i></span>
-              </div>
-              <input type="text" class="form-control" name="new_name" placeholder="Leave blank to use the original filename">
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Type</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-file"></i></span>
-              </div>
-              <select class="form-control" name="file_type" required>
-                <option>Picture</option>
-                <option>Document</option>
-                <option>Backup</option>
-                <option>Other</option>
-              </select>
-            </div>
+            <input type="text" class="form-control" name="new_name" placeholder="New File Name">
           </div>
 
           <div class="form-group">
-            <label>File</label>
             <input type="file" class="form-control-file" name="file">
           </div>
         </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_client_file" class="btn btn-primary">Save</button>
+        <div class="modal-footer bg-white">
+          <button type="submit" name="add_client_file" class="btn btn-primary">Upload</button>
         </div>
       </form>
     </div>
diff --git a/add_client_location_modal.php b/add_client_location_modal.php
index 9b86d812..583960f3 100644
--- a/add_client_location_modal.php
+++ b/add_client_location_modal.php
@@ -1,20 +1,20 @@
 <div class="modal" id="addClientLocationModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-map-marker"></i> New Location</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>New Location</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" autocomplete="off">
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-group">
             <label>Location Name</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-user"></i></span>
+                <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>
@@ -23,37 +23,40 @@
             <label>Address</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-map-marker"></i></span>
+                <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="Address" required>
             </div>
           </div>
          
           <div class="form-group">
+            <label>City</label>
             <input type="text" class="form-control" name="city" placeholder="City" required>
           </div>
           <div class="form-group">
+            <label>State</label>
             <select class="form-control" name="state" required>
-              <option value="">Select a state...</option>
+              <option value="">- State -</option>
               <?php foreach($states_array as $state_abbr => $state_name) { ?>
               <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
               <?php } ?>
             </select> 
           </div>
           <div class="form-group">
+            <label>Zip</label>
             <input type="text" class="form-control" name="zip" placeholder="Zip" required>
           </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-phone"></i></span>
+                <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" data-inputmask="'mask': '999-999-9999'" required> 
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_client_location" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_client_login_modal.php b/add_client_login_modal.php
index 93bc5613..33b1ba1a 100644
--- a/add_client_login_modal.php
+++ b/add_client_login_modal.php
@@ -1,49 +1,49 @@
 <div class="modal" id="addClientLoginModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-lock"></i> New Login</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-lock mr-2"></i>New Login</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" autocomplete="off">
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body">  
+        <div class="modal-body bg-white">  
           <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-info-circle"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-info-circle"></i></span>
               </div>
-              <input type="text" class="form-control" name="description" required autofocus>
+              <input type="text" class="form-control" name="description" placeholder="Description of the login" required autofocus>
             </div>
           </div>
           <div class="form-group">
             <label>Web Link</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-link"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
               </div>
-              <input type="text" class="form-control" name="web_link">
+              <input type="text" class="form-control" name="web_link" placeholder="Please include http://">
             </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-user"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
               </div>
-              <input type="text" class="form-control" name="username" required>
+              <input type="text" class="form-control" name="username" placeholder="Username" required>
             </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-lock"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
               </div>
-              <input type="text" class="form-control" name="password" required>
+              <input type="text" class="form-control" name="password" placeholder="Password" required>
             </div>
           </div>
           <center><a class="btn btn-link" data-toggle="collapse" href="#optionsCollapse" role="button" aria-expanded="false" aria-controls="optionsCollapse">Link Options</a></center>
@@ -65,7 +65,7 @@
                   <label>Vendor</label>
                   <div class="input-group">
                     <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-building"></i></span>
+                      <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>
@@ -90,7 +90,7 @@
                   <label>Asset</label>
                   <div class="input-group">
                     <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-tag"></i></span>
+                      <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>
@@ -115,7 +115,7 @@
                   <label>Application</label>
                   <div class="input-group">
                     <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-box"></i></span>
+                      <span class="input-group-text"><i class="fa fa-fw fa-box"></i></span>
                     </div>
                     <select class="form-control" name="application">
                       <option value="">- Application -</option>
@@ -138,7 +138,7 @@
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_client_login" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_client_modal.php b/add_client_modal.php
index a4b2031c..3cc93e4c 100644
--- a/add_client_modal.php
+++ b/add_client_modal.php
@@ -1,19 +1,19 @@
 <div class="modal" id="addClientModal" tabindex="-1">
   <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-user-plus"></i> New Client</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <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 aria-hidden="true">&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
-        <div class="modal-body">
+        <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-user"></i></span>
+                <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>
@@ -22,7 +22,7 @@
             <label>Address</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-map-marker"></i></span>
+                <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="Address">
             </div>
@@ -51,7 +51,7 @@
               <label>Phone</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-phone"></i></span>
+                  <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" data-inputmask="'mask': '999-999-9999'"> 
               </div>
@@ -60,7 +60,7 @@
               <label>Email</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-envelope"></i></span>
+                  <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>
@@ -71,7 +71,7 @@
               <label>Website</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-globe"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
                 </div>
                 <input type="text" class="form-control" name="website" placeholder="Web Address">
               </div>
@@ -80,7 +80,7 @@
               <label>Invoice Net Terms</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-clock"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
                 </div>
                 <select class="form-control" name="net_terms">
                   <option value="7">Default (7 Days)</option>
@@ -92,7 +92,7 @@
             </div>
           </div>    
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_client" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_client_network_modal.php b/add_client_network_modal.php
index 9528f1e6..8b8f5dbd 100644
--- a/add_client_network_modal.php
+++ b/add_client_network_modal.php
@@ -1,20 +1,20 @@
 <div class="modal" id="addClientNetworkModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-network-wired"></i> New Network</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-network-wired mr-2"></i>New Network</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" autocomplete="off">
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body">    
+        <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-network-wired"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
               </div>
               <input type="text" class="form-control" name="name" placeholder="Network name (VLAN, WAN, LAN2 etc)" required autofocus>
             </div>
@@ -24,7 +24,7 @@
             <label>Network</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-network-wired"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
               </div>
               <input type="text" class="form-control" name="network" placeholder="Network ex 192.168.1.0/24" required>
             </div>
@@ -34,7 +34,7 @@
             <label>Gateway</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-route"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-route"></i></span>
               </div>
               <input type="text" class="form-control" name="gateway" placeholder="ex 192.168.1.1" required> 
             </div>
@@ -44,13 +44,13 @@
             <label>DHCP Range</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-server"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
               </div>
               <input type="text" class="form-control" name="dhcp_range" placeholder="ex 192.168.1.11-199">
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_client_network" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_client_note_modal.php b/add_client_note_modal.php
index 30b3ea0d..e1bf0c44 100644
--- a/add_client_note_modal.php
+++ b/add_client_note_modal.php
@@ -1,15 +1,15 @@
 <div class="modal" id="addClientNoteModal" tabindex="-1">
   <div class="modal-dialog modal-xl">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-edit"></i> New Note</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-edit mr-2"></i>New Note</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" autocomplete="off">
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body">  
+        <div class="modal-body bg-white">  
           <div class="form-group">
             <label>Title</label>
             <input type="text" class="form-control" name="subject" required autofocus>
@@ -19,7 +19,7 @@
             <textarea rows="8" class="form-control" name="note" id="addClientNote"></textarea>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_client_note" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_client_vendor_modal.php b/add_client_vendor_modal.php
index 562ed8ae..4f990c83 100644
--- a/add_client_vendor_modal.php
+++ b/add_client_vendor_modal.php
@@ -1,20 +1,20 @@
 <div class="modal" id="addClientVendorModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-building"></i> New Vendor</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-building mr-2"></i>New Vendor</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" autocomplete="off">
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body">  
+        <div class="modal-body bg-white">  
           <div class="form-group">
             <label>Vendor Name</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-building"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
               </div>
               <input type="text" class="form-control" name="name" placeholder="Name of the vendor" required autofocus>
             </div>
@@ -23,7 +23,7 @@
             <label>Description</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-comment"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
               </div>
               <input type="text" class="form-control" name="description" placeholder="Description of the Vendor" required>
             </div>
@@ -32,7 +32,7 @@
             <label>Account Number</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-barcode"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
               </div>
               <input type="text" class="form-control" name="account_number" placeholder="Account number">
             </div>
@@ -44,24 +44,24 @@
               <label>Username</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-user"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                 </div>
-                <input type="text" class="form-control" name="username">
+                <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-lock"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                 </div>
-                <input type="text" class="form-control" name="password">
+                <input type="text" class="form-control" name="password" placeholder="Password">
               </div>
             </div>
           </div>
 
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_client_vendor" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_expense_copy_modal.php b/add_expense_copy_modal.php
index 1b1bfa41..f20a6951 100644
--- a/add_expense_copy_modal.php
+++ b/add_expense_copy_modal.php
@@ -1,20 +1,20 @@
 <div class="modal" id="addExpenseCopyModal<?php echo $expense_id; ?>" tabindex="-1">
   <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-copy"></i> Copy expense</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-copy mr-2"></i>Copy 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" autocomplete="off">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-row"> 
             <div class="form-group col-md">
               <label>Date</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
                 <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
               </div>
@@ -23,7 +23,7 @@
               <label>Amount</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-dollar-sign"></i></span>
+                  <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>
@@ -32,7 +32,7 @@
               <label>Account</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-university"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-university"></i></span>
                 </div>
                 <select class="form-control" name="account" required>
                   <?php 
@@ -67,7 +67,7 @@
               <label>Vendor</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-briefcase"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-briefcase"></i></span>
                 </div>
                 <select class="form-control" name="vendor" required>
                   <?php 
@@ -89,7 +89,7 @@
               <label>Category</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-file"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
                 </div>
                 <select class="form-control" name="category" required>
                   <?php 
@@ -112,12 +112,21 @@
             <label>Description</label>
             <textarea class="form-control" rows="4" name="description" required><?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 $expense_reference; ?>">
+            </div>
+          </div>
           <div class="form-group">
             <label>Receipt</label>
             <input type="file" class="form-control-file" name="file">
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_expense" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_expense_modal.php b/add_expense_modal.php
index 34644435..9ad1d2f4 100644
--- a/add_expense_modal.php
+++ b/add_expense_modal.php
@@ -1,20 +1,20 @@
 <div class="modal" id="addExpenseModal" tabindex="-1">
   <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-cart-plus"></i> New Expense</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-cart-plus mr-2"></i>New 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">
+        <div class="modal-body bg-white">
           <div class="form-row"> 
             <div class="form-group col-md">
               <label>Date</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
                 <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
               </div>
@@ -23,7 +23,7 @@
               <label>Amount</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-dollar-sign"></i></span>
+                  <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" autofocus="autofocus" required>
               </div>
@@ -32,9 +32,10 @@
               <label>Account</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-university"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-university"></i></span>
                 </div>
                 <select class="form-control" name="account" required>
+                  <option value="">- Account -</option>
                   <?php 
                   
                   $sql = mysqli_query($mysqli,"SELECT * FROM accounts"); 
@@ -68,10 +69,10 @@
               <label>Vendor</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-briefcase"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-briefcase"></i></span>
                 </div>
                 <select class="form-control" name="vendor" required>
-                  <option value="">- Select Vendor -</option>
+                  <option value="">- Vendor -</option>
                   <?php 
                   
                   $sql = mysqli_query($mysqli,"SELECT * FROM vendors"); 
@@ -91,10 +92,10 @@
               <label>Category</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-file"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
                 </div>
                 <select class="form-control" name="category" required>
-                  <option value="">- Select Category -</option>
+                  <option value="">- Category -</option>
                   <?php 
                   
                   $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense'"); 
@@ -117,14 +118,19 @@
           </div>
           <div class="form-group">
             <label>Reference</label>
-            <input type="text" class="form-control" name="reference">
+            <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 class="form-group">
             <label>Receipt</label>
             <input type="file" class="form-control-file" name="file">
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_expense" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_expense_refund_modal.php b/add_expense_refund_modal.php
index 6c409e1d..f40451f3 100644
--- a/add_expense_refund_modal.php
+++ b/add_expense_refund_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addExpenseRefundModal<?php echo $expense_id; ?>" tabindex="-1">
   <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-refresh"></i> New refund</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-recycle mr-2"></i>New Refund</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" autocomplete="off">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <input type="hidden" name="account" value="<?php echo $account_id; ?>">
           <input type="hidden" name="vendor" value="<?php echo $vendor_id; ?>">
           <input type="hidden" name="category" value="<?php echo $category_id; ?>">
@@ -17,7 +17,7 @@
               <label>Refund Date</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
                 <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
               </div>
@@ -26,7 +26,7 @@
               <label>Refund Amount</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-dollar-sign"></i></span>
+                  <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>
@@ -34,14 +34,23 @@
           </div>
           <div class="form-group">
             <label>Description</label>
-            <textarea class="form-control" rows="4" name="description" required>Refund on Expense ID: <?php echo $expense_id; ?> - <?php echo $expense_description; ?></textarea>
+            <textarea class="form-control" rows="4" name="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>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_expense" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_invoice_modal.php b/add_invoice_modal.php
index 2b56f7fd..3c1e0b6e 100644
--- a/add_invoice_modal.php
+++ b/add_invoice_modal.php
@@ -1,22 +1,22 @@
 <div class="modal" id="addInvoiceModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-file"></i> New Invoice</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-file mr-2"></i>New Invoice</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" autocomplete="off">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <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-user"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
               </div>
               <select class="form-control" id="selectIt" name="client" required <?php if(isset($_GET['client_id'])){ echo "disabled"; } ?>>
-                <option value="">- Select Customer -</option>
+                <option value="">- Client -</option>
                 <?php 
                 
                 $sql = mysqli_query($mysqli,"SELECT * FROM clients"); 
@@ -37,16 +37,16 @@
               <label>Invoice Date</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
-                <input type="text" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
+                <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
               </div>
             </div>
             <div class="form-group col">
               <label>Payment Due</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+                  <span class="input-group-text"><i class="fa fa-calendar-alt"></i></span>
                 </div>
                 <input type="date" class="form-control" name="due" required>
               </div>
@@ -57,7 +57,7 @@
             <label>Category</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-user"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
               </div>
               <select class="form-control" name="category" required>
                 <option value="">- Category -</option>
@@ -77,7 +77,7 @@
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_invoice" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_mileage_modal.php b/add_mileage_modal.php
index 04f3e686..3a508279 100644
--- a/add_mileage_modal.php
+++ b/add_mileage_modal.php
@@ -1,20 +1,20 @@
 <div class="modal" id="addMileageModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-car-side"></i> Add Mileage</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-bicycle mr-2"></i>New Trip</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" autocomplete="off">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-row">
             <div class="form-group col-7">
               <label>Date</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
                 <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
               </div>
@@ -23,28 +23,27 @@
               <label>Miles</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-car-side"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
                 </div>
-                <input type="number" class="form-control" name="miles" required autofocus="autofocus">
+                <input type="number" class="form-control" name="miles" placeholder="Enter miles" required autofocus="autofocus">
               </div>
             </div>
           </div>
           <div class="form-group">
-            <label>Starting Location</label>
+            <label>Location</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-map-marker"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
               </div>
-              <input type="text" class="form-control" name="starting_location" required>
+              <input type="text" class="form-control" name="starting_location" placeholder="Enter your starting location" required>
             </div>
           </div>
           <div class="form-group">
-            <label>Destination</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-arrow-right"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-arrow-right"></i></span>
               </div>
-              <input type="text" class="form-control" name="destination" required>
+              <input type="text" class="form-control" name="destination" placeholder="Enter your destination" required>
             </div>
           </div>
           <div class="form-group">
@@ -56,7 +55,7 @@
             <label class="custom-control-label" for="customControlAutosizing">Roundtrip</label>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_mileage" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_payment_modal.php b/add_payment_modal.php
index 8732f154..200eff7d 100644
--- a/add_payment_modal.php
+++ b/add_payment_modal.php
@@ -1,22 +1,22 @@
 <div class="modal" id="addPaymentModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-money-bill-alt"></i> New Payment</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-money-bill-alt mr-2"></i>Add Payment</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" autocomplete="off">
         <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
         <input type="hidden" name="balance" value="<?php echo $balance; ?>">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-row">
             <div class="form-group col">
               <label>Date</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
                 <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
               </div>
@@ -25,7 +25,7 @@
               <label>Amount</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-dollar-sign"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                 </div>
                 <input type="number" class="form-control" step="0.01" min="0.00" name="amount" value="<?php echo $balance; ?>" required>
               </div>
@@ -36,7 +36,7 @@
               <label>Account</label>
               <div class="input-group"> 
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-university"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-university"></i></span>
                 </div> 
                 <select class="form-control" name="account" required>
                   <option value="">- Account -</option>
@@ -71,10 +71,10 @@
               <label>Payment Method</label>
               <div class="input-group"> 
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-money-check-alt"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
                 </div> 
                 <select class="form-control" name="payment_method" required>
-                  <option value="">- Payment Method -</option>
+                  <option value="">- Method -</option>
                   <?php 
                   
                   $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method'"); 
@@ -92,14 +92,19 @@
           </div>
           <div class="form-group">
             <label>Reference</label>
-            <input type="text" class="form-control" name="reference">
+            <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 class="custom-control custom-checkbox">
             <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_receipt" value="1" >
             <label class="custom-control-label" for="customControlAutosizing">Email Reciept</label>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_payment" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_product_modal.php b/add_product_modal.php
index d4ae38d0..063f91ac 100644
--- a/add_product_modal.php
+++ b/add_product_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addProductModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-box"></i> New Product</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-box mr-2"></i>New Product</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" autocomplete="off">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-group">
             <label>Name</label>
             <input type="text" class="form-control" name="name" required autofocus>
@@ -22,7 +22,7 @@
             <input type="text" class="form-control" name="cost" required>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_product" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_quote_modal.php b/add_quote_modal.php
index be1faade..a61e6816 100644
--- a/add_quote_modal.php
+++ b/add_quote_modal.php
@@ -1,22 +1,22 @@
 <div class="modal" id="addQuoteModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-file"></i> New Quote</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-file mr-2"></i>New Quote</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" autocomplete="off">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <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-user"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
               </div>
               <select class="form-control" name="client" required <?php if(isset($_GET['client_id'])){ echo "disabled"; } ?>>
-                <option value="">- Select Customer -</option>
+                <option value="">- Client -</option>
                 <?php 
                 
                 $sql = mysqli_query($mysqli,"SELECT * FROM clients"); 
@@ -36,7 +36,7 @@
             <label>Date</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
               </div>
               <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
             </div>
@@ -45,7 +45,7 @@
             <label>Category</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-user"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
               </div>
               <select class="form-control" name="category" required>
                 <option value="">- Category -</option>
@@ -65,7 +65,7 @@
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_quote" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_recurring_invoice_modal.php b/add_recurring_invoice_modal.php
index 9520bbf0..d573a519 100644
--- a/add_recurring_invoice_modal.php
+++ b/add_recurring_invoice_modal.php
@@ -1,22 +1,22 @@
 <div class="modal" id="addRecurringInvoiceModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-copy"></i> New Recurring Invoice</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-copy mr-2"></i>New Recurring Invoice</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" autocomplete="off">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <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-user"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
               </div>
               <select class="form-control" name="client" required>
-                <option value="">- Customer -</option>
+                <option value="">- Client -</option>
                 <?php 
                 
                 $sql = mysqli_query($mysqli,"SELECT * FROM clients"); 
@@ -37,7 +37,7 @@
               <label>Start Date</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
                 <input type="date" class="form-control" name="start_date" value="<?php echo date("Y-m-d"); ?>" required>
               </div>
@@ -46,10 +46,10 @@
               <label>Frequency</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-clock"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
                 </div>
                 <select class="form-control" name="frequency" required>
-                  <option value="">- frequency -</option>
+                  <option value="">- Frequency -</option>
                   <option value="week">Weekly</option>
                   <option value="month">Monthly</option>
                   <option value="year">Yearly</option>
@@ -62,7 +62,7 @@
             <label>Income Category</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-user"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
               </div>
               <select class="form-control" name="category" required>
                 <option value="">- Category -</option>
@@ -82,7 +82,7 @@
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_recurring_invoice" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_transfer_modal.php b/add_transfer_modal.php
index 92818a3f..e801e37c 100644
--- a/add_transfer_modal.php
+++ b/add_transfer_modal.php
@@ -1,108 +1,106 @@
 <div class="modal" id="addTransferModal" tabindex="-1">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-exchange-alt"></i> New Transfer</h5>
-        <button type="button" class="close" data-dismiss="modal">
+  <div class="modal-dialog">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-exchange-alt mr-2"></i>Transfer Money</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" autocomplete="off">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-row">
-            <div class="form-group col-sm">
+            <div class="form-group col">
               <label>Date</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
                 <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
               </div>
             </div>
-            <div class="form-group col-sm">
+            <div class="form-group col">
               <label>Amount</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-hand-holding-usd"></i></span>
+                  <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-row">
-            <div class="form-group col-sm">
-              <label>Account From</label>
-              <div class="input-group"> 
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-university"></i></span>
-                </div> 
-                <select class="form-control" name="account_from" required>
-                  <option value="">- Transfer From -</option>
-                  <?php 
+       
+          <div class="form-group">
+            <label>Transfer</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" name="account_from" required>
+                <option value="">- Account From -</option>
+                <?php 
+                
+                $sql = mysqli_query($mysqli,"SELECT * FROM accounts"); 
+                while($row = mysqli_fetch_array($sql)){
+                  $account_id = $row['account_id'];
+                  $account_name = $row['account_name'];
+                  $opening_balance = $row['opening_balance'];
                   
-                  $sql = mysqli_query($mysqli,"SELECT * FROM accounts"); 
-                  while($row = mysqli_fetch_array($sql)){
-                    $account_id = $row['account_id'];
-                    $account_name = $row['account_name'];
-                    $opening_balance = $row['opening_balance'];
-                    
-                    $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE account_id = $account_id");
-                    $row = mysqli_fetch_array($sql_payments);
-                    $total_payments = $row['total_payments'];
-                    
-                    $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE account_id = $account_id");
-                    $row = mysqli_fetch_array($sql_expenses);
-                    $total_expenses = $row['total_expenses'];
+                  $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE account_id = $account_id");
+                  $row = mysqli_fetch_array($sql_payments);
+                  $total_payments = $row['total_payments'];
+                  
+                  $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE account_id = $account_id");
+                  $row = mysqli_fetch_array($sql_expenses);
+                  $total_expenses = $row['total_expenses'];
 
-                    $balance = $opening_balance + $total_payments - $total_expenses;
-                  
-                  ?>
-                    <option value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
-                  
-                  <?php
-                  }
-                  ?>
-                </select>
-              </div>
+                  $balance = $opening_balance + $total_payments - $total_expenses;
+                
+                ?>
+                  <option value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
+                
+                <?php
+                }
+                ?>
+              </select>
             </div>
-            <div class="form-group col-sm">
-               <label>Account To</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-arrow-right"></i></span>
-                </div>
-                <select class="form-control" name="account_to" required>
-                  <option value="">- Transfer To -</option>
-                  <?php 
-                  
-                  $sql = mysqli_query($mysqli,"SELECT * FROM accounts"); 
-                  while($row = mysqli_fetch_array($sql)){
-                    $account_id = $row['account_id'];
-                    $account_name = $row['account_name'];
-                    $opening_balance = $row['opening_balance'];
-                  
-                    $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE account_id = $account_id");
-                    $row = mysqli_fetch_array($sql_payments);
-                    $total_payments = $row['total_payments'];
-                    
-                    $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE account_id = $account_id");
-                    $row = mysqli_fetch_array($sql_expenses);
-                    $total_expenses = $row['total_expenses'];
-
-                    $balance = $opening_balance + $total_payments - $total_expenses;
-
-                  ?>
-                    <option value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
-                  
-                  <?php
-                  }
-                  ?>
-                </select>
+          </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" name="account_to" required>
+                <option value="">- Account To -</option>
+                <?php 
+                
+                $sql = mysqli_query($mysqli,"SELECT * FROM accounts"); 
+                while($row = mysqli_fetch_array($sql)){
+                  $account_id = $row['account_id'];
+                  $account_name = $row['account_name'];
+                  $opening_balance = $row['opening_balance'];
+                
+                  $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE account_id = $account_id");
+                  $row = mysqli_fetch_array($sql_payments);
+                  $total_payments = $row['total_payments'];
+                  
+                  $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE account_id = $account_id");
+                  $row = mysqli_fetch_array($sql_expenses);
+                  $total_expenses = $row['total_expenses'];
+
+                  $balance = $opening_balance + $total_payments - $total_expenses;
+
+                ?>
+                  <option value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
+                
+                <?php
+                }
+                ?>
+              </select>
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_transfer" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_user_modal.php b/add_user_modal.php
index d5f19ea0..78c86d21 100644
--- a/add_user_modal.php
+++ b/add_user_modal.php
@@ -1,19 +1,19 @@
 <div class="modal" id="addUserModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-user-plus"></i> New User</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>New User</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">    
+        <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-user"></i></span>
+                <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>
@@ -23,7 +23,7 @@
             <label>Email</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-envelope"></i></span>
+                <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>
@@ -33,7 +33,7 @@
             <label>Password</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-lock"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
               </div>
               <input type="password" class="form-control" name="password" placeholder="Enter a Password" required>
             </div>
@@ -43,7 +43,7 @@
             <input type="file" class="form-control-file" accept="image/*;capture=camera" name="avatar">
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_user" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_vendor_modal.php b/add_vendor_modal.php
index 68ae9e84..ebb919c2 100644
--- a/add_vendor_modal.php
+++ b/add_vendor_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addVendorModal" tabindex="-1">
   <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-building"></i> New vendor</h5>
-        <button type="button" class="close" data-dismiss="modal">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-building mr-2"></i>New Vendor</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" autocomplete="off">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-group">
             <label>Name</label>
             <input type="text" class="form-control" name="name" required autofocus>
@@ -59,7 +59,7 @@
             <input type="text" class="form-control" name="account_number">
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_vendor" class="btn btn-primary">Save</button>
         </div>
diff --git a/calendar_events.php b/calendar_events.php
index 7cf4ea60..f265477e 100644
--- a/calendar_events.php
+++ b/calendar_events.php
@@ -16,10 +16,11 @@ $sql = mysqli_query($mysqli,"SELECT * FROM calendars, calendar_events WHERE cale
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-calendar"></i> Events</h6>
+    <h5 class="float-left mt-2"><i class="fa fa-calendar mr-2"></i>Events</h5>
+    <button type="button" class="btn btn-primary badge-pill mr-auto float-right" data-toggle="modal" data-target="#addCalendarEventModal"><i class="fas fa-fw fa-calendar-plus"></i></button>
     <form>
       <select onchange="this.form.submit()" class="form-control mt-5" name="calendar_id">
-        <option value="">ALL</option>
+        <option value="">- ALL Calendars -</option>
         <?php 
                 
         while($row = mysqli_fetch_array($sql_calendars)){
@@ -34,8 +35,6 @@ $sql = mysqli_query($mysqli,"SELECT * FROM calendars, calendar_events WHERE cale
 
       </select>
     </form>
-
-    <button type="button" class="btn btn-primary btn-sm mr-auto float-right" data-toggle="modal" data-target="#addCalendarEventModal"><i class="fas fa-calendar-plus"></i></button>
   </div>
   <div class="card-body">
     <div class="table-responsive">
diff --git a/categories.php b/categories.php
index 3fb67ac8..3f1b8664 100644
--- a/categories.php
+++ b/categories.php
@@ -5,6 +5,7 @@
 
 <div class="card mb-3">
   <div class="card-header">
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-list mr-2"></i>Categories</h6>
     <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addCategoryModal"><i class="fas fa-plus"></i></button>
   </div>
   <div class="card-body">
diff --git a/client.php b/client.php
index e0c1f4a7..bd61a0f1 100644
--- a/client.php
+++ b/client.php
@@ -95,11 +95,11 @@ if(isset($_GET['client_id'])){
       </div>
       <div class="col border-right">
         <h4 class="text-secondary">Contact</h4>
-        <i class="fa fa-fw fa-envelope mx-1"></i> <a href="mailto:<?php echo $client_email; ?>"><?php echo $client_email; ?></a>
+        <i class="fa fa-fw fa-envelope text-secondary ml-1 mr-2"></i> <a href="mailto:<?php echo $client_email; ?>"><?php echo $client_email; ?></a>
         <br>
-        <i class="fa fa-fw fa-phone mx-1"></i> <?php echo $client_phone; ?>
+        <i class="fa fa-fw fa-phone text-secondary ml-1 mr-2"></i> <?php echo $client_phone; ?>
         <br>
-        <i class="fa fa-fw fa-globe mx-1"></i> <a target="_blank" href="//<?php echo $client_website; ?>"><?php echo $client_website; ?></a>
+        <i class="fa fa-fw fa-globe text-secondary ml-1 mr-2"></i> <a target="_blank" href="//<?php echo $client_website; ?>"><?php echo $client_website; ?></a>
       </div>
       <div class="col border-right">
         <h4 class="text-secondary">Standings</h4>
diff --git a/client_applications.php b/client_applications.php
index 07803a97..1a50ed43 100644
--- a/client_applications.php
+++ b/client_applications.php
@@ -2,7 +2,7 @@
 
 <div class="card">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-box"></i> Applications</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-rocket mr-2"></i>Applications</h6>
     <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addClientApplicationModal"><i class="fa fa-plus"></i></button>
   </div>
   <div class="card-body">
diff --git a/client_assets.php b/client_assets.php
index f50e34e3..7f6500dc 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -31,6 +31,34 @@
             $client_asset_model = $row['client_asset_model'];
             $client_asset_serial = $row['client_asset_serial'];
 
+            if($client_asset_type == 'Laptop'){
+              $device_icon = "laptop";
+            }elseif($client_asset_type == 'Desktop'){
+              $device_icon = "desktop";
+            }elseif($client_asset_type == 'Server'){
+              $device_icon = "server";
+            }elseif($client_asset_type == 'Printer'){
+              $device_icon = "print";
+            }elseif($client_asset_type == 'Camera'){
+              $device_icon = "video";
+            }elseif($file_ext == 'Switch' or $file_ext == 'Firewall/Router'){
+              $device_icon = "network";
+            }elseif($client_asset_type == 'Access Point'){
+              $device_icon = "wifi";
+            }elseif($client_asset_type == 'Phone'){
+              $device_icon = "phone";
+            }elseif($client_asset_type == 'Mobile Phone'){
+              $device_icon = "mobile-alt";
+            }elseif($client_asset_type == 'Tablet'){
+              $device_icon = "tablet-alt";
+            }elseif($client_asset_type == 'TV'){
+              $device_icon = "tv";
+            }elseif($client_asset_type == 'Virtual Machine'){
+              $device_icon = "cloud";
+            }else{
+              $device_icon = "tag";
+            }
+
             $sql2 = mysqli_query($mysqli,"SELECT * FROM client_logins WHERE client_asset_id = $client_asset_id");
             $row = mysqli_fetch_array($sql2);
             $client_login_id = $row['client_login_id'];
@@ -40,7 +68,7 @@
       
           ?>
           <tr>
-            <td><?php echo $client_asset_type; ?></td>
+            <td><i class="fa fa-fw text-secondary fa-<?php echo $device_icon; ?> mr-3"></i><?php echo $client_asset_type; ?></td>
             <td><?php echo $client_asset_name; ?></td>
             <td><?php echo $client_asset_make; ?></td>
             <td><?php echo $client_asset_model; ?></td>
@@ -53,14 +81,14 @@
 
               <div class="modal" id="viewPasswordModal<?php echo $client_login_id; ?>" tabindex="-1">
                 <div class="modal-dialog modal-sm">
-                  <div class="modal-content">
-                    <div class="modal-header">
-                      <h5 class="modal-title"><i class="fa fa-key"></i> Login</h5>
-                      <button type="button" class="close" data-dismiss="modal">
+                  <div class="modal-content bg-dark">
+                    <div class="modal-header text-white">
+                      <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i><?php echo $client_asset_name; ?> Login</h5>
+                      <button type="button" class="close text-white" data-dismiss="modal">
                         <span aria-hidden="true">&times;</span>
                       </button>
                     </div>
-                    <div class="modal-body">
+                    <div class="modal-body bg-white">
                       <div class="form-group">
                         <div class="input-group">
                           <div class="input-group-prepend">
diff --git a/client_files.php b/client_files.php
index deb6d776..a5edc217 100644
--- a/client_files.php
+++ b/client_files.php
@@ -1,42 +1,84 @@
-<?php $sql = mysqli_query($mysqli,"SELECT * FROM files WHERE client_id = $client_id ORDER BY file_id DESC"); ?>
+<?php $sql_files_images = mysqli_query($mysqli,"SELECT * FROM files WHERE client_id = $client_id AND (file_ext LIKE 'JPG' OR file_ext LIKE 'jpg' OR file_ext LIKE 'png' OR file_ext LIKE 'PNG') ORDER BY file_id DESC"); ?>
+
+<?php $sql_files_other = mysqli_query($mysqli,"SELECT * FROM files WHERE client_id = $client_id AND file_ext NOT LIKE 'JPG' AND file_ext NOT LIKE 'jpg' AND file_ext NOT LIKE 'png' AND file_ext NOT LIKE 'PNG' ORDER BY file_id DESC"); ?>
 
 <div class="card">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-paperclip"></i> Files</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-file"></i> Uploaded Files</h6>
     <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addClientFileModal"><i class="fa fa-cloud-upload-alt"></i></button>
   </div>
   <div class="card-body">
 
-    <div class="row">
-
-      <?php
+    <div class="row mb-5">
       
-      while($row = mysqli_fetch_array($sql)){
-        $file_id = $row['file_id'];
-        $file_name = $row['file_name'];
-      
-        ?>
-        <div class="col-xl-3 col-lg-3 col-md-6 col-sm-6 mb-3">    
-          <div class="card">
-            <a href="#" data-toggle="modal" data-target="#viewClientFileModal<?php echo $file_id; ?>">
-              <img class="img-fluid" src="<?php echo $file_name; ?>">
-            </a>
-            <div class="card-footer p-1">
-              <center>
-                <a href="<?php echo $file_name; ?>" download="<?php echo $file_name; ?>" class="text-secondary float-left ml-1"><i class="fa fa-cloud-download-alt"></i></a>
-                <small class="text-secondary"><?php echo basename($file_name); ?></small>
+        <?php
+        
+        while($row = mysqli_fetch_array($sql_files_images)){
+          $file_id = $row['file_id'];
+          $file_name = $row['file_name'];
+          $file_ext = $row['file_ext'];
+        
+          ?>
 
-                <a href="post.php?delete_file=<?php echo $file_id; ?>" class="text-secondary float-right mr-1"><i class="fa fa-times"></i></a>
-              </center>
-            </div>
-          </div>   
-        </div>
-       
-        <?php 
-        include("view_client_file_modal.php");
-         } 
-        ?>
+          <div class="col-xl-3 col-lg-3 col-md-6 col-sm-6 mb-3">    
+            <div class="card">
+              <a href="#" data-toggle="modal" data-target="#viewClientFileModal<?php echo $file_id; ?>">  
+                <img class="img-fluid" src="<?php echo $file_name; ?>">       
+              </a>
+              <div class="card-footer p-1">
+                <center>
+                  <a href="<?php echo $file_name; ?>" download="<?php echo $file_name; ?>" class="text-secondary float-left ml-1"><i class="fa fa-cloud-download-alt"></i></a>
+                  <small class="text-secondary"><?php echo basename($file_name); ?></small>
 
+                  <a href="post.php?delete_file=<?php echo $file_id; ?>" class="text-secondary float-right mr-1"><i class="fa fa-times"></i></a>
+                </center>
+              </div>
+            </div>   
+          </div>
+         
+          <?php 
+          include("view_client_file_modal.php");
+           } 
+          ?>
+      </div>
+
+      <div class="row">
+        
+        <table class="table">
+     
+        <?php
+        while($row = mysqli_fetch_array($sql_files_other)){
+          $file_id = $row['file_id'];
+          $file_name = $row['file_name'];
+          $file_ext = $row['file_ext'];
+          if($file_ext == 'pdf'){
+            $file_icon = "file-pdf";
+          }elseif($file_ext == 'gz' or $file_ext == 'tar' or $file_ext == 'zip' or $file_ext == '7z' or $file_ext == 'rar'){
+            $file_icon = "file-archive";
+          }elseif($file_ext == 'txt'){
+            $file_icon = "file-alt";
+          }elseif($file_ext == 'doc' or $file_ext == 'docx'){
+            $file_icon = "file-word";
+          }elseif($file_ext == 'xls' or $file_ext == 'xlsx' or $file_ext == 'ods'){
+            $file_icon = "file-excel";
+          }elseif($file_ext == 'mp3' or $file_ext == 'wav' or $file_ext == 'ogg'){
+            $file_icon = "file-audio";
+          }else{
+            $file_icon = "file";
+          }
+          ?>
+
+          <tr>
+            <td><a href="<?php echo $file_name; ?>" class="text-secondary"><i class="fa fa-fw fa-2x fa-<?php echo $file_icon; ?> mr-3"></i> <?php echo basename($file_name); ?></a></td>
+            <td>
+              <a href="<?php echo $file_name; ?>" download="<?php echo $file_name; ?>" class="text-secondary float-left ml-1"><i class="fa fa-cloud-download-alt"></i></a>
+              <a href="post.php?delete_file=<?php echo $file_id; ?>" class="text-secondary float-right mr-1"><i class="fa fa-times"></i></a>
+            </td>
+          </tr>
+        <?php
+        }
+        ?>
+   
     </div>
   </div>
 </div>
diff --git a/client_side_nav.php b/client_side_nav.php
index 28eae421..ac735392 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -42,7 +42,7 @@
   <li class="nav-item <?php if($_GET['tab'] == "locations") { echo "active"; } ?>">
     <a class="nav-link" 
       href="?client_id=<?php echo $client_id; ?>&tab=locations">
-      <i class="fas fa-fw fa-map-marker mx-2"></i>
+      <i class="fas fa-fw fa-map-marker-alt mx-2"></i>
       <span>Locations
         <?php 
         if($num_locations > 0){ ?> 
@@ -132,7 +132,7 @@
   <li class="nav-item <?php if($_GET['tab'] == "applications") { echo "active"; } ?>">
     <a class="nav-link" 
       href="?client_id=<?php echo $client_id; ?>&tab=applications">
-      <i class="fas fa-fw fa-box mx-2"></i>
+      <i class="fas fa-fw fa-rocket mx-2"></i>
       <span>Applications
         <?php 
         if($num_applications > 0){ ?> 
diff --git a/clients.php b/clients.php
index 651da7b7..6693db0b 100644
--- a/clients.php
+++ b/clients.php
@@ -5,8 +5,8 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-users"></i> Clients</h6>
-    <button type="button" class="btn btn-primary badge-pill mr-auto float-right" data-toggle="modal" data-target="#addClientModal"><i class="fas fa-user-plus"></i></button>
+    <h5 class="float-left mt-2"><i class="fa fa-users mr-2"></i>Clients</h5>
+    <button type="button" class="btn btn-primary badge-pill mr-auto float-right" data-toggle="modal" data-target="#addClientModal"><i class="fas fa-fw fa-user-plus"></i></button>
   </div>
   <div class="card-body">
     <div class="table-responsive">
diff --git a/config.php b/config.php
index d536812d..7c487df4 100644
--- a/config.php
+++ b/config.php
@@ -119,13 +119,13 @@
 	$asset_types_array = array(
 		'Laptop',
 		'Desktop',
+		'Server',
 		'Mobile Phone',
 		'Tablet',
 		'Firewall/Router',
 		'Switch',
 		'Access Point',
 		'Printer',
-		'TV',
 		'Camera',
 		'TV',
 		'Virtual Machine',
diff --git a/css/style.css b/css/style.css
index efe82b20..ac816e7c 100644
--- a/css/style.css
+++ b/css/style.css
@@ -6,5 +6,6 @@ body {
 	table.dT thead .sorting_desc {
 	    background : none;
 	}
-}
 
+	
+}
\ No newline at end of file
diff --git a/dashboard.php b/dashboard.php
index facdc4d8..cf4d8372 100644
--- a/dashboard.php
+++ b/dashboard.php
@@ -107,9 +107,7 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
   <div class="col-md-12">
     <!-- Area Chart Example-->
     <div class="card mb-3">
-      <div class="card-header">
-        <i class="fas fa-chart-area"></i>
-        Cash Flow</div>
+      <div class="card-header"><i class="fas fa-fw fa-chart-area"></i> Cash Flow</div>
       <div class="card-body">
         <canvas id="myAreaChart" width="100%" height="25"></canvas>
       </div>
diff --git a/edit_account_modal.php b/edit_account_modal.php
index 07d23f8b..46eba655 100644
--- a/edit_account_modal.php
+++ b/edit_account_modal.php
@@ -1,26 +1,26 @@
 <div class="modal" id="editAccountModal<?php echo $account_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-piggy-bank"></i> Modify Account</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-piggy-bank mr-2"></i>Modify Account</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" autocomplete="off">
         <input type="hidden" name="account_id" value="<?php echo $account_id; ?>">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-group">
             <label>Account Name</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-university"></i></span>
+                <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>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_account" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_calendar_event_modal.php b/edit_calendar_event_modal.php
index 89f9e6cc..37c6feb7 100644
--- a/edit_calendar_event_modal.php
+++ b/edit_calendar_event_modal.php
@@ -1,18 +1,23 @@
 <div class="modal" id="editCalendarEventModal<?php echo $calendar_event_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-calendar"></i> Edit Event</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-calendar mr-2"></i>Edit Event</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" autocomplete="off">
         <input type="hidden" name="calendar_event_id" value="<?php echo $calendar_event_id; ?>">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-group">
             <label>Title</label>
-            <input type="text" class="form-control" name="title" placeholder="Title of the event" value="<?php echo $calendar_event_title; ?>" required>
+            <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="title" placeholder="Title of the event" value="<?php echo $calendar_event_title; ?>" required>
+            </div>
           </div>
           <div class="form-group">
             <label>Calendar</label>
@@ -41,7 +46,7 @@
               <label>Starts</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-clock"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
                 </div>
                 <input type="datetime-local" class="form-control" name="start" value="<?php echo date('Y-m-d\TH:i:s', strtotime($calendar_event_start)); ?>" required>
               </div>
@@ -50,14 +55,14 @@
               <label>Ends</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-stopwatch"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-stopwatch"></i></span>
                 </div>
                 <input type="datetime-local" class="form-control" name="end" value="<?php echo date('Y-m-d\TH:i:s', strtotime($calendar_event_end)); ?>" required>
               </div>
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_calendar_event" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_category_modal.php b/edit_category_modal.php
index 22b4c8ce..c7e01172 100644
--- a/edit_category_modal.php
+++ b/edit_category_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="editCategoryModal<?php echo $category_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-modify"></i> Modify Category</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-list mr-2"></i>Modify Category</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" autocomplete="off">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-group">
             <label>Name</label>
             <input type="text" class="form-control" name="name" value="<?php echo $category_name; ?>" required>
@@ -26,7 +26,7 @@
             <input type="color" class="form-control" name="color" value="<?php echo $category_color; ?>">
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_category" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_client_application_modal.php b/edit_client_application_modal.php
index 20866412..83b89856 100644
--- a/edit_client_application_modal.php
+++ b/edit_client_application_modal.php
@@ -1,21 +1,21 @@
 <div class="modal" id="editClientApplicationModal<?php echo $client_application_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-rocket"></i> Edit Application</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-rocket mr-2"></i>Edit Application</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" autocomplete="off">
         <input type="hidden" name="client_application_id" value="<?php echo $client_application_id; ?>">
-        <div class="modal-body">    
+        <div class="modal-body bg-white">    
           
           <div class="form-group">
             <label>Application Name</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-cube"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
               </div>
               <input type="text" class="form-control" name="name" placeholder="Application name" value="<?php echo $client_application_name; ?>" required>
             </div>
@@ -25,7 +25,7 @@
             <label>Type</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-tag"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
               </div>
               <select class="form-control" name="type" required>
                 <?php foreach($application_types_array as $application_type2) { ?>
@@ -39,14 +39,14 @@
             <label>License</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-key"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
               </div>
-              <input type="text" class="form-control" name="license" value="<?php echo $client_application_license; ?>" required> 
+              <input type="text" class="form-control" name="license" placeholder="License key" value="<?php echo $client_application_license; ?>" required> 
             </div>
           </div>
 
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_client_application" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_client_asset_modal.php b/edit_client_asset_modal.php
index 7a267382..08bbec32 100644
--- a/edit_client_asset_modal.php
+++ b/edit_client_asset_modal.php
@@ -1,20 +1,20 @@
 <div class="modal" id="editClientAssetModal<?php echo $client_asset_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-tag"></i> Edit Asset</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-tag mr-2"></i>Edit Asset</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" autocomplete="off">
         <input type="hidden" name="client_asset_id" value="<?php echo $client_asset_id; ?>">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-group">
             <label>Asset Name</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-tag"></i></span>
+                <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 $client_asset_name; ?>" required>
             </div>
@@ -23,7 +23,7 @@
             <label>Asset Type</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-tags"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
               </div>
               <select class="form-control" name="type" required>
                 <?php foreach($asset_types_array as $asset_type) { ?>
@@ -36,7 +36,7 @@
             <label>Make</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-tag"></i></span>
+                <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 $client_asset_make; ?>" required>
             </div>
@@ -45,7 +45,7 @@
             <label>Model</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-tag"></i></span>
+                <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 $client_asset_model; ?>" required>
             </div>
@@ -54,13 +54,13 @@
             <label>Serial Number</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-barcode"></i></span>
+                <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 $client_asset_serial; ?>" required>
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_client_asset" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_client_contact_modal.php b/edit_client_contact_modal.php
index 15cb6ad4..e02e4b1b 100644
--- a/edit_client_contact_modal.php
+++ b/edit_client_contact_modal.php
@@ -1,15 +1,15 @@
 <div class="modal" id="editClientContactModal<?php echo $client_contact_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-user-edit"></i> Edit Contact</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-user-edit mr-2"></i>Edit Contact</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" autocomplete="off">
         <input type="hidden" name="client_contact_id" value="<?php echo $client_contact_id; ?>">
-        <div class="modal-body">    
+        <div class="modal-body bg-white">    
           <div class="form-group">
             <label>Name</label>
             <div class="input-group">
@@ -50,7 +50,7 @@
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_client_contact" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_client_domain_modal.php b/edit_client_domain_modal.php
index e665f0bc..445ef811 100644
--- a/edit_client_domain_modal.php
+++ b/edit_client_domain_modal.php
@@ -1,20 +1,20 @@
 <div class="modal" id="editClientDomainModal<?php echo $client_domain_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-globe"></i> New Domain</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-globe mr-2"></i>Edit Domain</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" autocomplete="off">
         <input type="hidden" name="client_domain_id" value="<?php echo $client_domain_id; ?>">
-        <div class="modal-body">    
+        <div class="modal-body bg-white">    
           <div class="form-group">
             <label>Domain Name</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-globe"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
               </div>
               <input type="text" class="form-control" name="name" placeholder="Domain name exmaple.com" value="<?php echo $client_domain_name; ?>" required>
             </div>
@@ -24,7 +24,7 @@
             <label>Domain Registrar</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-server"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
               </div>
               <input type="text" class="form-control" name="registrar" placeholder="ex GoDaddy" value="<?php echo $client_domain_registrar; ?>" required>
             </div>
@@ -34,7 +34,7 @@
             <label>Expire Date</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
               </div>
               <input type="date" class="form-control" name="expire" value="<?php echo $client_domain_expire; ?>" required> 
             </div>
@@ -44,13 +44,13 @@
             <label>Server</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-server"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
               </div>
               <input type="text" class="form-control" name="server" placeholder="ex ns1.pittpc.com" value="<?php echo $client_domain_server; ?>" required>
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_client_domain" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_client_location_modal.php b/edit_client_location_modal.php
index 2ee84ff5..29de42bb 100644
--- a/edit_client_location_modal.php
+++ b/edit_client_location_modal.php
@@ -1,20 +1,20 @@
 <div class="modal" id="editClientLocationModal<?php echo $client_location_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-map-marker"></i> Edit Location</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Edit Location</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" autocomplete="off">
         <input type="hidden" name="client_location_id" value="<?php echo $client_location_id; ?>">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-group">
             <label>Location Name</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-user"></i></span>
+                <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 $client_location_name; ?>" required>
             </div>
@@ -23,16 +23,18 @@
             <label>Address</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-map-marker"></i></span>
+                <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="Address" value="<?php echo $client_location_address; ?>" required>
             </div>
           </div>
          
           <div class="form-group">
+            <label>City</label>
             <input type="text" class="form-control" name="city" placeholder="City" value="<?php echo $client_location_city; ?>" required>
           </div>
           <div class="form-group">
+            <label>State</label>
             <select class="form-control" name="state" required>
                 <?php foreach($states_array as $state_abbr => $state_name) { ?>
                 <option <?php if($client_location_state == $state_abbr) { echo "selected"; } ?> value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
@@ -40,19 +42,20 @@
             </select>
           </div>
           <div class="form-group">
+            <label>Zip</label>
             <input type="text" class="form-control" name="zip" placeholder="Zip" value="<?php echo $client_location_zip; ?>" required>
           </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-phone"></i></span>
+                <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" data-inputmask="'mask': '999-999-9999'" value="<?php echo $client_location_phone; ?>" required> 
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_client_location" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_client_login_modal.php b/edit_client_login_modal.php
index 9dbb1263..0a576444 100644
--- a/edit_client_login_modal.php
+++ b/edit_client_login_modal.php
@@ -1,15 +1,15 @@
 <div class="modal" id="editClientLoginModal<?php echo $client_login_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-lock"></i> Edit Login</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-lock mr-2"></i>Edit Login</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" autocomplete="off">
         <input type="hidden" name="client_login_id" value="<?php echo $client_login_id; ?>">
-        <div class="modal-body">  
+        <div class="modal-body bg-white">  
           <div class="form-group">
             <label>Description</label>
             <div class="input-group">
@@ -25,7 +25,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-link"></i></span>
               </div>
-              <input type="text" class="form-control" name="web_link" value="<?php echo $client_login_web_link; ?>">
+              <input type="text" class="form-control" name="web_link" placeholder="Please include http://" value="<?php echo $client_login_web_link; ?>">
             </div>
           </div>
           <div class="form-group">
@@ -47,7 +47,7 @@
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_client_login" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_client_modal.php b/edit_client_modal.php
index 57234797..f93058fc 100644
--- a/edit_client_modal.php
+++ b/edit_client_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="editClientModal<?php echo $client_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-user-edit"></i> Edit Client</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-user-edit mr-2"></i>Edit Client</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" autocomplete="off">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <input type="hidden" name="client_id" value="<?php echo $client_id; ?>" >
           <div class="form-group row">
             <label class="col-sm-2 col-form-label">Name</label>
@@ -66,7 +66,7 @@
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_client" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_client_network_modal.php b/edit_client_network_modal.php
index de57d134..79b5ceae 100644
--- a/edit_client_network_modal.php
+++ b/edit_client_network_modal.php
@@ -1,20 +1,20 @@
 <div class="modal" id="editClientNetworkModal<?php echo $client_network_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-network-wired"></i> Edit Network</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-network-wired mr-2"></i>Edit Network</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" autocomplete="off">
         <input type="hidden" name="client_network_id" value="<?php echo $client_network_id; ?>">
-        <div class="modal-body">    
+        <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-network-wired"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
               </div>
               <input type="text" class="form-control" name="name" placeholder="Network name (VLAN, WAN, LAN2 etc)"  value="<?php echo $client_network_name; ?>" required>
             </div>
@@ -24,7 +24,7 @@
             <label>Network</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-network-wired"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
               </div>
               <input type="text" class="form-control" name="network" placeholder="Network ex 192.168.1.0/24" value="<?php echo $client_network; ?>" required>
             </div>
@@ -34,7 +34,7 @@
             <label>Gateway</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-route"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-route"></i></span>
               </div>
               <input type="text" class="form-control" name="gateway" placeholder="ex 192.168.1.1" value="<?php echo $client_network_gateway; ?>" required> 
             </div>
@@ -44,13 +44,13 @@
             <label>DHCP Range</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-server"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
               </div>
               <input type="text" class="form-control" name="dhcp_range" placeholder="ex 192.168.1.11-199" value="<?php echo $client_network_dhcp_range; ?>">
             </div>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_client_network" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_client_note_modal.php b/edit_client_note_modal.php
index 6cda63b2..7d069158 100644
--- a/edit_client_note_modal.php
+++ b/edit_client_note_modal.php
@@ -1,15 +1,15 @@
 <div class="modal" id="editClientNoteModal<?php echo $client_note_id; ?>" tabindex="-1">
   <div class="modal-dialog modal-xl">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-edit"></i> Edit Note</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-edit mr-2"></i>Edit Note</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" autocomplete="off">
         <input type="hidden" name="client_note_id" value="<?php echo $client_note_id; ?>">
-        <div class="modal-body">  
+        <div class="modal-body bg-white">  
           <div class="form-group">
             <label>Subject</label>
             <input type="text" class="form-control" name="subject" value="<?php echo $client_note_subject; ?>" required>
@@ -19,7 +19,7 @@
             <textarea rows="8" class="form-control" id="editClientNote" name="note"><?php echo $client_note_body; ?></textarea>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_client_note" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_client_vendor_modal.php b/edit_client_vendor_modal.php
index 3527c07c..4346a119 100644
--- a/edit_client_vendor_modal.php
+++ b/edit_client_vendor_modal.php
@@ -1,20 +1,20 @@
 <div class="modal" id="editClientVendorModal<?php echo $client_vendor_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-building"></i> Edit Vendor</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-building mr-2"></i>Edit Vendor</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" autocomplete="off">
         <input type="hidden" name="client_vendor_id" value="<?php echo $client_vendor_id; ?>">
-        <div class="modal-body">  
+        <div class="modal-body bg-white">  
           <div class="form-group">
             <label>Vendor Name</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-building"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
               </div>
               <input type="text" class="form-control" name="name" placeholder="Name of the vendor" value="<?php echo $client_vendor_name; ?>" required>
             </div>
@@ -23,7 +23,7 @@
             <label>Description</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-comment"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
               </div>
               <input type="text" class="form-control" name="description" placeholder="Description of the Vendor" value="<?php echo $client_vendor_description; ?>"required>
             </div>
@@ -32,14 +32,14 @@
             <label>Account Number</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-barcode"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
               </div>
               <input type="text" class="form-control" name="account_number" placeholder="Account number" value="<?php echo $client_vendor_account_number; ?>">
             </div>
           </div>
 
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_client_vendor" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_mileage_modal.php b/edit_mileage_modal.php
index 4208b768..832b2769 100644
--- a/edit_mileage_modal.php
+++ b/edit_mileage_modal.php
@@ -1,21 +1,21 @@
 <div class="modal" id="editMileageModal<?php echo $mileage_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-car-side"></i> Modify Mileage</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-bicycle mr-2"></i>Edit Trip</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" autocomplete="off">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <input type="hidden" name="mileage_id" value="<?php echo $mileage_id; ?>">
           <div class="form-row">
             <div class="form-group col-7">
               <label>Date</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
                 <input type="date" class="form-control" name="date" value="<?php echo $mileage_date; ?>" required>
               </div>
@@ -24,23 +24,22 @@
               <label>Miles</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-car-side"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
                 </div>
                 <input type="number" class="form-control" name="miles" value="<?php echo $mileage_miles; ?>" required>
               </div>
             </div>
           </div>
           <div class="form-group">
-            <label>Starting Location</label>
+            <label>Location</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-map-marker"></i></span>
+                <span class="input-group-text"><i class="fa fa-map-marker-alt"></i></span>
               </div>
               <input type="text" class="form-control" name="starting_location" value="<?php echo $mileage_starting_location; ?>" required>
             </div>
           </div>
           <div class="form-group">
-            <label>Destination</label>
             <div class="input-group">
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-arrow-right"></i></span>
@@ -53,7 +52,7 @@
             <textarea rows="4" class="form-control" name="purpose" required><?php echo $mileage_purpose; ?></textarea>
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_mileage" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_product_modal.php b/edit_product_modal.php
index cbbc65b0..2e2e565c 100644
--- a/edit_product_modal.php
+++ b/edit_product_modal.php
@@ -1,15 +1,15 @@
 <div class="modal" id="editProductModal<?php echo $product_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-box"></i> Edit Product</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-box mr-2"></i>Edit Product</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" autocomplete="off">
         <input type="hidden" name="product_id" value="<?php echo $product_id; ?>">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-group">
             <label>Name</label>
             <input type="text" class="form-control" name="name" value="<?php echo $product_name; ?>" required>
@@ -23,7 +23,7 @@
             <input type="text" class="form-control" name="cost" value="<?php echo $product_cost; ?>">
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_product" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_transfer_modal.php b/edit_transfer_modal.php
index a708299f..6fbfc014 100644
--- a/edit_transfer_modal.php
+++ b/edit_transfer_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="editTransferModal<?php echo $transfer_id; ?>" tabindex="-1">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content">
+  <div class="modal-dialog">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-exchange-alt"></i> Modify Transfer</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-exchange-alt mr-2"></i>Modify Transfer</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" autocomplete="off">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <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="payment_id" value="<?php echo $payment_id; ?>">
@@ -17,7 +17,7 @@
               <label>Date</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
                 <input type="date" class="form-control" name="date" value="<?php echo $transfer_date; ?>" required>
               </div>
@@ -26,84 +26,82 @@
               <label>Amount</label>
               <div class="input-group">
                 <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-hand-holding-usd"></i></span>
+                  <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-row">
-            <div class="form-group col-sm">
-              <label>Account From</label>
-              <div class="input-group"> 
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-university"></i></span>
-                </div> 
-                <select class="form-control" name="account_from" required>
-                  <?php 
-                  
-                  $sql2 = mysqli_query($mysqli,"SELECT * FROM accounts"); 
-                  while($row = mysqli_fetch_array($sql2)){
-                    $account_id2 = $row['account_id'];
-                    $account_name = $row['account_name'];
-                    $opening_balance = $row['opening_balance'];
+          <div class="form-group">
+            <label>Transfer</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" name="account_from" required>
+                <?php 
+                
+                $sql2 = mysqli_query($mysqli,"SELECT * FROM accounts"); 
+                while($row = mysqli_fetch_array($sql2)){
+                  $account_id2 = $row['account_id'];
+                  $account_name = $row['account_name'];
+                  $opening_balance = $row['opening_balance'];
 
-                    $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE account_id = $account_id2");
-                    $row = mysqli_fetch_array($sql_payments);
-                    $total_payments = $row['total_payments'];
-                    
-                    $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE account_id = $account_id2");
-                    $row = mysqli_fetch_array($sql_expenses);
-                    $total_expenses = $row['total_expenses'];
-
-                    $balance = $opening_balance + $total_payments - $total_expenses;
+                  $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE account_id = $account_id2");
+                  $row = mysqli_fetch_array($sql_payments);
+                  $total_payments = $row['total_payments'];
                   
-                  ?>
-                  <option <?php if($transfer_account_from == $account_id2){ ?> selected <?php } ?> value="<?php echo $account_id2; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
-                  <?php
-                  }
-                  
-                  ?>
-                </select>
-              </div>
-            </div>
-            <div class="form-group col-sm">
-               <label>Account To</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-arrow-right"></i></span>
-                </div>
-                <select class="form-control" name="account_to" required>
-                  <?php 
-                  
-                  $sql2 = mysqli_query($mysqli,"SELECT * FROM accounts"); 
-                  while($row = mysqli_fetch_array($sql2)){
-                    $account_id2 = $row['account_id'];
-                    $account_name = $row['account_name'];
-                    $opening_balance = $row['opening_balance'];
+                  $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE account_id = $account_id2");
+                  $row = mysqli_fetch_array($sql_expenses);
+                  $total_expenses = $row['total_expenses'];
 
-                    $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE account_id = $account_id2");
-                    $row = mysqli_fetch_array($sql_payments);
-                    $total_payments = $row['total_payments'];
-                    
-                    $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE account_id = $account_id2");
-                    $row = mysqli_fetch_array($sql_expenses);
-                    $total_expenses = $row['total_expenses'];
-
-                    $balance = $opening_balance + $total_payments - $total_expenses;
-
-                  ?>
-                  <option <?php if($transfer_account_to == $account_id2){ ?> selected <?php } ?> value="<?php echo $account_id2; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
-                  <?php
-                  }
-                  
-                  ?>
-                </select>
-              </div>
+                  $balance = $opening_balance + $total_payments - $total_expenses;
+                
+                ?>
+                <option <?php if($transfer_account_from == $account_id2){ ?> selected <?php } ?> value="<?php echo $account_id2; ?>"><?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" name="account_to" required>
+                <?php 
+                
+                $sql2 = mysqli_query($mysqli,"SELECT * FROM accounts"); 
+                while($row = mysqli_fetch_array($sql2)){
+                  $account_id2 = $row['account_id'];
+                  $account_name = $row['account_name'];
+                  $opening_balance = $row['opening_balance'];
+
+                  $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE account_id = $account_id2");
+                  $row = mysqli_fetch_array($sql_payments);
+                  $total_payments = $row['total_payments'];
+                  
+                  $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE account_id = $account_id2");
+                  $row = mysqli_fetch_array($sql_expenses);
+                  $total_expenses = $row['total_expenses'];
+
+                  $balance = $opening_balance + $total_payments - $total_expenses;
+
+                ?>
+                <option <?php if($transfer_account_to == $account_id2){ ?> selected <?php } ?> value="<?php echo $account_id2; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
+                <?php
+                }
+                
+                ?>
+              </select>
+            </div>
+          </div>
+
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_transfer" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_user_modal.php b/edit_user_modal.php
index dd687441..df38a756 100644
--- a/edit_user_modal.php
+++ b/edit_user_modal.php
@@ -1,9 +1,9 @@
 <div class="modal" id="editUserModal<?php echo $user_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-user-edit"></i> Edit User</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-user-edit mr-2"></i>Edit User</h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
@@ -11,7 +11,7 @@
         <input type="hidden" name="user_id" value="<?php echo $user_id; ?>">
         <input type="hidden" name="current_password_hash" value="<?php echo $password; ?>">
         <input type="hidden" name="current_avatar_path" value="<?php echo $avatar; ?>">
-        <div class="modal-body">    
+        <div class="modal-body bg-white">    
           <center class="mb-3">
             <img class="img-fluid rounded-circle" src="<?php echo $avatar; ?>" height="128" width="128">
           </center>
@@ -19,7 +19,7 @@
             <label>Name</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-user"></i></span>
+                <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 $name; ?>" required>
             </div>
@@ -29,7 +29,7 @@
             <label>Email</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-envelope"></i></span>
+                <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 $email; ?>" required>
             </div>
@@ -39,7 +39,7 @@
             <label>Password</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-lock"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
               </div>
               <input type="password" class="form-control" name="password" placeholder="Enter a password" value="<?php echo $password; ?>" required>
             </div>
@@ -49,7 +49,7 @@
             <input type="file" class="form-control-file" accept="image/*;capture=camera" name="avatar">
           </div>         
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_user" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_vendor_modal.php b/edit_vendor_modal.php
index 84fc6e48..894434b6 100644
--- a/edit_vendor_modal.php
+++ b/edit_vendor_modal.php
@@ -1,15 +1,15 @@
 <div class="modal" id="editVendorModal<?php echo $vendor_id; ?>" tabindex="-1">
   <div class="modal-dialog modal-lg">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-edit"></i> Edit Vendor</h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-building mr-2"></i>Edit Vendor</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" autocomplete="off">
         <input type="hidden" name="vendor_id" value="<?php echo $vendor_id; ?>">
-        <div class="modal-body">
+        <div class="modal-body bg-white">
           <div class="form-group">
             <label>Name</label>
             <input type="text" class="form-control" name="name" value="<?php echo "$vendor_name"; ?>" required>
@@ -60,7 +60,7 @@
             <input type="text" class="form-control" name="account_number" value="<?php echo $vendor_account_number; ?>">
           </div>
         </div>
-        <div class="modal-footer">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_vendor" class="btn btn-primary">Save</button>
         </div>
diff --git a/expenses.php b/expenses.php
index ec49ed7e..cc422acb 100644
--- a/expenses.php
+++ b/expenses.php
@@ -11,8 +11,8 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-shopping-cart"></i> Expenses</h6>
-    <button type="button" class="btn btn-primary btn-sm mr-auto float-right" data-toggle="modal" data-target="#addExpenseModal"><i class="fas fa-cart-plus"></i></button>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-shopping-cart mr-2"></i>Expenses</h6>
+    <button type="button" class="btn btn-primary btn-sm mr-auto float-right" data-toggle="modal" data-target="#addExpenseModal"><i class="fas fa-fw fa-cart-plus"></i></button>
   </div>
   <div class="card-body">
     <div class="table-responsive">
diff --git a/invoices.php b/invoices.php
index e6c24a6a..5f753a5c 100644
--- a/invoices.php
+++ b/invoices.php
@@ -84,13 +84,13 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-file"></i> Invoices</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addInvoiceModal"><i class="fas fa-plus"></i></button>
+    <h5 class="float-left mt-2"><i class="fa fa-fw fa-file mr-2"></i>Invoices</h5>
+    <button type="button" class="btn btn-primary badge-pill float-right" data-toggle="modal" data-target="#addInvoiceModal"><i class="fas fa-fw fa-plus"></i></button>
   </div>
   <div class="card-body">
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
-        <thead>
+        <thead class="thead-dark">
           <tr>
             <th>Number</th>
             <th>Client</th>
diff --git a/login.php b/login.php
index 5c3d58bd..bd948def 100644
--- a/login.php
+++ b/login.php
@@ -53,12 +53,12 @@ if(isset($_POST['login'])){
 
 </head>
 
-<body class="bg-dark">
+<body class="bg-secondary">
 
   <div class="container">
-    <div class="card card-login mx-auto mt-5">
-      <div class="card-header"><h3><?php echo $config_company_name; ?> Login</h3></div>
-      <div class="card-body">
+    <div class="card card-login mx-auto mt-5 bg-dark">
+      <div class="card-header mt-2 text-white"><h3><i class="fa fa-cloud"></i> <?php echo $config_company_name; ?></h3></div>
+      <div class="card-body bg-white">
         <?php if(isset($response)) { echo $response; } ?>
         <form method="post">
           <div class="form-group">
diff --git a/mileage.php b/mileage.php
index 4855ff0d..f953758f 100644
--- a/mileage.php
+++ b/mileage.php
@@ -5,7 +5,7 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-car"></i> Mileage</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-bicycle mr-2"></i>Mileage</h6>
     <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addMileageModal"><i class="fas fa-plus"></i></button>
   </div>
   <div class="card-body">
diff --git a/payments.php b/payments.php
index ac7acbc2..5ee1fc5e 100644
--- a/payments.php
+++ b/payments.php
@@ -12,7 +12,7 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-credit-card"></i> Payments</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-credit-card mr-2"></i>Payments</h6>
   </div>
   <div class="card-body">
     <div class="table-responsive">
diff --git a/post.php b/post.php
index a7844278..d2ba4c2c 100644
--- a/post.php
+++ b/post.php
@@ -1798,7 +1798,6 @@ if(isset($_GET['delete_client_login'])){
 
 if(isset($_POST['add_client_file'])){
     $client_id = intval($_POST['client_id']);
-    $file_type = strip_tags(mysqli_real_escape_string($mysqli,$_POST['file_type']));
     $new_name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['new_name']));
 
     if($_FILES['file']['tmp_name']!='') {
@@ -1806,9 +1805,12 @@ if(isset($_POST['add_client_file'])){
         $path = $path . basename( $_FILES['file']['name']);
         $file_name = basename($path);
         move_uploaded_file($_FILES['file']['tmp_name'], $path);
+        $ext = pathinfo($path);
+        $ext = $ext['extension'];
+
     }
 
-    mysqli_query($mysqli,"INSERT INTO files SET file_type = '$file_type', file_name = '$path', client_id = $client_id");
+    mysqli_query($mysqli,"INSERT INTO files SET file_name = '$path', file_ext = '$ext', client_id = $client_id");
 
     $_SESSION['alert_message'] = "File uploaded";
     
diff --git a/products.php b/products.php
index 19057ace..bab38131 100644
--- a/products.php
+++ b/products.php
@@ -5,8 +5,8 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-box"></i> Products</h6>
-    <button type="button" class="btn btn-primary btn-sm mr-auto float-right" data-toggle="modal" data-target="#addProductModal"><i class="fas fa-plus"></i></button>
+    <h5 class="float-left mt-2"><i class="fa fa-fw fa-box mr-2"></i>Products</h5>
+    <button type="button" class="btn btn-primary badge-pill mr-auto float-right" data-toggle="modal" data-target="#addProductModal"><i class="fas fa-fw fa-plus"></i></button>
   </div>
   <div class="card-body">
     <div class="table-responsive">
diff --git a/quotes.php b/quotes.php
index 30288e13..4fd36c3b 100644
--- a/quotes.php
+++ b/quotes.php
@@ -9,8 +9,8 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-file"></i> Quotes</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addQuoteModal"><i class="fas fa-plus"></i></button>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-file mr-2"></i>Quotes</h6>
+    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addQuoteModal"><i class="fas fa-fw fa-plus"></i></button>
   </div>
   <div class="card-body">
     <div class="table-responsive">
diff --git a/recurring.php b/recurring.php
index c609fceb..d84b9ffd 100644
--- a/recurring.php
+++ b/recurring.php
@@ -10,7 +10,7 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-copy"></i> Recurring Invoices</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-copy mr-2"></i>Recurring Invoices</h6>
     <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addRecurringInvoiceModal"><i class="fas fa-plus"></i></button>
   </div>
   <div class="card-body">
diff --git a/settings-backup.php b/settings-backup.php
index ed42e099..a61757ec 100644
--- a/settings-backup.php
+++ b/settings-backup.php
@@ -6,7 +6,7 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-database"></i> Backup</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-database mr-2"></i>Backup</h6>
   </div>
   <div class="card-body p-5">
     <center>
diff --git a/settings-company.php b/settings-company.php
index 14a5fd65..03a3e669 100644
--- a/settings-company.php
+++ b/settings-company.php
@@ -4,7 +4,7 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-building"></i> Company Settings</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-building mr-2"></i>Company Settings</h6>
   </div>
   <div class="card-body">
     <form class="p-3" action="post.php" method="post"  autocomplete="off">
@@ -12,7 +12,7 @@
         <label>Company Name</label>
         <div class="input-group">
           <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-building"></i></span>
+            <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
           </div>
           <input type="text" class="form-control" name="config_company_name" placeholder="Company Name" value="<?php echo $config_company_name; ?>" required autofocus>  
         </div>
@@ -22,7 +22,7 @@
         <label>Address</label>
         <div class="input-group">
           <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-map-marker"></i></span>
+            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
           </div>
           <input type="text" class="form-control" name="config_company_address" placeholder="Street Address" value="<?php echo $config_company_address; ?>" >
         </div>
@@ -52,7 +52,7 @@
         <label>Phone</label>
         <div class="input-group">
           <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-phone"></i></span>
+            <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
           </div>
           <input type="text" class="form-control" name="config_company_phone" placeholder="Phone Number" value="<?php echo $config_company_phone; ?>" data-inputmask="'mask': '999-999-9999'" > 
         </div>
@@ -62,7 +62,7 @@
         <label>Website</label>
         <div class="input-group">
           <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-globe"></i></span>
+            <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
           </div>
           <input type="text" class="form-control" name="config_company_site" placeholder="Website address https://" value="<?php echo $config_company_site; ?>" >
         </div>
diff --git a/settings-general.php b/settings-general.php
index 375d097d..4b0203e7 100644
--- a/settings-general.php
+++ b/settings-general.php
@@ -4,7 +4,7 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-cog"></i> General Settings</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-cog mr-2"></i>General Settings</h6>
   </div>
   <div class="card-body">
     <form class="p-3" action="post.php" method="post" autocomplete="off">
@@ -12,7 +12,7 @@
         <label>Starting Page</label>
         <div class="input-group">
           <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-plane-arrival"></i></span>
+            <span class="input-group-text"><i class="fa fa-fw fa-plane-arrival"></i></span>
           </div>
           <select class="form-control" name="config_start_page" required>
             <option value="dashboard.php">Dashboard</option>
@@ -27,7 +27,7 @@
         <label>Account Threshold</label>
         <div class="input-group">
           <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-university"></i></span>
+            <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
           </div>
           <input type="text" class="form-control" name="config_account_balance_threshold" placeholder="Set an alert for dollar amount" value="<?php echo $config_account_balance_threshold; ?>" required>
         </div>
diff --git a/settings-invoice.php b/settings-invoice.php
index f6054545..61d38150 100644
--- a/settings-invoice.php
+++ b/settings-invoice.php
@@ -4,7 +4,7 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-file"></i> Invoice Settings</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-file mr-2"></i>Invoice Settings</h6>
   </div>
   <div class="card-body">
     <form class="p-3" action="post.php" method="post" autocomplete="off"> 
@@ -13,7 +13,7 @@
         <label>Next Number</label>
         <div class="input-group">
           <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-barcode"></i></span>
+            <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
           </div>
           <input type="text" class="form-control" name="config_next_invoice_number" placeholder="Next Invoice Number" value="<?php echo $config_next_invoice_number; ?>" required autofocus>
         </div>
@@ -23,7 +23,7 @@
         <label>Email From</label>
         <div class="input-group">
           <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-envelope"></i></span>
+            <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
           </div>
           <input type="email" class="form-control" name="config_mail_from_email" placeholder="Email Address" value="<?php echo $config_mail_from_email; ?>" required>
         </div>
@@ -33,7 +33,7 @@
         <label>Email Name From</label>
         <div class="input-group">
           <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-user"></i></span>
+            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
           </div>
           <input type="text" class="form-control" name="config_mail_from_name" placeholder="Name" value="<?php echo $config_mail_from_name; ?>" required>
         </div>
diff --git a/settings-logo.php b/settings-logo.php
index 5ccb8304..ab665722 100644
--- a/settings-logo.php
+++ b/settings-logo.php
@@ -4,7 +4,7 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-image"></i> Logo</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-image mr-2"></i>Logo</h6>
   </div>
   <div class="card-body">
     <form class="p-3" action="post.php" method="post" enctype="multipart/form-data" autocomplete="off"> 
diff --git a/settings-mail.php b/settings-mail.php
index e01b9db9..5bd15c3b 100644
--- a/settings-mail.php
+++ b/settings-mail.php
@@ -4,7 +4,7 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-envelope"></i> Mail Settings</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-envelope mr-2"></i>Mail Settings</h6>
   </div>
   <div class="card-body">
     <form class="p-3" action="post.php" method="post" autocomplete="off">
@@ -12,7 +12,7 @@
         <label>SMTP Host</label>
         <div class="input-group">
           <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-server"></i></span>
+            <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
           </div>
           <input type="text" class="form-control" name="config_smtp_host" placeholder="Mail Server Address" value="<?php echo $config_smtp_host; ?>" required autofocus>
         </div>
@@ -22,7 +22,7 @@
         <label>SMTP Port</label>
         <div class="input-group">
           <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-plug"></i></span>
+            <span class="input-group-text"><i class="fa fa-fw fa-plug"></i></span>
           </div>
           <input type="text" class="form-control" name="config_smtp_port" placeholder="Mail Server Port Number" value="<?php echo $config_smtp_port; ?>" required>
         </div>
@@ -32,7 +32,7 @@
         <label>SMTP Username</label>
         <div class="input-group">
           <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-user"></i></span>
+            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
           </div>
           <input type="text" class="form-control" name="config_smtp_username" placeholder="Username" value="<?php echo $config_smtp_username; ?>" required>
         </div>
@@ -42,7 +42,7 @@
         <label>SMTP Password</label>
         <div class="input-group">
           <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-lock"></i></span>
+            <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
           </div>
           <input type="password" class="form-control" name="config_smtp_password" placeholder="Password" value="<?php echo $config_smtp_password; ?>" required>
         </div>
diff --git a/settings-nav.php b/settings-nav.php
index 94eb6413..a4be67f4 100644
--- a/settings-nav.php
+++ b/settings-nav.php
@@ -11,7 +11,7 @@
   <li class="nav-item">
     <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-company.php") { echo "active"; } ?>" 
       href="settings-company.php">
-      <i class="fa fa-2x fa-building"></i><br>
+      <i class="fa fa-fw fa-2x fa-building"></i><br>
       Company
     </a> 
   </li>
@@ -19,7 +19,7 @@
   <li class="nav-item">
     <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-mail.php") { echo "active"; } ?>" 
       href="settings-mail.php">
-      <i class="fa fa-2x fa-envelope"></i><br>
+      <i class="fa fa-fw fa-2x fa-envelope"></i><br>
       Mail
     </a> 
   </li>
@@ -27,7 +27,7 @@
   <li class="nav-item">
     <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-invoice.php") { echo "active"; } ?>" 
       href="settings-invoice.php">
-      <i class="fa fa-2x fa-file"></i><br>
+      <i class="fa fa-fw fa-2x fa-file"></i><br>
       Invoice
     </a> 
   </li>
@@ -35,7 +35,7 @@
   <li class="nav-item">
     <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-logo.php") { echo "active"; } ?>" 
       href="settings-logo.php">
-      <i class="fa fa-2x fa-image"></i><br>
+      <i class="fa fa-fw fa-2x fa-image"></i><br>
       Logo
     </a> 
   </li>
@@ -43,7 +43,7 @@
   <li class="nav-item">
     <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-backup.php") { echo "active"; } ?>" 
       href="settings-backup.php">
-      <i class="fa fa-2x fa-database"></i><br>
+      <i class="fa fa-fw fa-2x fa-database"></i><br>
       Backup
     </a> 
   </li>
diff --git a/side_nav.php b/side_nav.php
index fcdb717f..12c39239 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -76,7 +76,7 @@
   </li>
   <li class="nav-item <?php if(basename($_SERVER["REQUEST_URI"]) == "mileage.php") { echo "active"; } ?>">
     <a class="nav-link" href="mileage.php">
-      <i class="fas fa-fw fa-car mx-2"></i>
+      <i class="fas fa-fw fa-bicycle mx-2"></i>
       <span>Mileage</span>
     </a>
   </li>
diff --git a/transfers.php b/transfers.php
index 0a998db3..aac5d7ac 100644
--- a/transfers.php
+++ b/transfers.php
@@ -9,7 +9,7 @@ $sql = mysqli_query($mysqli,"SELECT * FROM transfers ORDER BY transfer_date DESC
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-exchange-alt"></i> Transfers</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-exchange-alt mr-2"></i>Transfers</h6>
     <button type="button" class="btn btn-primary btn-sm mr-auto float-right" data-toggle="modal" data-target="#addTransferModal"><i class="fas fa-plus"></i></button>
   </div>
   <div class="card-body">
diff --git a/users.php b/users.php
index e18d9776..498bb378 100644
--- a/users.php
+++ b/users.php
@@ -5,8 +5,8 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-users"></i> Users</h6>
-    <button type="button" class="btn btn-primary btn-sm mr-auto float-right" data-toggle="modal" data-target="#addUserModal"><i class="fas fa-plus"></i></button>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-users mr-2"></i>Users</h6>
+    <button type="button" class="btn btn-primary btn-sm mr-auto float-right" data-toggle="modal" data-target="#addUserModal"><i class="fas fa-fw fa-plus"></i></button>
   </div>
   <div class="card-body">
     <div class="table-responsive">
diff --git a/vendors.php b/vendors.php
index c80c665f..b93c96ff 100644
--- a/vendors.php
+++ b/vendors.php
@@ -5,8 +5,8 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-building"></i> Vendors</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addVendorModal"><i class="fas fa-plus"></i></button>
+    <h5 class="float-left mt-2"><i class="fa fa-fw fa-building mr-2"></i>Vendors</h5>
+    <button type="button" class="btn btn-primary badge-pill float-right" data-toggle="modal" data-target="#addVendorModal"><i class="fas fa-fw fa-plus"></i></button>
   </div>
   <div class="card-body">
     <div class="table-responsive">
diff --git a/view_client_file_modal.php b/view_client_file_modal.php
index ec44c7d1..aad4e024 100644
--- a/view_client_file_modal.php
+++ b/view_client_file_modal.php
@@ -1,16 +1,16 @@
 <div class="modal" id="viewClientFileModal<?php echo $file_id; ?>" tabindex="-1">
-  <div class="modal-dialog modal-xl">
-    <div class="modal-content bg-dark text-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-paperclip"></i> <?php echo basename($file_name); ?></h5>
-        <button type="button" class="close" data-dismiss="modal">
-          <span class="text-white" aria-hidden="true">&times;</span>
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-image mr-2"></i><?php echo basename($file_name); ?></h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+          <span aria-hidden="true">&times;</span>
         </button>
-      </div>
-     
-        <center>
-          <img class="img-fluid" src="<?php echo $file_name; ?>">
-        </center>
+      </div>     
+      
+      <center>
+        <img class="img-fluid" src="<?php echo $file_name; ?>">
+      </center>
       
     </div>
   </div>
diff --git a/view_client_note_modal.php b/view_client_note_modal.php
index b2f5b40b..84a64b7a 100644
--- a/view_client_note_modal.php
+++ b/view_client_note_modal.php
@@ -1,13 +1,13 @@
 <div class="modal" id="viewClientNoteModal<?php echo $client_note_id; ?>" tabindex="-1">
   <div class="modal-dialog modal-xl">
-    <div class="modal-content">
+    <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-note"></i> <?php echo $client_note_subject; ?></h5>
-        <button type="button" class="close" data-dismiss="modal">
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-edit mr-2"></i><?php echo $client_note_subject; ?></h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
-      <div class="modal-body">
+      <div class="modal-body bg-white">
         <?php
           $Parsedown = new Parsedown();
           echo $Parsedown->text("$client_note_body");