diff --git a/client_add_modal.php b/client_add_modal.php
index 18681970..d214ec59 100644
--- a/client_add_modal.php
+++ b/client_add_modal.php
@@ -303,7 +303,7 @@
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_client" class="btn btn-primary" onclick="promptPrimaryContact()"><strong><i class="fas fa-check"></i> Create</strong></button>
+          <button type="submit" name="add_client" class="btn btn-primary text-bold" onclick="promptPrimaryContact()"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/client_asset_add_modal.php b/client_asset_add_modal.php
index 8a9bc048..457841b6 100644
--- a/client_asset_add_modal.php
+++ b/client_asset_add_modal.php
@@ -319,8 +319,8 @@
           </div>
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_asset" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_asset" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/client_asset_copy_modal.php b/client_asset_copy_modal.php
index fc316cb6..6f4a463c 100644
--- a/client_asset_copy_modal.php
+++ b/client_asset_copy_modal.php
@@ -3,7 +3,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-<?php echo $device_icon; ?>"></i> <?php echo $asset_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-<?php echo $device_icon; ?>"></i> Copying asset: <strong><?php echo $asset_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -318,7 +318,7 @@
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_asset" class="btn btn-primary">Save</button>
+          <button type="submit" name="add_asset" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Copy</button>
         </div>
       </form>
     </div>
diff --git a/client_asset_edit_modal.php b/client_asset_edit_modal.php
index a28f1fd9..b8b592c0 100644
--- a/client_asset_edit_modal.php
+++ b/client_asset_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-<?php echo $device_icon; ?>"></i> <?php echo $asset_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-<?php echo $device_icon; ?>"></i> Editing asset: <strong><?php echo $asset_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -318,8 +318,8 @@
           </div>
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_asset" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_asset" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/client_certificate_add_modal.php b/client_certificate_add_modal.php
index dd2e754b..92478a5e 100644
--- a/client_certificate_add_modal.php
+++ b/client_certificate_add_modal.php
@@ -86,8 +86,8 @@
                 </div>
 
                 <div class="modal-footer bg-white">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-                    <button type="submit" name="add_certificate" class="btn btn-primary">Save</button>
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_certificate" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
                 </div>
             </form>
         </div>
diff --git a/client_certificate_edit_modal.php b/client_certificate_edit_modal.php
index e02b05f7..80ec7635 100644
--- a/client_certificate_edit_modal.php
+++ b/client_certificate_edit_modal.php
@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-lock"></i><span id="editHeader"></span></h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-lock"></i> Editing certificate: <span class="text-bold" id="editHeader"></span></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/client_certificates.php b/client_certificates.php
index 79eb96be..72192bf2 100644
--- a/client_certificates.php
+++ b/client_certificates.php
@@ -125,7 +125,7 @@ include("client_certificate_add_modal.php");
                 const domains = response.domains;
 
                 // Populate the cert modal fields
-                document.getElementById("editHeader").innerText = " " + certificate.certificate_name;
+                document.getElementById("editHeader").innerText = certificate.certificate_name;
                 document.getElementById("editCertificateId").value = certificate_id;
                 document.getElementById("editCertificateName").value = certificate.certificate_name;
                 document.getElementById("editDomain").value = certificate.certificate_domain;
diff --git a/client_contact_add_modal.php b/client_contact_add_modal.php
index dccdc4da..a2b28e99 100644
--- a/client_contact_add_modal.php
+++ b/client_contact_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fas fa-user-plus"></i> New Contact</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-user-plus"></i> New Contact</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -175,7 +175,7 @@
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_contact" class="btn btn-primary"><strong><i class="fas fa-check"></i> Create</button>
+          <button type="submit" name="add_contact" class="btn btn-primary text-bold"><i class="fas fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/client_contact_edit_modal.php b/client_contact_edit_modal.php
index c3bdaf19..9851fb55 100644
--- a/client_contact_edit_modal.php
+++ b/client_contact_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-user-edit"></i> <?php echo $contact_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-user-edit"></i> Editing: <strong><?php echo $contact_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
diff --git a/client_contacts.php b/client_contacts.php
index edd22185..38aee406 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -208,7 +208,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
           <?php
           
           include("client_contact_edit_modal.php");
-          //include("client_contact_details_modal.php");
 
           }
           
diff --git a/client_document_add_modal.php b/client_document_add_modal.php
index ea94121e..02e540ca 100644
--- a/client_document_add_modal.php
+++ b/client_document_add_modal.php
@@ -58,8 +58,8 @@
             </div>
           </div>
 
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_document" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_document" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
 
         </div>
       </form>
