diff --git a/add_client_modal.php b/add_client_modal.php
index 87ff35cb..3f50517d 100644
--- a/add_client_modal.php
+++ b/add_client_modal.php
@@ -10,7 +10,7 @@
       <form action="post.php" method="post" autocomplete="off">
         <div class="modal-body bg-white">
           
-          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab" role="tablist">
+          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab">
             <li class="nav-item">
               <a class="nav-link active" id="pills-details-tab" data-toggle="pill" href="#pills-details">Details</a>
             </li>
@@ -54,53 +54,17 @@
                 </div>
               </div>
 
-              <label>Phone</label>
-             
-              <div class="form-group">
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="phone" placeholder="Phone Number" data-inputmask="'mask': '999-999-9999'" data-mask> 
-                </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="url" class="form-control" name="website" placeholder="ex. https://google.com">
-                </div>
-              </div>
-
             </div>
           
             <div class="tab-pane fade" id="pills-address">
 
-              <div class="form-group">
-                <label>Country</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                  </div>
-                  <select class="form-control select2" name="country">
-                    <option value="">- Country -</option>
-                    <?php foreach($countries_array as $country_name) { ?>
-                    <option><?php echo $country_name; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-
               <div class="form-group">
                 <label>Address</label>
                 <div class="input-group">
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                   </div>
-                  <input type="text" class="form-control" name="address" placeholder="Address">
+                  <input type="text" class="form-control" name="address" placeholder="Street Address">
                 </div>
               </div>
           
@@ -138,6 +102,21 @@
                   <input type="text" class="form-control" name="zip" placeholder="Postal Code">
                 </div>
               </div>
+
+              <div class="form-group">
+                <label>Country</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                  </div>
+                  <select class="form-control select2" name="country">
+                    <option value="">- Country -</option>
+                    <?php foreach($countries_array as $country_name) { ?>
+                    <option><?php echo $country_name; ?></option>
+                    <?php } ?>
+                  </select>
+                </div>
+              </div>
             
             </div>
 
@@ -161,12 +140,12 @@
                       <div class="input-group-prepend">
                         <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
                       </div>
-                      <input type="text" class="form-control" name="contact_phone" placeholder="Phone Number" data-inputmask="'mask': '999-999-9999'" data-mask> 
+                      <input type="text" class="form-control" name="phone" placeholder="Phone Number" data-inputmask="'mask': '999-999-9999'" data-mask> 
                     </div>
                   </div>
                 </div>
                 <div class="col-4">
-                  <input type="text" class="form-control" name="contact_extension" placeholder="Extension">
+                  <input type="text" class="form-control" name="extension" placeholder="Extension">
                 </div>
               </div>
 
@@ -177,7 +156,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
                   </div>
-                  <input type="text" class="form-control" name="contact_mobile" placeholder="Mobile Number" data-inputmask="'mask': '999-999-9999'" data-mask> 
+                  <input type="text" class="form-control" name="mobile" placeholder="Mobile Number" data-inputmask="'mask': '999-999-9999'" data-mask> 
                 </div>
               </div>
               
@@ -219,6 +198,16 @@
                 </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="url" class="form-control" name="website" placeholder="ex. https://google.com">
+                </div>
+              </div>
+
               <div class="form-group">
                 <label>Company Size</label>
                 <div class="input-group">
diff --git a/edit_client_modal.php b/edit_client_modal.php
index 31e8ae56..aaf60035 100644
--- a/edit_client_modal.php
+++ b/edit_client_modal.php
@@ -11,7 +11,7 @@
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
         <div class="modal-body bg-white">
           
-          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab<?php echo $client_id; ?>" role="tablist">
+          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab<?php echo $client_id; ?>">
             <li class="nav-item">
               <a class="nav-link active" id="pills-details-tab<?php echo $client_id; ?>" data-toggle="pill" href="#pills-details<?php echo $client_id; ?>">Details</a>
             </li>
@@ -55,45 +55,10 @@
                 </div>
               </div>
 
-              <label>Phone</label>
-              <div class="form-group">
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="phone" placeholder="Phone Number" data-inputmask="'mask': '999-999-9999'" value="<?php echo $client_phone; ?>"> 
-                </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. https://google.com" value="<?php echo $client_website; ?>">
-                </div>
-              </div>
-
             </div>
           
             <div class="tab-pane fade" id="pills-address<?php echo $client_id; ?>">
 
-              <div class="form-group">
-                <label>Country</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                  </div>
-                  <select class="form-control select2" name="country">
-                    <option value="">- Country -</option>
-                    <?php foreach($countries_array as $country_name) { ?>
-                    <option <?php if($client_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-
               <div class="form-group">
                 <label>Address</label>
                 <div class="input-group">
@@ -138,6 +103,21 @@
                   <input type="text" class="form-control" name="zip" placeholder="Postal Code" value="<?php echo $client_zip; ?>">
                 </div>
               </div>
+
+              <div class="form-group">
+                <label>Country</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                  </div>
+                  <select class="form-control select2" name="country">
+                    <option value="">- Country -</option>
+                    <?php foreach($countries_array as $country_name) { ?>
+                    <option <?php if($client_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
+                    <?php } ?>
+                  </select>
+                </div>
+              </div>
             
             </div>
 
@@ -161,12 +141,12 @@
                       <div class="input-group-prepend">
                         <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
                       </div>
-                      <input type="text" class="form-control" name="contact_phone" placeholder="Phone Number" value="<?php echo $client_phone; ?>" data-inputmask="'mask': '999-999-9999'" data-mask> 
+                      <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $client_phone; ?>" data-inputmask="'mask': '999-999-9999'" data-mask> 
                     </div>
                   </div>
                 </div>
                 <div class="col-4">
-                  <input type="text" class="form-control" name="contact_extension" placeholder="Extension" value="<?php echo $client_extension; ?>">
+                  <input type="text" class="form-control" name="extension" placeholder="Extension" value="<?php echo $client_extension; ?>">
                 </div>
               </div>
 
@@ -219,6 +199,16 @@
                 </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. https://google.com" value="<?php echo $client_website; ?>">
+                </div>
+              </div>
+
               <div class="form-group">
                 <label>Company Size</label>
                 <div class="input-group">
diff --git a/post.php b/post.php
index d7bdea27..284f68d7 100644
--- a/post.php
+++ b/post.php
@@ -524,20 +524,6 @@ if(isset($_POST['add_client'])){
         mkdir("uploads/clients/$session_company_id/$client_id");
     }
 
-    //Add Primary Contact
-
-    mysqli_query($mysqli,"INSERT INTO contacts SET contact_name = '$contact', contact_title = 'Main Contact', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_primary = 1, contact_billing = 1, contact_created_at = NOW(), client_id = $client_id, company_id = $session_company_id");
-
-    //Log Add Primary Contact
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Contact', log_action = 'Created', log_description = '$name', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
-
-    //Add Primary Location
-
-    mysqli_query($mysqli,"INSERT INTO locations SET location_name = 'Main Location', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_hours = '$hours', location_primary = 1, location_created_at = NOW(), client_id = $client_id, company_id = $session_company_id");
-
-    //Log Add Primary Location
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Location', log_action = 'Created', log_description = '$name', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
-
     //Log Add Client
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Client', log_action = 'Created', log_description = '$name', log_created_at = NOW(), client_id = $client_id, company_id = $session_company_id, user_id = $session_user_id");