diff --git a/agent/clients.php b/agent/clients.php
index eb931760..655f0353 100644
--- a/agent/clients.php
+++ b/agent/clients.php
@@ -86,7 +86,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <div class="card-tools">
             <?php if (lookupUserPermission("module_client") >= 2) { ?>
                 <div class="btn-group">
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addClientModal">
+                    <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/client/client_add.php<?php if ($leads_filter) { echo "?lead=1"; } ?>">
                         <i class="fas fa-plus mr-2"></i>New
                         <?php if ($leads_filter == 0) { echo "Client"; } else { echo "Lead"; } ?>
                     </button>
@@ -617,7 +617,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/client/client_add.php";
 require_once "modals/client/client_import.php";
 require_once "modals/client/client_export.php";
 require_once "../includes/footer.php";
diff --git a/agent/modals/client/client_add.php b/agent/modals/client/client_add.php
index 1d99552c..24bf64aa 100644
--- a/agent/modals/client/client_add.php
+++ b/agent/modals/client/client_add.php
@@ -1,378 +1,386 @@
-<div class="modal" id="addClientModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content border-dark">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>Creating New <?php if($leads_filter == 0){ echo "Client"; } else { echo "Lead"; } ?></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            
-            <ul class="modal-header nav nav-pills nav-justified">
-                <li class="nav-item">
-                    <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" data-toggle="pill" href="#pills-location">Location</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" data-toggle="pill" href="#pills-contact" id="contactNavPill">Contact</a>
-                </li>
-                <?php if ($config_module_enable_accounting) { ?>
-                    <li class="nav-item">
-                        <a class="nav-link" data-toggle="pill" href="#pills-billing">Billing</a>
-                    </li>
-                <?php } ?>
-                <li class="nav-item">
-                    <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
-                </li>
-            </ul>
-           
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                <div class="modal-body">
+<?php
 
-                    <div class="tab-content">
+require_once '../../../includes/modal_header.php';
 
-                        <div class="tab-pane fade show active" id="pills-details">
+// Filters
+$leads_filter = intval($_GET['lead'] ?? 0);
 
-                            <div class="form-group">
-                                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Is Lead</span></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Name or Company" maxlength="200" required autofocus>
-                                    <div class="input-group-append">
-                                        <div class="input-group-text">
-                                            <input type="checkbox" name="lead" value="1" <?php if($leads_filter == 1){ echo "checked"; } ?>>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
+// Selects
+$referral_sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL ORDER BY category_name ASC");
 
-                            <div class="form-group">
-                                <label>Shortened Name</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="abbreviation" placeholder="Shortned name for client - Max chars 6" maxlength="6" oninput="this.value = this.value.toUpperCase()">
-                                </div>
-                            </div>
+$sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 1 ORDER BY tag_name ASC");
 
-                            <div class="form-group">
-                                <label>Industry</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-briefcase"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="type" placeholder="Company Type" maxlength="200">
-                                </div>
-                            </div>
+ob_start();
 
-                            <div class="form-group">
-                                <label>Referral</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
-                                    </div>
-                                    <select class="form-control select2" data-tags="true" name="referral">
-                                        <option value="">- Select Referral -</option>
-                                        <?php
+?>
 
-                                        $referral_sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                                        while ($row = mysqli_fetch_array($referral_sql)) {
-                                            $referral = nullable_htmlentities($row['category_name']); ?>
-                                            <option><?php echo $referral; ?></option>
-                                        <?php } ?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>Creating New <?php if($leads_filter == 0){ echo "Client"; } else { echo "Lead"; } ?></h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
 
-                                    </select>
-                                    <div class="input-group-append">
-                                        <button class="btn btn-secondary ajax-modal" type="button"
-                                            data-modal-url="../admin/modals/category/category_add.php?category=Referral">
-                                            <i class="fas fa-fw fa-plus"></i>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
+<ul class="modal-header nav nav-pills nav-justified">
+    <li class="nav-item">
+        <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" data-toggle="pill" href="#pills-location">Location</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" data-toggle="pill" href="#pills-contact" id="contactNavPill">Contact</a>
+    </li>
+    <?php if ($config_module_enable_accounting) { ?>
+        <li class="nav-item">
+            <a class="nav-link" data-toggle="pill" href="#pills-billing">Billing</a>
+        </li>
+    <?php } ?>
+    <li class="nav-item">
+        <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
+    </li>
+</ul>
 
-                            <div class="form-group">
-                                <label>Website</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="website" placeholder="ex. google.com" maxlength="200">
-                                </div>
-                            </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+    <div class="modal-body">
 
-                            <div class="form-group">
-                                <label>Tags</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="tags[]" data-placeholder="- Select Tags -"multiple>
-                                        <?php
+        <div class="tab-content">
 
-                                        $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 1 ORDER BY tag_name ASC");
-                                        while ($row = mysqli_fetch_array($sql_tags_select)) {
-                                            $tag_id_select = intval($row['tag_id']);
-                                            $tag_name_select = nullable_htmlentities($row['tag_name']);
-                                            ?>
-                                            <option value="<?php echo $tag_id_select; ?>"><?php echo $tag_name_select; ?></option>
-                                        <?php } ?>
-
-                                    </select>
-                                    <div class="input-group-append">
-                                        <button class="btn btn-secondary ajax-modal" type="button"
-                                            data-modal-url="../admin/modals/tag/tag_add.php?type=1">
-                                            <i class="fas fa-fw fa-plus"></i>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
+            <div class="tab-pane fade show active" id="pills-details">
 
+                <div class="form-group">
+                    <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Is Lead</span></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                         </div>
-
-                        <div class="tab-pane fade" id="pills-location">
-
-                            <div class="form-group">
-                                <label>Address</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="address" placeholder="Street Address" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>City</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="city" placeholder="City" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>State / Province</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="state" placeholder="State or Province" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Postal Code</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Country</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-globe-americas"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="country">
-                                        <option value="">- Select Country -</option>
-                                        <?php foreach($countries_array as $country_name) { ?>
-                                            <option <?php if ($session_company_country == $country_name) { echo "selected"; } ?> ><?php echo $country_name; ?></option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                            
-                            <label>Location Phone / <span class="text-secondary">Extension</span></label>
-                            <div class="form-row">
-                                <div class="col-9">
-                                    <div class="form-group">
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                            </div>
-                                            <input type="tel" class="form-control col-2" name="location_phone_country_code" placeholder="+" maxlength="4">
-                                            <input type="tel" class="form-control" name="location_phone" placeholder="Phone Number" maxlength="200">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-3">
-                                    <div class="form-group">
-                                        <input type="text" class="form-control" name="location_extension" placeholder="ext." maxlength="200">
-                                    </div>
-                                </div>
-                            </div>
-
-                            <label>Location Fax</label>    
-                            <div class="form-row">
-                                <div class="col-9">
-                                    <div class="form-group">
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <span class="input-group-text"><i class="fa fa-fw fa-fax"></i></span>
-                                            </div>
-                                            <input type="tel" class="form-control col-2" name="location_fax_country_code" placeholder="+" maxlength="4">
-                                            <input type="tel" class="form-control" name="location_fax" placeholder="Fax Number">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-contact">
-
-                            <div class="form-group">
-                                <label>Primary Contact <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" id="primaryContact" name="contact" placeholder="Primary Contact Person" maxlength="200" required autofocus>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Title</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="title" placeholder="Title" maxlength="200">
-                                </div>
-                            </div>
-
-                            <label>Contact Phone / <span class="text-secondary">Extension</span></label>
-                            <div class="form-row">
-                                <div class="col-9">
-                                    <div class="form-group">
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                            </div>
-                                            <input type="tel" class="form-control col-2" name="contact_phone_country_code" placeholder="+" maxlength="4">
-                                            <input type="tel" class="form-control" name="contact_phone" placeholder="Phone Number" maxlength="200">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-3">
-                                    <div class="form-group">
-                                        <input type="text" class="form-control" name="contact_extension" placeholder="ext." maxlength="200">
-                                    </div>
-                                </div>
-                            </div>
-
-                            <label>Mobile</label>    
-                            <div class="form-row">
-                                <div class="col-9">
-                                    <div class="form-group">
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
-                                            </div>
-                                            <input type="tel" class="form-control col-2" name="contact_mobile_country_code" placeholder="+" maxlength="4">
-                                            <input type="tel" class="form-control" name="contact_mobile" placeholder="Mobile Phone Number">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Contact Email</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-                                    </div>
-                                    <input type="email" class="form-control" name="contact_email" placeholder="Contact's Email Address" maxlength="200">
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <?php if ($config_module_enable_accounting) { ?>
-
-                            <div class="tab-pane fade" id="pills-billing">
-
-                                <div class="form-group">
-                                    <label>Hourly Rate</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="rate" placeholder="0.00" value="<?php echo "$config_default_hourly_rate"; ?>">
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Currency <strong class="text-danger">*</strong></label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="currency_code" required>
-                                            <option value="">- Select Currency -</option>
-                                            <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
-                                                <option <?php if ($session_company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
-                                            <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Payment Terms</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="net_terms">
-                                            <?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
-                                                <option <?php if ($config_default_net_terms == $net_term_value) { echo "selected"; } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
-                                            <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label>Tax ID</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
-                                        </div>
-                                        <input type="text" class="form-control" name="tax_id_number" placeholder="Tax ID Number" maxlength="255">
-                                    </div>
-                                </div>
-
-                            </div>
-
-                        <?php } ?>
-
-                        <div class="tab-pane fade" id="pills-notes">
-                            <div class="form-group">
-                                <textarea class="form-control" rows="10" name="notes" placeholder="Enter some notes"></textarea>
+                        <input type="text" class="form-control" name="name" placeholder="Name or Company" maxlength="200" required autofocus>
+                        <div class="input-group-append">
+                            <div class="input-group-text">
+                                <input type="checkbox" name="lead" value="1" <?php if($leads_filter == 1){ echo "checked"; } ?>>
                             </div>
                         </div>
-
                     </div>
                 </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_client" class="btn btn-primary text-bold" onclick="promptPrimaryContact()"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Close</button>
+
+                <div class="form-group">
+                    <label>Shortened Name</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="abbreviation" placeholder="Shortned name for client - Max chars 6" maxlength="6" oninput="this.value = this.value.toUpperCase()">
+                    </div>
                 </div>
-            </form>
+
+                <div class="form-group">
+                    <label>Industry</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-briefcase"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="type" placeholder="Company Type" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Referral</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
+                        </div>
+                        <select class="form-control select2" data-tags="true" name="referral">
+                            <option value="">- Select Referral -</option>
+                            <?php
+
+                            while ($row = mysqli_fetch_array($referral_sql)) {
+                                $referral = nullable_htmlentities($row['category_name']); ?>
+                                <option><?php echo $referral; ?></option>
+                            <?php } ?>
+
+                        </select>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary ajax-modal" type="button"
+                                data-modal-url="../admin/modals/category/category_add.php?category=Referral">
+                                <i class="fas fa-fw fa-plus"></i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Website</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="website" placeholder="ex. google.com" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Tags</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
+                        </div>
+                        <select class="form-control select2" name="tags[]" data-placeholder="- Select Tags -"multiple>
+                            <?php
+
+                            while ($row = mysqli_fetch_array($sql_tags_select)) {
+                                $tag_id_select = intval($row['tag_id']);
+                                $tag_name_select = nullable_htmlentities($row['tag_name']);
+                                ?>
+                                <option value="<?php echo $tag_id_select; ?>"><?php echo $tag_name_select; ?></option>
+                            <?php } ?>
+
+                        </select>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary ajax-modal" type="button"
+                                data-modal-url="../admin/modals/tag/tag_add.php?type=1">
+                                <i class="fas fa-fw fa-plus"></i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-location">
+
+                <div class="form-group">
+                    <label>Address</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="address" placeholder="Street Address" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>City</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="city" placeholder="City" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>State / Province</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="state" placeholder="State or Province" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Postal Code</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Country</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-globe-americas"></i></span>
+                        </div>
+                        <select class="form-control select2" name="country">
+                            <option value="">- Select Country -</option>
+                            <?php foreach($countries_array as $country_name) { ?>
+                                <option <?php if ($session_company_country == $country_name) { echo "selected"; } ?> ><?php echo $country_name; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+                
+                <label>Location Phone / <span class="text-secondary">Extension</span></label>
+                <div class="form-row">
+                    <div class="col-9">
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                </div>
+                                <input type="tel" class="form-control col-2" name="location_phone_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control" name="location_phone" placeholder="Phone Number" maxlength="200">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-3">
+                        <div class="form-group">
+                            <input type="text" class="form-control" name="location_extension" placeholder="ext." maxlength="200">
+                        </div>
+                    </div>
+                </div>
+
+                <label>Location Fax</label>    
+                <div class="form-row">
+                    <div class="col-9">
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-fax"></i></span>
+                                </div>
+                                <input type="tel" class="form-control col-2" name="location_fax_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control" name="location_fax" placeholder="Fax Number">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-contact">
+
+                <div class="form-group">
+                    <label>Primary Contact <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
+                        </div>
+                        <input type="text" class="form-control" id="primaryContact" name="contact" placeholder="Primary Contact Person" maxlength="200" required autofocus>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Title</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="title" placeholder="Title" maxlength="200">
+                    </div>
+                </div>
+
+                <label>Contact Phone / <span class="text-secondary">Extension</span></label>
+                <div class="form-row">
+                    <div class="col-9">
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                </div>
+                                <input type="tel" class="form-control col-2" name="contact_phone_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control" name="contact_phone" placeholder="Phone Number" maxlength="200">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-3">
+                        <div class="form-group">
+                            <input type="text" class="form-control" name="contact_extension" placeholder="ext." maxlength="200">
+                        </div>
+                    </div>
+                </div>
+
+                <label>Mobile</label>    
+                <div class="form-row">
+                    <div class="col-9">
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
+                                </div>
+                                <input type="tel" class="form-control col-2" name="contact_mobile_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control" name="contact_mobile" placeholder="Mobile Phone Number">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Contact Email</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                        </div>
+                        <input type="email" class="form-control" name="contact_email" placeholder="Contact's Email Address" maxlength="200">
+                    </div>
+                </div>
+
+            </div>
+
+            <?php if ($config_module_enable_accounting) { ?>
+
+                <div class="tab-pane fade" id="pills-billing">
+
+                    <div class="form-group">
+                        <label>Hourly Rate</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+                            </div>
+                            <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="rate" placeholder="0.00" value="<?php echo "$config_default_hourly_rate"; ?>">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Currency <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
+                            </div>
+                            <select class="form-control select2" name="currency_code" required>
+                                <option value="">- Select Currency -</option>
+                                <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
+                                    <option <?php if ($session_company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Payment Terms</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                            </div>
+                            <select class="form-control select2" name="net_terms">
+                                <?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
+                                    <option <?php if ($config_default_net_terms == $net_term_value) { echo "selected"; } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Tax ID</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="tax_id_number" placeholder="Tax ID Number" maxlength="255">
+                        </div>
+                    </div>
+
+                </div>
+
+            <?php } ?>
+
+            <div class="tab-pane fade" id="pills-notes">
+                <div class="form-group">
+                    <textarea class="form-control" rows="10" name="notes" placeholder="Enter some notes"></textarea>
+                </div>
+            </div>
+
         </div>
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_client" class="btn btn-primary text-bold" onclick="promptPrimaryContact()"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Close</button>
+    </div>
+</form>
 
 <script>
     // Checks/prompts that the primary contact field (required) is populated
@@ -383,3 +391,6 @@
         }
     }
 </script>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/contact/contact_details.php b/agent/modals/contact/contact_details.php
index b3c3ca12..59e4ff11 100644
--- a/agent/modals/contact/contact_details.php
+++ b/agent/modals/contact/contact_details.php
@@ -380,28 +380,26 @@ ob_start();
                         ?>
                         <tr>
                             <th>
-                                <i class="fa fa-fw text-secondary fa-<?php echo $device_icon; ?> mr-2"></i>
-                                <a class="text-secondary" href="#"
-                                    data-toggle="ajax-modal"
+                                <i class="fa fa-fw text-secondary fa-<?= $device_icon ?> mr-2"></i>
+                                <a href="#" class="ajax-modal"
                                     data-modal-size="lg"
-                                    data-ajax-url="ajax/ajax_asset_details.php"
-                                    data-ajax-id="<?php echo $asset_id; ?>">
-                                    <?php echo $asset_name; ?>
+                                    data-modal-url="modals/asset/asset_details.php?id=<?= $asset_id ?>">
+                                    <?= $asset_name ?>
                                 </a>
                                 <div class="mt-0">
-                                    <small class="text-muted"><?php echo $asset_description; ?></small>
+                                    <small class="text-muted"><?= $asset_description ?></small>
                                 </div>
                             </th>
-                            <td><?php echo $asset_type; ?></td>
+                            <td><?= $asset_type ?></td>
                             <td>
-                                <?php echo $asset_make; ?>
+                                <?= $asset_make ?>
                                 <div class="mt-0">
-                                    <small class="text-muted"><?php echo $asset_model; ?></small>
+                                    <small class="text-muted"><?= $asset_model ?></small>
                                 </div>
                             </td>
-                            <td><?php echo $asset_serial_display; ?></td>
-                            <td><?php echo $asset_install_date_display; ?></td>
-                            <td><?php echo $asset_status; ?></td>
+                            <td><?= $asset_serial_display ?></td>
+                            <td><?= $asset_install_date_display ?></td>
+                            <td><?= $asset_status ?></td>
                         </tr>
 
                         <?php
@@ -417,7 +415,7 @@ ob_start();
         <?php } ?>
 
         <?php if ($credential_count) { ?>
-        <div class="tab-pane fade" id="pills-contact-credentials<?php echo $contact_id; ?>">
+        <div class="tab-pane fade" id="pills-contact-credentials<?= $contact_id ?>">
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover table-sm dataTables" style="width:100%">
                     <thead>
@@ -487,16 +485,16 @@ ob_start();
 
                         ?>
                         <tr>
-                            <td><i class="fa fa-fw fa-key text-secondary mr-2"></i><?php echo $credential_name; ?></td>
-                            <td><?php echo $credential_description; ?></td>
-                            <td><?php echo $credential_username_display; ?></td>
+                            <td><i class="fa fa-fw fa-key text-secondary mr-2"></i><?= $credential_name ?></td>
+                            <td><?= $credential_description ?></td>
+                            <td><?= $credential_username_display ?></td>
                             <td>
-                                <button class="btn p-0" type="button" data-toggle="popover" data-trigger="focus" data-placement="top" data-content="<?php echo $credential_password; ?>"><i class="fas fa-2x fa-ellipsis-h text-secondary"></i><i class="fas fa-2x fa-ellipsis-h text-secondary"></i></button>
+                                <button class="btn p-0" type="button" data-toggle="popover" data-trigger="focus" data-placement="top" data-content="<?= $credential_password ?>"><i class="fas fa-2x fa-ellipsis-h text-secondary"></i><i class="fas fa-2x fa-ellipsis-h text-secondary"></i></button>
 
-                                <button type="button" class='btn btn-sm clipboardjs' data-clipboard-text='<?php echo $credential_password; ?>'><i class='far fa-copy text-secondary'></i></button>
+                                <button type="button" class='btn btn-sm clipboardjs' data-clipboard-text='<?= $credential_password ?>'><i class='far fa-copy text-secondary'></i></button>
                             </td>
-                            <td><?php echo $otp_display; ?></td>
-                            <td><?php echo $credential_uri_display; ?></td>
+                            <td><?= $otp_display ?></td>
+                            <td><?= $credential_uri_display ?></td>
                         </tr>
 
                         <?php
@@ -514,7 +512,7 @@ ob_start();
         <?php } ?>
 
         <?php if ($ticket_count) { ?>
-        <div class="tab-pane fade" id="pills-contact-tickets<?php echo $contact_id; ?>">
+        <div class="tab-pane fade" id="pills-contact-tickets<?= $contact_id ?>">
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover table-sm">
                     <thead class="text-dark">
@@ -576,13 +574,13 @@ ob_start();
                         ?>
 
                         <tr>
-                            <td><a href="ticket.php?client_id=<?php echo $client_id; ?>&ticket_id=<?php echo $ticket_id; ?>"><span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span></a></td>
-                            <td><a href="ticket.php?client_id=<?php echo $client_id; ?>&ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
-                            <td><?php echo $ticket_priority_display; ?></td>
-                            <td><span class='badge badge-pill text-light p-2' style="background-color: <?php echo $ticket_status_color; ?>"><?php echo $ticket_status_name; ?></span></td>
-                            <td><?php echo $ticket_assigned_to_display; ?></td>
-                            <td><?php echo $ticket_updated_at_display; ?></td>
-                            <td><?php echo $ticket_created_at; ?></td>
+                            <td><a href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?= $ticket_id ?>"><span class="badge badge-pill badge-secondary p-3"><?= "$ticket_prefix$ticket_number" ?></span></a></td>
+                            <td><a href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?= $ticket_id ?>"><?= $ticket_subject ?></a></td>
+                            <td><?= $ticket_priority_display ?></td>
+                            <td><span class='badge badge-pill text-light p-2' style="background-color: <?= $ticket_status_color ?>"><?= $ticket_status_name ?></span></td>
+                            <td><?= $ticket_assigned_to_display ?></td>
+                            <td><?= $ticket_updated_at_display ?></td>
+                            <td><?= $ticket_created_at ?></td>
                         </tr>
 
                         <?php
@@ -598,7 +596,7 @@ ob_start();
         <?php } ?>
 
         <?php if ($recurring_ticket_count) { ?>
-        <div class="tab-pane fade" id="pills-contact-recurring-tickets<?php echo $contact_id; ?>">
+        <div class="tab-pane fade" id="pills-contact-recurring-tickets<?= $contact_id ?>">
 
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover table-sm">
@@ -622,10 +620,10 @@ ob_start();
                     ?>
 
                         <tr>
-                            <td class="text-bold"><?php echo $recurring_ticket_subject ?></td>
-                            <td><?php echo $recurring_ticket_priority ?></td>
-                            <td><?php echo $recurring_ticket_frequency ?></td>
-                            <td><?php echo $recurring_ticket_next_run ?></td>
+                            <td class="text-bold"><?= $recurring_ticket_subject ?></td>
+                            <td><?= $recurring_ticket_priority ?></td>
+                            <td><?= $recurring_ticket_frequency ?></td>
+                            <td><?= $recurring_ticket_next_run ?></td>
                         </tr>
 
                     <?php } ?>
@@ -637,7 +635,7 @@ ob_start();
         <?php } ?>
 
         <?php if ($software_count) { ?>
-        <div class="tab-pane fade" id="pills-contact-licenses<?php echo $contact_id; ?>">
+        <div class="tab-pane fade" id="pills-contact-licenses<?= $contact_id ?>">
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover table-sm">
                     <thead class="text-dark">
@@ -687,10 +685,10 @@ ob_start();
 
                         ?>
                         <tr>
-                            <td><?php echo "$software_name $software_version"; ?></td>
-                            <td><?php echo $software_type; ?></td>
-                            <td><?php echo $software_key; ?></td>
-                            <td><?php echo "$seat_count / $software_seats"; ?></td>
+                            <td><?= "$software_name $software_version" ?></td>
+                            <td><?= $software_type ?></td>
+                            <td><?= $software_key ?></td>
+                            <td><?= "$seat_count / $software_seats" ?></td>
                         </tr>
 
                         <?php
@@ -740,11 +738,11 @@ ob_start();
                                     data-modal-url="modals/document/document_view.php?id=<?= $document_id ?>">
                                     <?php echo $document_name; ?>
                                 </a>
-                                <div class="text-secondary"><?php echo $document_description; ?></div>
+                                <div class="text-secondary"><?= $document_description ?></div>
                             </td>
-                            <td><?php echo $document_created_by; ?></td>
-                            <td><?php echo $document_created_at; ?></td>
-                            <td><?php echo $document_updated_at; ?></td>
+                            <td><?= $document_created_by ?></td>
+                            <td><?= $document_created_at ?></td>
+                            <td><?= $document_updated_at ?></td>
                         </tr>
 
                         <?php
@@ -760,7 +758,7 @@ ob_start();
         <?php } ?>
 
         <?php if ($file_count) { ?>
-        <div class="tab-pane fade" id="pills-contact-files<?php echo $contact_id; ?>">
+        <div class="tab-pane fade" id="pills-contact-files<?= $contact_id ?>">
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover table-sm">
                     <thead class="text-dark">
@@ -790,12 +788,12 @@ ob_start();
 
                         <tr>
                             <td>
-                                <div><a href="../uploads/clients/<?php echo $client_id; ?>/<?php echo $file_reference_name; ?>"><?php echo $file_name; ?></a></div>
-                                <div class="text-secondary"><?php echo $file_description; ?></div>
+                                <div><a href="../uploads/clients/<?= $client_id ?>/<?= $file_reference_name ?>" target="_blank"><?= $file_name ?></a></div>
+                                <div class="text-secondary"><?= $file_description ?></div>
                             </td>
-                            <td><?php echo $file_mime_type; ?></td>
-                            <td><?php echo $file_size_KB; ?> KB</td>
-                            <td><?php echo $file_created_at; ?></td>
+                            <td><?= $file_mime_type ?></td>
+                            <td><?= $file_size_KB ?> KB</td>
+                            <td><?= $file_created_at ?></td>
                         </tr>
 
                         <?php
@@ -838,10 +836,10 @@ ob_start();
                         ?>
 
                         <tr>
-                            <td><i class="fa fa-fw <?php echo $note_type_icon; ?> mr-2"></i><?php echo $contact_note_type; ?></td>
-                            <td><?php echo $contact_note; ?></td>
-                            <td><?php echo $note_by; ?></td>
-                            <td><?php echo $contact_note_created_at; ?></td>
+                            <td><i class="fa fa-fw <?= $note_type_icon ?> mr-2"></i><?= $contact_note_type ?></td>
+                            <td><?= $contact_note ?></td>
+                            <td><?= $note_by ?></td>
+                            <td><?= $contact_note_created_at ?></td>
                         </tr>
 
                         <?php