diff --git a/client_document_edit_modal.php b/client_document_edit_modal.php
index b2d791ca..a4a9763b 100644
--- a/client_document_edit_modal.php
+++ b/client_document_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog modal-xl">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-file-alt"></i> <?php echo $document_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-file-alt"></i> Editing document: <strong><?php echo $document_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -56,8 +56,8 @@
             </div>
           </div>
 
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_document" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_document" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/client_document_folder_add_modal.php b/client_document_folder_add_modal.php
index d555cbf1..fcf0532b 100644
--- a/client_document_folder_add_modal.php
+++ b/client_document_folder_add_modal.php
@@ -23,8 +23,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_folder" class="btn btn-primary">Create</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_folder" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/client_document_folder_rename_modal.php b/client_document_folder_rename_modal.php
index cd2a63e3..1017b7ea 100644
--- a/client_document_folder_rename_modal.php
+++ b/client_document_folder_rename_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-edit"></i> Rename <?php echo $folder_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-folder"></i> Renaming folder: <strong><?php echo $folder_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -23,8 +23,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="rename_folder" class="btn btn-primary">Rename</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="rename_folder" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Rename</button>
         </div>
       </form>
     </div>
diff --git a/client_domain_add_modal.php b/client_domain_add_modal.php
index a7f62549..f8d86280 100644
--- a/client_domain_add_modal.php
+++ b/client_domain_add_modal.php
@@ -81,8 +81,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_domain" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_domain" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/client_domain_edit_modal.php b/client_domain_edit_modal.php
index 78d4a812..00ea8309 100644
--- a/client_domain_edit_modal.php
+++ b/client_domain_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-globe"></i><span id="editHeader"></span></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-globe"></i> Editing domain: <span class="text-bold" id="editHeader"></span></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -128,8 +128,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_domain" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_domain" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/client_domains.php b/client_domains.php
index 14ace448..934a78d9 100644
--- a/client_domains.php
+++ b/client_domains.php
@@ -137,7 +137,7 @@ include("client_domain_add_modal.php");
                 const vendors = response.vendors;
 
                 // Populate the domain modal fields
-                document.getElementById("editHeader").innerText = " " + domain.domain_name;
+                document.getElementById("editHeader").innerText = domain.domain_name;
                 document.getElementById("editDomainId").value = domain_id;
                 document.getElementById("editDomainName").value = domain.domain_name;
                 document.getElementById("editExpire").value = domain.domain_expire;
diff --git a/client_edit_modal.php b/client_edit_modal.php
index 7f9feefd..153080a7 100644
--- a/client_edit_modal.php
+++ b/client_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-user-edit"></i> <?php echo $client_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-user-edit"></i> Editing: <strong><?php echo $client_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -166,7 +166,7 @@
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_client" class="btn btn-primary"><strong><i class="fas fa-check"></i> Save</strong></button>
+          <button type="submit" name="edit_client" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/client_file_add_modal.php b/client_file_add_modal.php
index e29cb3cf..b452224e 100644
--- a/client_file_add_modal.php
+++ b/client_file_add_modal.php
@@ -1,5 +1,5 @@
 <div class="modal" id="addFileModal" tabindex="-1">
-  <div class="modal-dialog modal-sm">
+  <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
         <h5 class="modal-title"><i class="fa fa-fw fa-cloud-upload-alt"></i> Upload File</h5>
@@ -12,16 +12,23 @@
         <div class="modal-body bg-white">    
           
           <div class="form-group">
-            <input type="text" class="form-control" name="new_name" placeholder="New File Name (Optional)">
+            <label>File name</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
+              </div>
+              <input type="text" class="form-control" name="new_name" placeholder="leave blank to use existing name">
+            </div>
           </div>
 
           <div class="form-group">
-            <input type="file" class="form-control-file" name="file" accept=".jpg, .jpeg, .gif, .png, .pdf, .txt, .doc, .docx, .csv, .xls, .xlsx, .zip, .tar, .gz">
+            <input type="file" class="form-control-file" name="file" accept=".jpg, .jpeg, .gif, .png, .webp, .pdf, .txt, .doc, .docx, .csv, .xls, .xlsx, .zip, .tar, .gz">
           </div>
           
         </div>
         <div class="modal-footer bg-white">
-          <button type="submit" name="add_file" class="btn btn-primary">Upload</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_file" class="btn btn-primary text-bold"><i class="fa fa-fw fa-upload"></i> Upload</button>
         </div>
       </form>
     </div>
diff --git a/client_location_add_modal.php b/client_location_add_modal.php
index b75aee7e..82472e84 100644
--- a/client_location_add_modal.php
+++ b/client_location_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt"></i> New Location</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt"></i> Creating location</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -30,7 +30,7 @@
             <div class="tab-pane fade show active" id="pills-address">
 
               <div class="form-group">
-                <label>Location Name / Primary <strong class="text-danger">*</strong></label>
+                <label>Location Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary</span></label>
                 <div class="input-group">
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-map-marker"></i></span>
@@ -165,8 +165,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_location" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_location" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/client_location_edit_modal.php b/client_location_edit_modal.php
index bb6ba3c2..5ddd97fa 100644
--- a/client_location_edit_modal.php
+++ b/client_location_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt"></i> <?php echo $location_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt"></i> Editing location: <strong><?php echo $location_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -32,7 +32,7 @@
             <div class="tab-pane fade show active" id="pills-address<?php echo $location_id; ?>">
 
               <div class="form-group">
-                <label>Location Name / Primary <strong class="text-danger">*</strong></label>
+                <label>Location Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary</span></label>
                 <div class="input-group">
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-map-marker"></i></span>
@@ -151,7 +151,7 @@
               </div>
 
               <div class="form-group">
-                <textarea class="form-control" rows="6" name="notes" placeholder="Enter some notes"><?php echo $location_notes; ?></textarea>
+                <textarea class="form-control" rows="5" name="notes" placeholder="Enter some notes"><?php echo $location_notes; ?></textarea>
               </div>
 
             </div>
@@ -174,8 +174,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_location" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_location" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/client_login_add_modal.php b/client_login_add_modal.php
index aa92daab..202e7d9f 100644
--- a/client_login_add_modal.php
+++ b/client_login_add_modal.php
@@ -201,8 +201,8 @@
           </div>
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_login" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_login" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/client_login_edit_modal.php b/client_login_edit_modal.php
index 8991fb53..a1e6a497 100644
--- a/client_login_edit_modal.php
+++ b/client_login_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-key"></i> <?php echo $login_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-key"></i> Editing password: <strong><?php echo $login_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -207,8 +207,8 @@
           </div>
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_login" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_login" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/client_network_add_modal.php b/client_network_add_modal.php
index 38c8316c..471f7c8b 100644
--- a/client_network_add_modal.php
+++ b/client_network_add_modal.php
@@ -87,8 +87,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_network" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_network" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/client_network_edit_modal.php b/client_network_edit_modal.php
index 32eff29b..f47d48dc 100644
--- a/client_network_edit_modal.php
+++ b/client_network_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-network-wired"></i><span id="editNetworkHeader"></span></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-network-wired"></i> Edit network: <span class="text-bold" id="editNetworkHeader"></span></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -75,8 +75,8 @@
           
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_network" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_network" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/client_networks.php b/client_networks.php
index fbf785f3..4500dbf8 100644
--- a/client_networks.php
+++ b/client_networks.php
@@ -155,7 +155,7 @@ function populateNetworkEditModal(client_id, network_id) {
       const locations = response.locations;
 
       // Populate the network modal fields
-      document.getElementById("editNetworkHeader").innerText = " " + network.network_name;
+      document.getElementById("editNetworkHeader").innerText = network.network_name;
       document.getElementById("editNetworkId").value = network_id;
       document.getElementById("editNetworkName").value = network.network_name;
       document.getElementById("editNetworkVlan").value = network.network_vlan;
diff --git a/client_service_add_modal.php b/client_service_add_modal.php
index dfc76d5d..858ebe5d 100644
--- a/client_service_add_modal.php
+++ b/client_service_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog modal-md">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-stream mr-2"></i> New Service</h5>
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-stream"></i> New Service</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
@@ -96,10 +96,8 @@
 
             <div class="tab-pane fade" id="pills-general">
               <div class="form-group">
-                <label for="contacts">Contacts</label>
-                <p></p>
-                <select class="form-select" id="contacts" name="contacts[]" multiple="multiple">
-                  <option value="">- Contacts -</option>
+                <label for="contacts">Select related Contacts</label>
+                <select multiple class="form-control" id="contacts" name="contacts[]">
                   <?php
                   $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = '$client_id'");
                   while($row = mysqli_fetch_array($sql)){
@@ -112,10 +110,8 @@
               </div>
 
               <div class="form-group">
-                <label for="vendors">Vendors</label>
-                <p></p>
-                <select class="form-select" id="vendors" name="vendors[]" multiple="multiple">
-                  <option value="">- Vendors -</option>
+                <label for="vendors">Select related vendors</label>
+                <select multiple class="form-control" id="vendors" name="vendors[]">
                   <?php
                   $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = '$client_id'");
                   while($row = mysqli_fetch_array($sql)){
@@ -128,10 +124,8 @@
               </div>
 
               <div class="form-group">
-                <label for="documents">Documents</label>
-                <p></p>
-                <select class="form-select" id="documents" name="documents[]" multiple="multiple">
-                  <option value="">- Documents -</option>
+                <label for="documents">Select related documents</label>
+                <select multiple class="form-control" id="documents" name="documents[]">
                   <?php
                   $sql = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_client_id = '$client_id'");
                   while($row = mysqli_fetch_array($sql)){
@@ -154,10 +148,8 @@
 
                 <div class="col">
                   <div class="form-group">
-                    <label for="assets">Assets</label>
-                    <p></p>
-                    <select class="form-select" id="assets" name="assets[]" multiple="multiple">
-                      <option value="">- Assets -</option>
+                    <label for="assets">Select related assets</label>
+                    <select multiple class="form-control" id="assets" name="assets[]">
                       <?php
                       $sql = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = '$client_id'");
                       while($row = mysqli_fetch_array($sql)){
@@ -172,10 +164,8 @@
 
                 <div class="col">
                   <div class="form-group">
-                    <label for="logins">Logins</label>
-                    <p></p>
-                    <select class="form-select" id="logins" name="logins[]" multiple="multiple">
-                      <option value="">- Logins -</option>
+                    <label for="logins">Select related logins</label>
+                    <select multiple class="form-control" id="logins" name="logins[]">
                       <?php
                       $sql = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_client_id = '$client_id'");
                       while($row = mysqli_fetch_array($sql)){
@@ -195,10 +185,8 @@
 
                 <div class="col">
                   <div class="form-group">
-                    <label for="domains">Domains</label>
-                    <p></p>
-                    <select class="form-select" id="domains" name="domains[]" multiple="multiple">
-                      <option value="">- Domains -</option>
+                    <label for="domains">Select related domains</label>
+                    <select multiple class="form-control" id="domains" name="domains[]">
                       <?php
                       $sql = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_client_id = '$client_id'");
                       while($row = mysqli_fetch_array($sql)){
@@ -213,10 +201,8 @@
 
                 <div class="col">
                   <div class="form-group">
-                    <label for="certificates">Certificates</label>
-                    <p></p>
-                    <select class="form-select" id="certificates" name="certificates[]" multiple="multiple">
-                      <option value="">- Certificates -</option>
+                    <label for="certificates">Select related certificates</label>
+                    <select multiple class="form-control" id="certificates" name="certificates[]">
                       <?php
                       $sql = mysqli_query($mysqli, "SELECT * FROM certificates WHERE certificate_client_id = '$client_id'");
                       while($row = mysqli_fetch_array($sql)){
@@ -237,8 +223,8 @@
           </div>
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_service" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_service" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/client_service_edit_modal.php b/client_service_edit_modal.php
index 598dd136..6829bb2b 100644
--- a/client_service_edit_modal.php
+++ b/client_service_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog modal-md">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-stream mr-2"></i><?php echo "Edit $service_name"; ?> </h5>
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-stream"></i> Editing service: <strong><?php echo "$service_name"; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
@@ -98,9 +98,7 @@
             <div class="tab-pane fade" id="pills-general<?php echo $service_id ?>">
               <div class="form-group">
                 <label for="contacts">Contacts</label>
-                <p></p>
-                <select class="form-select" id="contacts" name="contacts[]" multiple="multiple">
-                  <option value="">- Contacts -</option>
+                <select multiple class="form-control" id="contacts" name="contacts[]">
                   <?php
                   // Get just the currently selected contact IDs
                   $selected_ids = array_column(mysqli_fetch_all($sql_contacts,MYSQLI_ASSOC), "contact_id");
@@ -126,9 +124,7 @@
 
               <div class="form-group">
                 <label for="vendors">Vendors</label>
-                <p></p>
-                <select class="form-select" id="vendors" name="vendors[]" multiple="multiple">
-                  <option value="">- Vendors -</option>
+                <select multiple class="form-control" id="vendors" name="vendors[]">
                   <?php
                   $selected_ids = array_column(mysqli_fetch_all($sql_vendors,MYSQLI_ASSOC), "vendor_id");
 
@@ -150,9 +146,7 @@
 
               <div class="form-group">
                 <label for="documents">Documents</label>
-                <p></p>
-                <select class="form-select" id="documents" name="documents[]" multiple="multiple">
-                  <option value="">- Documents -</option>
+                <select multiple class="form-control" id="documents" name="documents[]">
                   <?php
                   $selected_ids = array_column(mysqli_fetch_all($sql_docs,MYSQLI_ASSOC), "document_id");
 
@@ -185,9 +179,7 @@
                 <div class="col">
                   <div class="form-group">
                     <label for="assets">Assets</label>
-                    <p></p>
-                    <select class="form-select" id="assets" name="assets[]" multiple="multiple">
-                      <option value="">- Assets -</option>
+                    <select multiple class="form-control" id="assets" name="assets[]">
                       <?php
                       $selected_ids = array_column(mysqli_fetch_all($sql_assets,MYSQLI_ASSOC), "asset_id");
 
@@ -211,9 +203,7 @@
                 <div class="col">
                   <div class="form-group">
                     <label for="logins">Logins</label>
-                    <p></p>
-                    <select class="form-select" id="logins" name="logins[]" multiple="multiple">
-                      <option value="">- Logins -</option>
+                    <select multiple class="form-control" id="logins" name="logins[]">
                       <?php
                       $selected_ids = array_column(mysqli_fetch_all($sql_logins,MYSQLI_ASSOC), "login_id");
 
@@ -242,9 +232,7 @@
                 <div class="col">
                   <div class="form-group">
                     <label for="domains">Domains</label>
-                    <p></p>
-                    <select class="form-select" id="domains" name="domains[]" multiple="multiple">
-                      <option value="">- Domains -</option>
+                    <select multiple class="form-control" id="domains" name="domains[]">
                       <?php
                       $selected_ids = array_column(mysqli_fetch_all($sql_domains,MYSQLI_ASSOC), "domain_id");
 
@@ -268,9 +256,7 @@
                 <div class="col">
                   <div class="form-group">
                     <label for="certificates">Certificates</label>
-                    <p></p>
-                    <select class="form-select" id="certificates" name="certificates[]" multiple="multiple">
-                      <option value="">- Certificates -</option>
+                    <select multiple class="form-control" id="certificates" name="certificates[]">
                       <?php
                       $selected_ids = array_column(mysqli_fetch_all($sql_certificates,MYSQLI_ASSOC), "certificate_id");
 
@@ -298,8 +284,8 @@
           </div>
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_service" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_service" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/client_software_add_modal.php b/client_software_add_modal.php
index 358fd578..393bdfac 100644
--- a/client_software_add_modal.php
+++ b/client_software_add_modal.php
@@ -89,7 +89,7 @@
                 <label>Seats</label>
                 <div class="input-group">
                   <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                    <span class="input-group-text"><i class="fa fa-fw fa-chair"></i></span>
                   </div>
                   <input type="number" class="form-control" name="seats" placeholder="Number of seats"> 
                 </div>
@@ -229,8 +229,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_software" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_software" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/client_software_edit_modal.php b/client_software_edit_modal.php
index 14c10194..52733b62 100644
--- a/client_software_edit_modal.php
+++ b/client_software_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-cube"></i> <?php echo $software_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-cube"></i> Editing license: <strong><?php echo $software_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -229,8 +229,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_software" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_software" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/expense_add_modal.php b/expense_add_modal.php
index 23845857..438ac60a 100644
--- a/expense_add_modal.php
+++ b/expense_add_modal.php
@@ -103,7 +103,7 @@
 
           <div class="form-group">
             <label>Description <strong class="text-danger">*</strong></label>
-            <textarea class="form-control" rows="4" name="description" placeholder="Enter a description" required></textarea>
+            <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required></textarea>
           </div>
           
           <div class="form-row">
@@ -158,8 +158,8 @@
           
         </div>
         <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>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_expense" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/expense_copy_modal.php b/expense_copy_modal.php
index bc65e6eb..9aaa7b5d 100644
--- a/expense_copy_modal.php
+++ b/expense_copy_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog modal-lg">
     <div class="modal-content bg-dark">
       <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-copy mr-2"></i>Copy Expense</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-copy"></i> Copying expense</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
@@ -100,7 +100,7 @@
 
           <div class="form-group">
             <label>Description <strong class="text-danger">*</strong></label>
-            <textarea class="form-control" rows="4" name="description" placeholder="Enter a description" required><?php echo $expense_description; ?></textarea>
+            <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required><?php echo $expense_description; ?></textarea>
           </div>
           
           <div class="form-row">
@@ -147,8 +147,8 @@
         </div>
         
         <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>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_expense" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Copy</button>
         </div>
       </form>
     </div>
diff --git a/expense_edit_modal.php b/expense_edit_modal.php
index fb6a0d3f..f581464f 100644
--- a/expense_edit_modal.php
+++ b/expense_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog modal-lg">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-edit mr-2"></i>Edit Expense</h5>
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-edit"></i> Editing expense</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
@@ -106,7 +106,7 @@
             
           <div class="form-group">
             <label>Description <strong class="text-danger">*</strong></label>
-            <textarea class="form-control" rows="4" name="description" placeholder="Enter a description" required><?php echo $expense_description; ?></textarea>
+            <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required><?php echo $expense_description; ?></textarea>
           </div>
           
           <div class="form-row">
@@ -161,8 +161,8 @@
         
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_expense" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_expense" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/expense_export_modal.php b/expense_export_modal.php
index 3225f62b..3d89702b 100644
--- a/expense_export_modal.php
+++ b/expense_export_modal.php
@@ -9,19 +9,31 @@
 			</div>
 			<form action="post.php" method="post" autocomplete="off">
 				<div class="modal-body bg-white">
-          <div class="form-group">
+          
+					<div class="form-group">
             <label>Date From</label>
-            <input type="date" class="form-control" name="date_from" max="2999-12-31" value="<?php echo $dtf; ?>">
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+              </div>
+              <input type="date" class="form-control" name="date_from" max="2999-12-31" value="<?php echo $dtf; ?>">
+            </div>
           </div>
    
           <div class="form-group">
             <label>Date To</label>
-            <input type="date" class="form-control" name="date_to" max="2999-12-31" value="<?php echo $dtt; ?>">
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+              </div>
+              <input type="date" class="form-control" name="date_to" max="2999-12-31" value="<?php echo $dtt; ?>">
+            </div>
           </div>
           
 				</div>
 				<div class="modal-footer bg-white">
-					<button type="submit" name="export_expenses_csv" class="btn btn-primary">Download CSV</button>
+					<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+					<button type="submit" name="export_expenses_csv" class="btn btn-primary text-bold"><i class="fa fa-fw fa-download"></i> Download CSV</button>
 				</div>
 			</form>
 		</div>
diff --git a/expense_refund_modal.php b/expense_refund_modal.php
index b063e566..9968fc01 100644
--- a/expense_refund_modal.php
+++ b/expense_refund_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog modal-lg">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-recycle"></i> Refund</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-sync"></i> Refunding expense</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -38,7 +38,7 @@
           
           <div class="form-group">
             <label>Description</label>
-            <textarea class="form-control" rows="4" name="description" placeholder="Enter a description" required>Refund: <?php echo $expense_description; ?></textarea>
+            <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required>Refund: <?php echo $expense_description; ?></textarea>
           </div>
           
           <div class="form-group">
@@ -58,8 +58,8 @@
           
         </div>
         <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>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_expense" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Refund</button>
         </div>
       </form>
     </div>
diff --git a/invoice_add_modal.php b/invoice_add_modal.php
index d1b75797..9b71be4f 100644
--- a/invoice_add_modal.php
+++ b/invoice_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-file mr-2"></i>New Invoice</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-file"></i> New Invoice</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -90,7 +90,7 @@
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_invoice" class="btn btn-primary"><strong><i class="fas fa-check"></i> Create</strong></button>
+          <button type="submit" name="add_invoice" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/invoice_copy_modal.php b/invoice_copy_modal.php
index 42910e63..b877ccbc 100644
--- a/invoice_copy_modal.php
+++ b/invoice_copy_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fas fa-copy mr-2"></i>Copying <?php echo "$invoice_prefix$invoice_number"; ?></h5>
+        <h5 class="modal-title"><i class="fas fa-copy mr-2"></i>Copying invoice: <strong><?php echo "$invoice_prefix$invoice_number"; ?></strong> - <?php echo $client_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -25,7 +25,7 @@
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_invoice_copy" class="btn btn-primary"><strong><i class="fas fa-check"></i> Copy</strong></button>
+          <button type="submit" name="add_invoice_copy" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Copy</button>
         </div>
       </form>
     </div>
diff --git a/invoice_edit_modal.php b/invoice_edit_modal.php
index e0915795..0494b631 100644
--- a/invoice_edit_modal.php
+++ b/invoice_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-file mr-2"></i><?php echo "$invoice_prefix$invoice_number"; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-file"></i> Editing invoice: <strong><?php echo "$invoice_prefix$invoice_number"; ?></strong> - <?php echo $client_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
diff --git a/product_add_modal.php b/product_add_modal.php
index 82d2b144..95599d9d 100644
--- a/product_add_modal.php
+++ b/product_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fas fa-box mr-2"></i>New Product</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-box"></i> New Product</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -90,7 +90,7 @@
 
           <div class="form-group">
             <label>Description</label>
-            <textarea class="form-control" rows="8" name="description" placeholder="Product description"></textarea>
+            <textarea class="form-control" rows="5" name="description" placeholder="Product description"></textarea>
           </div>
         
         </div>
diff --git a/product_edit_modal.php b/product_edit_modal.php
index 19cbc702..9d08a61c 100644
--- a/product_edit_modal.php
+++ b/product_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-box mr-2"></i><?php echo $product_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-box"></i> Editing product: <strong><?php echo $product_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -89,14 +89,14 @@
 
           <div class="form-group">
             <label>Description</label>
-            <textarea class="form-control" rows="8" name="description"><?php echo $product_description; ?></textarea>
+            <textarea class="form-control" rows="5" name="description"><?php echo $product_description; ?></textarea>
           </div>
         
         </div>
         
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_product" class="btn btn-primary"><strong><i class="fa fa-check"></i> Save</strong></button>
+          <button type="submit" name="edit_product" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/quote_add_modal.php b/quote_add_modal.php
index 2d9e9052..d72886a5 100644
--- a/quote_add_modal.php
+++ b/quote_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-file"></i> New Quote</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-file"></i> New Quote</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -91,7 +91,7 @@
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_quote" class="btn btn-primary"><strong><i class="fas fa-check"></i> Create</strong></button>
+          <button type="submit" name="add_quote" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/quote_copy_modal.php b/quote_copy_modal.php
index 183c352a..2234245e 100644
--- a/quote_copy_modal.php
+++ b/quote_copy_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-copy"></i> Copying <?php echo "$quote_prefix$quote_number"; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-copy"></i> Copying quote: <strong><?php echo "$quote_prefix$quote_number"; ?></strong> - <?php echo $client_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -24,7 +24,7 @@
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_quote_copy" class="btn btn-primary"><strong><i class="fas fa-check"></i> Create Copy</strong></button>
+          <button type="submit" name="add_quote_copy" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Copy</button>
         </div>
       </form>
     </div>
diff --git a/quote_edit_modal.php b/quote_edit_modal.php
index a2fc837c..7d1e07d4 100644
--- a/quote_edit_modal.php
+++ b/quote_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fas fa-file"></i> <?php echo "$quote_prefix$quote_number"; ?></h5>
+        <h5 class="modal-title text-white"><i class="fas fa-fw fa-file"></i> Editing quote: <strong><?php echo "$quote_prefix$quote_number"; ?></strong> - <?php echo $client_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
diff --git a/ticket_add_modal.php b/ticket_add_modal.php
index 8df31684..1b45ccdd 100644
--- a/ticket_add_modal.php
+++ b/ticket_add_modal.php
@@ -23,7 +23,7 @@
 
 
                     <div class="form-group">
-                        <textarea class="form-control summernote" rows="8" name="details"></textarea>
+                        <textarea class="form-control summernote" rows="5" name="details"></textarea>
                     </div>
 
                     <div class="form-group">
@@ -135,7 +135,7 @@
                 </div>
                 <div class="modal-footer bg-white">
                     <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-                    <button type="submit" name="add_ticket" class="btn btn-primary"><strong><i class="fa fa-check"></i> Create</strong></button>
+                    <button type="submit" name="add_ticket" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
                 </div>
             </form>
         </div>
diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php
index dff3626c..6971a95c 100644
--- a/ticket_edit_modal.php
+++ b/ticket_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog modal-lg">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-life-ring"></i> Ticket <?php echo "$ticket_prefix$ticket_number"; ?> for <?php echo $client_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-life-ring"></i> Editing Ticket: <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong> - <?php echo $client_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -118,8 +118,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_ticket" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_ticket" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/transfer_add_modal.php b/transfer_add_modal.php
index c4a1b63b..71e5a16f 100644
--- a/transfer_add_modal.php
+++ b/transfer_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-exchange-alt"></i> Transfer Money</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-exchange-alt"></i> Transfering Funds</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -114,14 +114,14 @@
           </div>
 
           <div class="form-group">
-            <textarea class="form-control" rows="4" name="notes" placeholder="Enter some notes"></textarea>
+            <textarea class="form-control" rows="5" name="notes" placeholder="Enter some notes"></textarea>
           </div>
 
         </div>
 
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_transfer" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_transfer" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Transfer</button>
         </div>
       </form>
     </div>
diff --git a/transfer_edit_modal.php b/transfer_edit_modal.php
index 15d3bf1e..58919799 100644
--- a/transfer_edit_modal.php
+++ b/transfer_edit_modal.php
@@ -116,15 +116,15 @@
           </div>
             
           <div class="form-group">
-            <textarea class="form-control" rows="4" name="notes" placeholder="Enter some notes"><?php echo $transfer_notes; ?></textarea>
+            <textarea class="form-control" rows="5" name="notes" placeholder="Enter some notes"><?php echo $transfer_notes; ?></textarea>
           </div>
 
 
         </div>
 
         <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>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_transfer" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/trip_add_modal.php b/trip_add_modal.php
index c16c8c10..8465564e 100644
--- a/trip_add_modal.php
+++ b/trip_add_modal.php
@@ -22,7 +22,7 @@
             </div>
             
             <div class="form-group col">
-              <label>Miles / Roundtrip <strong class="text-danger">*</strong></label>
+              <label>Miles <strong class="text-danger">*</strong> / <span class="text-secondary">Roundtrip</span></label>
               <div class="input-group">
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
@@ -119,8 +119,8 @@
         </div>
 
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_trip" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_trip" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Create</button>
         </div>
       </form>
     </div> <!-- Modal Content -->
diff --git a/trip_copy_modal.php b/trip_copy_modal.php
index fc78b591..e9158fc2 100644
--- a/trip_copy_modal.php
+++ b/trip_copy_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-route"></i> Copy Trip</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-route"></i> Copying Trip</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -23,7 +23,7 @@
             </div>
 
             <div class="form-group col">
-              <label>Miles <strong class="text-danger">*</strong></label>
+              <label>Miles <strong class="text-danger">*</strong> / <span class="text-secondary">Roundtrip</span></label>
               <div class="input-group">
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
@@ -120,8 +120,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_trip" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_trip" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Copy</button>
         </div>
       </form>
     </div>
diff --git a/trip_edit_modal.php b/trip_edit_modal.php
index 3550a83c..d7999806 100644
--- a/trip_edit_modal.php
+++ b/trip_edit_modal.php
@@ -24,7 +24,7 @@
             </div>
             
             <div class="form-group col">
-              <label>Miles / Roundtrip <strong class="text-danger">*</strong></label>
+              <label>Miles <strong class="text-danger">*</strong> / <span class="text-secondary">Roundtrip</span></label>
               <div class="input-group">
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
@@ -122,8 +122,8 @@
         </div>
  
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_trip" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_trip" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Save</button>
         </div>
       </form>
     </div>
diff --git a/trip_export_modal.php b/trip_export_modal.php
index c782b035..bf6020fc 100644
--- a/trip_export_modal.php
+++ b/trip_export_modal.php
@@ -9,19 +9,31 @@
 			</div>
 			<form action="post.php" method="post" autocomplete="off">
 				<div class="modal-body bg-white">
+          
           <div class="form-group">
             <label>Date From</label>
-            <input type="date" class="form-control" name="date_from" max="2999-12-31" value="<?php echo $dtf; ?>">
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+              </div>
+              <input type="date" class="form-control" name="date_from" max="2999-12-31" value="<?php echo $dtf; ?>">
+            </div>
           </div>
    
           <div class="form-group">
             <label>Date To</label>
-            <input type="date" class="form-control" name="date_to" max="2999-12-31" value="<?php echo $dtt; ?>">
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+              </div>
+              <input type="date" class="form-control" name="date_to" max="2999-12-31" value="<?php echo $dtt; ?>">
+            </div>
           </div>
           
 				</div>
 				<div class="modal-footer bg-white">
-					<button type="submit" name="export_trips_csv" class="btn btn-primary">Download CSV</button>
+					<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+					<button type="submit" name="export_trips_csv" class="btn btn-primary text-bold"><i class="fa fa-fw fa-download"></i> Download CSV</button>
 				</div>
 			</form>
 		</div>
diff --git a/vendor_add_modal.php b/vendor_add_modal.php
index ad75bd4f..7aa3e4c7 100644
--- a/vendor_add_modal.php
+++ b/vendor_add_modal.php
@@ -158,7 +158,7 @@
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_vendor" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check"></i> Create Vendor</button>
+          <button type="submit" name="add_vendor" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
         </div>
       </form>
     </div>
diff --git a/vendor_edit_modal.php b/vendor_edit_modal.php
index 520ea17a..d1478d03 100644
--- a/vendor_edit_modal.php
+++ b/vendor_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-building"></i> <?php echo $vendor_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-building"></i> Editing vendor: <strong><?php echo $vendor_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>