diff --git a/add_client_asset_modal.php b/add_client_asset_modal.php
index b57aa2d2..74930f65 100644
--- a/add_client_asset_modal.php
+++ b/add_client_asset_modal.php
@@ -10,75 +10,201 @@
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
         <div class="modal-body bg-white">
-          <div class="form-group">
-            <label>Asset Name</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" placeholder="Name the asset" required autofocus>
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Asset Type</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" name="type" required>
-                <option value="">- Type -</option>
-                <?php foreach($asset_types_array as $asset_type) { ?>
-                <option><?php echo $asset_type; ?></option>
-                <?php } ?>
-              </select>
-            </div>
-          </div>        
-          <div class="form-group">
-            <label>Make</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-              </div>
-              <input type="text" class="form-control" name="make" placeholder="Manufacturer" required>
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Model</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-              </div>
-              <input type="text" class="form-control" name="model" placeholder="Model Number" required>
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Serial Number</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
-              </div>
-              <input type="text" class="form-control" name="serial" placeholder="Serial number" required>
-            </div>
-          </div>
-          <center><a class="btn btn-link" data-toggle="collapse" href="#optionsCollapse" role="button" aria-expanded="false" aria-controls="optionsCollapse">Add a pasword</a></center>
-          <div class="collapse multi-collapse" id="optionsCollapse">
-            <div class="form-group">
-              <label>Username</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa  fa-fw fa-user"></i></span>
+          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab" role="tablist">
+            <li class="nav-item">
+              <a class="nav-link active" id="pills-basic-tab" data-toggle="pill" href="#pills-basic" role="tab" aria-controls="pills-home" aria-selected="true">Basic</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" id="pills-assignment-tab" data-toggle="pill" href="#pills-assignment" role="tab" aria-controls="pills-assignment" aria-selected="false">Assignment</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" id="pills-purchase-tab" data-toggle="pill" href="#pills-purchase" role="tab" aria-controls="pills-purchase" aria-selected="false">Purchase</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" id="pills-login-tab" data-toggle="pill" href="#pills-login" role="tab" aria-controls="pills-login" aria-selected="false">Login</a>
+            </li>
+          </ul>
+          <hr>
+          <div class="tab-content" id="pills-tabContent">
+            
+            <div class="tab-pane fade show active" id="pills-basic" role="tabpanel" aria-labelledby="pills-basic-tab">
+              
+              <div class="form-group">
+                <label>Asset Name</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="name" placeholder="Name the asset" required autofocus>
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Asset Type</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" name="type" required>
+                    <option value="">- Type -</option>
+                    <?php foreach($asset_types_array as $asset_type) { ?>
+                    <option><?php echo $asset_type; ?></option>
+                    <?php } ?>
+                  </select>
+                </div>
+              </div>        
+              
+              <div class="form-group">
+                <label>Make</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="make" placeholder="Manufacturer" required>
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Model</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="model" placeholder="Model Number" required>
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Serial Number</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="serial" placeholder="Serial number" required>
                 </div>
-                <input type="text" class="form-control" name="username" placeholder="Username">
               </div>
             </div>
-            <div class="form-group">
-              <label>Password</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
+
+            <div class="tab-pane fade" id="pills-assignment" role="tabpanel" aria-labelledby="pills-assignment-tab">
+              
+              <div class="form-group">
+                <label>Location</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                  </div>
+                  <select class="form-control" name="location">
+                    <option value="">- Location -</option>
+                    <?php 
+                    
+                    $sql = mysqli_query($mysqli,"SELECT * FROM client_locations WHERE client_id = $client_id"); 
+                    while($row = mysqli_fetch_array($sql)){
+                      $location_id = $row['client_location_id'];
+                      $location_name = $row['client_location_name'];
+                    ?>
+                    <option value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
                 </div>
-                <input type="text" class="form-control" name="password" placeholder="Password">
               </div>
+
+              <div class="form-group">
+                <label>Assigned To</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                  </div>
+                  <select class="form-control" name="contact">
+                    <option value="">- Contact -</option>
+                    <?php 
+                    
+                    $sql = mysqli_query($mysqli,"SELECT * FROM client_contacts WHERE client_id = $client_id"); 
+                    while($row = mysqli_fetch_array($sql)){
+                      $client_contact_id = $row['client_contact_id'];
+                      $client_contact_name = $row['client_contact_name'];
+                    ?>
+                    <option value="<?php echo $client_contact_id; ?>"><?php echo $client_contact_name; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+            
+            </div>
+            
+            <div class="tab-pane fade" id="pills-purchase" role="tabpanel" aria-labelledby="pills-purchase-tab">
+              
+              <div class="form-group">
+                <label>Vendor</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                  </div>
+                  <select class="form-control" name="vendor">
+                    <option value="">- Vendor -</option>
+                    <?php 
+                    
+                    $sql = mysqli_query($mysqli,"SELECT * FROM client_vendors WHERE client_id = $client_id"); 
+                    while($row = mysqli_fetch_array($sql)){
+                      $client_vendor_id = $row['client_vendor_id'];
+                      $client_vendor_name = $row['client_vendor_name'];
+                    ?>
+                    <option value="<?php echo $client_vendor_id; ?>"><?php echo $client_vendor_name; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Purchase Date</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                  </div>
+                  <input type="date" class="form-control" name="purchase_date">
+                </div>
+              </div>
+              <div class="form-group">
+                <label>Warranty Expire</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                  </div>
+                  <input type="date" class="form-control" name="warranty_expire">
+                </div>
+              </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-login" role="tabpanel" aria-labelledby="pills-login-tab">
+
+              <div class="form-group">
+                <label>Username</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa  fa-fw fa-user"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="username" placeholder="Username">
+                </div>
+              </div>
+              <div class="form-group">
+                <label>Password</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="password" placeholder="Password">
+                </div>
+              </div>
+
             </div>
           </div>
         </div>
diff --git a/add_client_domain_modal.php b/add_client_domain_modal.php
index 82979035..44b7b72e 100644
--- a/add_client_domain_modal.php
+++ b/add_client_domain_modal.php
@@ -26,7 +26,45 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
               </div>
-              <input type="text" class="form-control" name="registrar" placeholder="ex GoDaddy" required>
+              <select class="form-control" name="registrar">
+                <option value="">- Vendor -</option>
+                <?php 
+                
+                $sql = mysqli_query($mysqli,"SELECT * FROM client_vendors WHERE client_id = $client_id"); 
+                while($row = mysqli_fetch_array($sql)){
+                  $client_vendor_id = $row['client_vendor_id'];
+                  $client_vendor_name = $row['client_vendor_name'];
+                ?>
+                <option value="<?php echo $client_vendor_id; ?>"><?php echo $client_vendor_name; ?></option>
+                
+                <?php
+                }
+                ?>
+              </select>
+            </div>
+          </div>
+        
+          <div class="form-group">
+            <label>Webhost</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
+              </div>
+              <select class="form-control" name="webhost">
+                <option value="">- Vendor -</option>
+                <?php 
+                
+                $sql = mysqli_query($mysqli,"SELECT * FROM client_vendors WHERE client_id = $client_id"); 
+                while($row = mysqli_fetch_array($sql)){
+                  $client_vendor_id = $row['client_vendor_id'];
+                  $client_vendor_name = $row['client_vendor_name'];
+                ?>
+                <option value="<?php echo $client_vendor_id; ?>"><?php echo $client_vendor_name; ?></option>
+                
+                <?php
+                }
+                ?>
+              </select>
             </div>
           </div>
         
@@ -40,15 +78,6 @@
             </div>
           </div>
 
-          <div class="form-group">
-            <label>Server</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
-              </div>
-              <input type="text" class="form-control" name="server" placeholder="ex ns1.pittpc.com" required>
-            </div>
-          </div>
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
diff --git a/add_client_modal.php b/add_client_modal.php
index 996cb684..57016ec8 100644
--- a/add_client_modal.php
+++ b/add_client_modal.php
@@ -1,5 +1,5 @@
 <div class="modal" id="addClientModal" tabindex="-1">
-  <div class="modal-dialog modal-lg">
+  <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header text-white">
         <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>New Client</h5>
@@ -9,87 +9,127 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <div class="modal-body bg-white">
-          <div class="form-group">
-            <label>Name</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" placeholder="Name or Company" required autofocus>
-            </div>
-          </div>
-          <div class="form-group">
-            <label>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">
-            </div>
-          </div>
-          <div class="form-row">
-            <div class="form-group col-md-5">
-              <label>City</label>
-              <input type="text" class="form-control" name="city" placeholder="City" required>
-            </div>
-            <div class="form-group col-md-4">
-              <label>State</label>
-              <select class="form-control" name="state">
-                <option value="">- State -</option>
-                <?php foreach($states_array as $state_abbr => $state_name) { ?>
-                <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
-                <?php } ?>
-              </select> 
-            </div>
-            <div class="form-group col-md-3">
-              <label>Zip</label>
-              <input type="text" class="form-control" name="zip" placeholder="Zip">
-            </div>
-          </div>
-          <div class="form-row">
-            <div class="form-group col-sm">
-              <label>Phone</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+          
+          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab" role="tablist">
+            <li class="nav-item">
+              <a class="nav-link active" id="pills-basic-tab" data-toggle="pill" href="#pills-basic" role="tab" aria-controls="pills-basic" aria-selected="true">Basic</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" id="pills-address-tab" data-toggle="pill" href="#pills-address" role="tab" aria-controls="pills-address" aria-selected="false">Address</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" id="pills-contact-tab" data-toggle="pill" href="#pills-contact" role="tab" aria-controls="pills-contact" aria-selected="false">Contact</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" id="pills-contact-tab" data-toggle="pill" href="#pills-more" role="tab" aria-controls="pills-more" aria-selected="false">More</a>
+            </li>
+          </ul>
+
+          <hr>
+          
+          <div class="tab-content" id="pills-tabContent">
+
+            <div class="tab-pane fade show active" id="pills-basic" role="tabpanel" aria-labelledby="pills-basic-tab">
+
+              <div class="form-group">
+                <label>Name</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="name" placeholder="Name or Company" required autofocus>
                 </div>
-                <input type="text" class="form-control" name="phone" placeholder="Phone Number" data-inputmask="'mask': '999-999-9999'"> 
               </div>
+
             </div>
-            <div class="form-group col-sm">
-              <label>Email</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+          
+            <div class="tab-pane fade" id="pills-address" role="tabpanel" aria-labelledby="pills-address-tab">
+
+              <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">
                 </div>
-                <input type="email" class="form-control" name="email" placeholder="Email Address">
               </div>
-            </div>
-          </div>
-          <div class="form-row">
-            <div class="form-group col">
-              <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="Web Address">
+          
+              <div class="form-group">
+                <label>City</label>
+                <input type="text" class="form-control" name="city" placeholder="City" required>
               </div>
-            </div>
-            <div class="form-group col">
-              <label>Invoice Net Terms</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
-                </div>
-                <select class="form-control" name="net_terms">
-                  <option value="7">Default (7 Days)</option>
-                  <option value="1">Upon Reciept</option>
-                  <option value="14">14 Day</option>
-                  <option value="30">30 Day</option>
+              
+              <div class="form-group">
+                <label>State</label>
+                <select class="form-control" name="state">
+                  <option value="">- State -</option>
+                  <?php foreach($states_array as $state_abbr => $state_name) { ?>
+                  <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
+                  <?php } ?>
                 </select> 
               </div>
+              
+              <div class="form-group">
+                <label>Zip</label>
+                <input type="text" class="form-control" name="zip" placeholder="Zip">
+              </div>
+            
             </div>
+
+            <div class="tab-pane fade" id="pills-contact" role="tabpanel" aria-labelledby="pills-contact-tab">
+
+              <div class="form-group">
+                <label>Phone</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="phone" placeholder="Phone Number" data-inputmask="'mask': '999-999-9999'"> 
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Email</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                  </div>
+                  <input type="email" class="form-control" name="email" placeholder="Email Address">
+                </div>
+              </div>
+        
+              <div class="form-group">
+                <label>Website</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="website" placeholder="Web Address">
+                </div>
+              </div>
+            
+            </div>
+
+            <div class="tab-pane fade" id="pills-more" role="tabpanel" aria-labelledby="pills-more-tab">
+
+              <div class="form-group">
+                <label>Invoice Net Terms</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+                  </div>
+                  <select class="form-control" name="net_terms">
+                    <option value="7">Default (7 Days)</option>
+                    <option value="1">Upon Reciept</option>
+                    <option value="14">14 Day</option>
+                    <option value="30">30 Day</option>
+                  </select> 
+                </div>
+              </div>
+            
+            </div>
+          
           </div>    
         </div>
         <div class="modal-footer bg-white">
diff --git a/add_vendor_modal.php b/add_vendor_modal.php
index d3bfe563..f6b8b493 100644
--- a/add_vendor_modal.php
+++ b/add_vendor_modal.php
@@ -1,5 +1,5 @@
 <div class="modal" id="addVendorModal" tabindex="-1">
-  <div class="modal-dialog modal-lg">
+  <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header text-white">
         <h5 class="modal-title"><i class="fa fa-fw fa-building mr-2"></i>New Vendor</h5>
@@ -9,55 +9,92 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <div class="modal-body bg-white">
-          <div class="form-group">
-            <label>Name</label>
-            <input type="text" class="form-control" name="name" required autofocus>
-          </div>
-          <div class="form-group">
-            <label>Description</label>
-            <input type="text" class="form-control" name="description">
-          </div>
-          <div class="form-group">
-            <label>Address</label>
-            <input type="text" class="form-control" name="address">
-          </div>
-          <div class="form-row">
-            <div class="form-group col">
-              <label>City</label>
-              <input type="text" class="form-control" name="city">
+
+          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab" role="tablist">
+            <li class="nav-item">
+              <a class="nav-link active" id="pills-basic-tab" data-toggle="pill" href="#pills-basic" role="tab" aria-controls="pills-basic" aria-selected="true">Basic</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" id="pills-address-tab" data-toggle="pill" href="#pills-address" role="tab" aria-controls="pills-address" aria-selected="false">Address</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" id="pills-contact-tab" data-toggle="pill" href="#pills-contact" role="tab" aria-controls="pills-contact" aria-selected="false">Contact</a>
+            </li>
+          </ul>
+
+          <hr>
+          
+          <div class="tab-content" id="pills-tabContent">
+
+            <div class="tab-pane fade show active" id="pills-basic" role="tabpanel" aria-labelledby="pills-basic-tab">
+
+              <div class="form-group">
+                <label>Name</label>
+                <input type="text" class="form-control" name="name" required autofocus>
+              </div>
+              
+              <div class="form-group">
+                <label>Description</label>
+                <input type="text" class="form-control" name="description">
+              </div>
+
+              <div class="form-group">
+                <label>Account Number</label>
+                <input type="text" class="form-control" name="account_number">
+              </div>
+
             </div>
-            <div class="form-group col">
-              <label>State</label>
-              <select class="form-control" name="state">
-                <option value="">- State -</option>
-                <?php foreach($states_array as $state_abbr => $state_name) { ?>
-                <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
-                <?php } ?>
-              </select> 
+
+            <div class="tab-pane fade" id="pills-address" role="tabpanel" aria-labelledby="pills-address-tab">
+
+              <div class="form-group">
+                <label>Address</label>
+                <input type="text" class="form-control" name="address">
+              </div>
+              
+              <div class="form-group">
+                <label>City</label>
+                <input type="text" class="form-control" name="city">
+              </div>
+              
+              <div class="form-group">
+                <label>State</label>
+                <select class="form-control" name="state">
+                  <option value="">- State -</option>
+                  <?php foreach($states_array as $state_abbr => $state_name) { ?>
+                  <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
+                  <?php } ?>
+                </select> 
+              </div>
+              
+              <div class="form-group">
+                <label>Zip</label>
+                <input type="text" class="form-control" name="zip">
+              </div>
+
             </div>
-            <div class="form-group col">
-              <label>Zip</label>
-              <input type="text" class="form-control" name="zip">
+            
+            <div class="tab-pane fade" id="pills-contact" role="tabpanel" aria-labelledby="pills-contact-tab">
+
+              <div class="form-group">
+                <label>Phone</label>
+                <input type="text" class="form-control" name="phone">
+              </div>
+              
+              <div class="form-group">
+                <label>Email</label>
+                <input type="email" class="form-control" name="email">
+              </div>
+              
+              <div class="form-group">
+                <label>Website</label>
+                <input type="text" class="form-control" name="website">
+              </div>
+            
             </div>
+
           </div>
-          <div class="form-row">
-            <div class="form-group col">
-              <label>Phone</label>
-              <input type="text" class="form-control" name="phone">
-            </div>
-            <div class="form-group col">
-              <label>Email</label>
-              <input type="email" class="form-control" name="email">
-            </div>
-            <div class="form-group col">
-              <label>Website</label>
-              <input type="text" class="form-control" name="website">
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Account Number</label>
-            <input type="text" class="form-control" name="account_number">
-          </div>
+          
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
diff --git a/client_assets.php b/client_assets.php
index 7f6500dc..6a40b12c 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -30,6 +30,13 @@
             $client_asset_make = $row['client_asset_make'];
             $client_asset_model = $row['client_asset_model'];
             $client_asset_serial = $row['client_asset_serial'];
+            $client_asset_purchase_date = $row['client_asset_purchase_date'];
+            $client_asset_warranty_expire = $row['client_asset_warranty_expire'];
+            $client_vendor_id = $row['client_vendor_id'];
+            $client_location_id = $row['client_location_id'];
+            $client_contact_id = $row['client_contact_id'];
+
+
 
             if($client_asset_type == 'Laptop'){
               $device_icon = "laptop";
@@ -59,8 +66,8 @@
               $device_icon = "tag";
             }
 
-            $sql2 = mysqli_query($mysqli,"SELECT * FROM client_logins WHERE client_asset_id = $client_asset_id");
-            $row = mysqli_fetch_array($sql2);
+            $sql_logins = mysqli_query($mysqli,"SELECT * FROM client_logins WHERE client_asset_id = $client_asset_id");
+            $row = mysqli_fetch_array($sql_logins);
             $client_login_id = $row['client_login_id'];
             $client_login_username = $row['client_login_username'];
             $client_login_password = $row['client_login_password'];
diff --git a/client_domains.php b/client_domains.php
index 6e4ff15d..ee1bcf18 100644
--- a/client_domains.php
+++ b/client_domains.php
@@ -13,8 +13,8 @@
           <tr>
             <th>Domain</th>
             <th>Registrar</th>
+            <th>WebHost</th>
             <th>Expire</th>
-            <th>Server</th>
             <th class="text-center">Actions</th>
           </tr>
         </thead>
@@ -25,16 +25,15 @@
             $client_domain_id = $row['client_domain_id'];
             $client_domain_name = $row['client_domain_name'];
             $client_domain_registrar = $row['client_domain_registrar'];
+            $client_domain_webhost = $row['client_domain_webhost'];
             $client_domain_expire = $row['client_domain_expire'];
-            $client_domain_server = $row['client_domain_server'];
-
       
           ?>
           <tr>
             <td><?php echo $client_domain_name; ?></td>
             <td><?php echo $client_domain_registrar; ?></td>
+            <td><?php echo $client_domain_webhost; ?></td>
             <td><?php echo $client_domain_expire; ?></td>
-            <td><?php echo $client_domain_server; ?></td>
             <td>
               <div class="dropdown dropleft text-center">
                 <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/edit_client_asset_modal.php b/edit_client_asset_modal.php
index 08bbec32..232d300c 100644
--- a/edit_client_asset_modal.php
+++ b/edit_client_asset_modal.php
@@ -2,62 +2,216 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-tag mr-2"></i>Edit Asset</h5>
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-<?php echo $device_icon; ?> mr-2"></i>Edit Asset</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="client_asset_id" value="<?php echo $client_asset_id; ?>">
+        <input type="hidden" name="client_login_id" value="<?php echo $client_login_id; ?>">
+        <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+        
         <div class="modal-body bg-white">
-          <div class="form-group">
-            <label>Asset Name</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+          
+          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab<?php echo $client_asset_id; ?>" role="tablist">
+            <li class="nav-item">
+              <a class="nav-link active" id="pills-basic-tab<?php echo $client_asset_id; ?>" data-toggle="pill" href="#pills-basic<?php echo $client_asset_id; ?>" role="tab" aria-controls="pills-home<?php echo $client_asset_id; ?>" aria-selected="true">Basic</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" id="pills-assignment-tab<?php echo $client_asset_id; ?>" data-toggle="pill" href="#pills-assignment<?php echo $client_asset_id; ?>" role="tab" aria-controls="pills-assignment<?php echo $client_asset_id; ?>" aria-selected="false">Assignment</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" id="pills-purchase-tab<?php echo $client_asset_id; ?>" data-toggle="pill" href="#pills-purchase<?php echo $client_asset_id; ?>" role="tab" aria-controls="pills-purchase<?php echo $client_asset_id; ?>" aria-selected="false">Purchase</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" id="pills-login-tab<?php echo $client_asset_id; ?>" data-toggle="pill" href="#pills-login<?php echo $client_asset_id; ?>" role="tab" aria-controls="pills-login<?php echo $client_asset_id; ?>" aria-selected="false">Login</a>
+            </li>
+          </ul>
+          
+          <hr>
+          
+          <div class="tab-content" id="pills-tabContent<?php echo $client_asset_id; ?>">
+
+            <div class="tab-pane fade show active" id="pills-basic<?php echo $client_asset_id; ?>" role="tabpanel" aria-labelledby="pills-basic-tab<?php echo $client_asset_id; ?>">
+          
+              <div class="form-group">
+                <label>Asset Name</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="name" placeholder="Name the asset" value="<?php echo $client_asset_name; ?>" required>
+                </div>
               </div>
-              <input type="text" class="form-control" name="name" placeholder="Name the asset" value="<?php echo $client_asset_name; ?>" required>
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Asset Type</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 class="form-group">
+                <label>Asset Type</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" name="type" required>
+                    <?php foreach($asset_types_array as $asset_type) { ?>
+                    <option <?php if($client_asset_type == $asset_type) { echo "selected"; } ?>><?php echo $asset_type; ?></option>
+                    <?php } ?>
+                  </select>
+                </div>
+              </div>        
+              
+              <div class="form-group">
+                <label>Make</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="make" placeholder="Manufacturer" value="<?php echo $client_asset_make; ?>" required>
+                </div>
               </div>
-              <select class="form-control" name="type" required>
-                <?php foreach($asset_types_array as $asset_type) { ?>
-                <option <?php if($client_asset_type == $asset_type) { echo "selected"; } ?>><?php echo $asset_type; ?></option>
-                <?php } ?>
-              </select>
-            </div>
-          </div>        
-          <div class="form-group">
-            <label>Make</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+              
+              <div class="form-group">
+                <label>Model</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="model" placeholder="Model Number" value="<?php echo $client_asset_model; ?>" required>
+                </div>
               </div>
-              <input type="text" class="form-control" name="make" placeholder="Manufacturer" value="<?php echo $client_asset_make; ?>" required>
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Model</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+              
+              <div class="form-group">
+                <label>Serial Number</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="serial" placeholder="Serial number" value="<?php echo $client_asset_serial; ?>" required>
+                </div>
               </div>
-              <input type="text" class="form-control" name="model" placeholder="Model Number" value="<?php echo $client_asset_model; ?>" required>
+            
             </div>
-          </div>
-          <div class="form-group">
-            <label>Serial Number</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
+
+            <div class="tab-pane fade" id="pills-assignment<?php echo $client_asset_id; ?>" role="tabpanel" aria-labelledby="pills-assignment-tab<?php echo $client_asset_id; ?>">
+
+              <div class="form-group">
+                <label>Location</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                  </div>
+                  <select class="form-control" name="location">
+                    <option value="">- Location -</option>
+                    <?php 
+                    
+                    $sql_client_locations = mysqli_query($mysqli,"SELECT * FROM client_locations WHERE client_id = $client_id"); 
+                    while($row = mysqli_fetch_array($sql_client_locations)){
+                      $location_id = $row['client_location_id'];
+                      $location_name = $row['client_location_name'];
+                    ?>
+                    <option <?php if($client_location_id == $location_id){ echo "selected"; } ?> value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Assigned To</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                  </div>
+                  <select class="form-control" name="contact">
+                    <option value="">- Contact -</option>
+                    <?php 
+                    
+                    $sql_client_contacts = mysqli_query($mysqli,"SELECT * FROM client_contacts WHERE client_id = $client_id"); 
+                    while($row = mysqli_fetch_array($sql_client_contacts)){
+                      $contact_id = $row['client_contact_id'];
+                      $contact_name = $row['client_contact_name'];
+                    ?>
+                    <option <?php if($client_contact_id == $contact_id){ echo "selected"; } ?> value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
               </div>
-              <input type="text" class="form-control" name="serial" placeholder="Serial number" value="<?php echo $client_asset_serial; ?>" required>
             </div>
+
+            <div class="tab-pane fade" id="pills-purchase<?php echo $client_asset_id; ?>" role="tabpanel" aria-labelledby="pills-purchase-tab<?php echo $client_asset_id; ?>">
+
+              <div class="form-group">
+                <label>Vendor</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                  </div>
+                  <select class="form-control" name="vendor">
+                    <option value="">- Vendor -</option>
+                    <?php 
+                    
+                    $sql_client_vendors = mysqli_query($mysqli,"SELECT * FROM client_vendors WHERE client_id = $client_id"); 
+                    while($row = mysqli_fetch_array($sql_client_vendors)){
+                      $vendor_id = $row['client_vendor_id'];
+                      $vendor_name = $row['client_vendor_name'];
+                    ?>
+                    <option <?php if($client_vendor_id == $vendor_id){ echo "selected"; } ?> value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Purchase Date</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                  </div>
+                  <input type="date" class="form-control" name="purchase_date" value="<?php echo $client_asset_purchase_date; ?>">
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Warranty Expire</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                  </div>
+                  <input type="date" class="form-control" name="warranty_expire" value="<?php echo $client_asset_warranty_expire; ?>">
+                </div>
+              </div>
+            
+            </div>
+
+            <div class="tab-pane fade" id="pills-login<?php echo $client_asset_id; ?>" role="tabpanel" aria-labelledby="pills-login-tab<?php echo $client_asset_id; ?>">
+              <div class="form-group">
+                <label>Username</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa  fa-fw fa-user"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="username" placeholder="Username" value="<?php echo $client_login_username; ?>">
+                </div>
+              </div>
+              <div class="form-group">
+                <label>Password</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="password" placeholder="Password" value="<?php echo $client_login_password; ?>">
+                </div>
+              </div>
+
+            </div>
+
           </div>
         </div>
         <div class="modal-footer bg-white">
diff --git a/edit_client_domain_modal.php b/edit_client_domain_modal.php
index 445ef811..c0021732 100644
--- a/edit_client_domain_modal.php
+++ b/edit_client_domain_modal.php
@@ -26,7 +26,45 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
               </div>
-              <input type="text" class="form-control" name="registrar" placeholder="ex GoDaddy" value="<?php echo $client_domain_registrar; ?>" required>
+              <select class="form-control" name="registrar">
+                <option value="">- Vendor -</option>
+                <?php 
+                
+                $sql_vendors1 = mysqli_query($mysqli,"SELECT * FROM client_vendors WHERE client_id = $client_id"); 
+                while($row = mysqli_fetch_array($sql_vendors1)){
+                  $client_vendor_id = $row['client_vendor_id'];
+                  $client_vendor_name = $row['client_vendor_name'];
+                ?>
+                <option <?php if($client_domain_registrar == $client_vendor_id) { echo "selected"; } ?> value="<?php echo $client_vendor_id; ?>"><?php echo $client_vendor_name; ?></option>
+                
+                <?php
+                }
+                ?>
+              </select>
+            </div>
+          </div>
+
+          <div class="form-group">
+            <label>Webhost</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
+              </div>
+              <select class="form-control" name="webhost">
+                <option value="">- Vendor -</option>
+                <?php 
+                
+                $sql_vendors2 = mysqli_query($mysqli,"SELECT * FROM client_vendors WHERE client_id = $client_id"); 
+                while($row = mysqli_fetch_array($sql_vendors2)){
+                  $client_vendor_id = $row['client_vendor_id'];
+                  $client_vendor_name = $row['client_vendor_name'];
+                ?>
+                <option <?php if($client_domain_webhost == $client_vendor_id){ echo "selected"; } ?> value="<?php echo $client_vendor_id; ?>"><?php echo $client_vendor_name; ?></option>
+                
+                <?php
+                }
+                ?>
+              </select>
             </div>
           </div>
         
@@ -40,15 +78,6 @@
             </div>
           </div>
 
-          <div class="form-group">
-            <label>Server</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
-              </div>
-              <input type="text" class="form-control" name="server" placeholder="ex ns1.pittpc.com" value="<?php echo $client_domain_server; ?>" required>
-            </div>
-          </div>
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
diff --git a/edit_client_modal.php b/edit_client_modal.php
index 9ff37f7c..46425998 100644
--- a/edit_client_modal.php
+++ b/edit_client_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="fa fa-fw fa-user-edit mr-2"></i>Edit Client</h5>
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-user-edit mr-2"></i>Edit <?php echo $client_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
diff --git a/old_add_client_modal.php b/old_add_client_modal.php
new file mode 100644
index 00000000..996cb684
--- /dev/null
+++ b/old_add_client_modal.php
@@ -0,0 +1,102 @@
+<div class="modal" id="addClientModal" tabindex="-1">
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content bg-dark">
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>New Client</h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" autocomplete="off">
+        <div class="modal-body bg-white">
+          <div class="form-group">
+            <label>Name</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+              </div>
+              <input type="text" class="form-control" name="name" placeholder="Name or Company" required autofocus>
+            </div>
+          </div>
+          <div class="form-group">
+            <label>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">
+            </div>
+          </div>
+          <div class="form-row">
+            <div class="form-group col-md-5">
+              <label>City</label>
+              <input type="text" class="form-control" name="city" placeholder="City" required>
+            </div>
+            <div class="form-group col-md-4">
+              <label>State</label>
+              <select class="form-control" name="state">
+                <option value="">- State -</option>
+                <?php foreach($states_array as $state_abbr => $state_name) { ?>
+                <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
+                <?php } ?>
+              </select> 
+            </div>
+            <div class="form-group col-md-3">
+              <label>Zip</label>
+              <input type="text" class="form-control" name="zip" placeholder="Zip">
+            </div>
+          </div>
+          <div class="form-row">
+            <div class="form-group col-sm">
+              <label>Phone</label>
+              <div class="input-group">
+                <div class="input-group-prepend">
+                  <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                </div>
+                <input type="text" class="form-control" name="phone" placeholder="Phone Number" data-inputmask="'mask': '999-999-9999'"> 
+              </div>
+            </div>
+            <div class="form-group col-sm">
+              <label>Email</label>
+              <div class="input-group">
+                <div class="input-group-prepend">
+                  <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                </div>
+                <input type="email" class="form-control" name="email" placeholder="Email Address">
+              </div>
+            </div>
+          </div>
+          <div class="form-row">
+            <div class="form-group col">
+              <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="Web Address">
+              </div>
+            </div>
+            <div class="form-group col">
+              <label>Invoice Net Terms</label>
+              <div class="input-group">
+                <div class="input-group-prepend">
+                  <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+                </div>
+                <select class="form-control" name="net_terms">
+                  <option value="7">Default (7 Days)</option>
+                  <option value="1">Upon Reciept</option>
+                  <option value="14">14 Day</option>
+                  <option value="30">30 Day</option>
+                </select> 
+              </div>
+            </div>
+          </div>    
+        </div>
+        <div class="modal-footer bg-white">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_client" class="btn btn-primary">Save</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/post.php b/post.php
index d2ba4c2c..d6a5b972 100644
--- a/post.php
+++ b/post.php
@@ -1650,9 +1650,14 @@ if(isset($_POST['add_client_asset'])){
     $make = strip_tags(mysqli_real_escape_string($mysqli,$_POST['make']));
     $model = strip_tags(mysqli_real_escape_string($mysqli,$_POST['model']));
     $serial = strip_tags(mysqli_real_escape_string($mysqli,$_POST['serial']));
+    $location = intval($_POST['location']);
+    $vendor = intval($_POST['vendor']);
+    $contact = intval($_POST['contact']);
+    $purchase_date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['purchase_date']));
+    $warranty_expire = strip_tags(mysqli_real_escape_string($mysqli,$_POST['warranty_expire']));
     $note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['note']));
 
-    mysqli_query($mysqli,"INSERT INTO client_assets SET client_asset_name = '$name', client_asset_type = '$type', client_asset_make = '$make', client_asset_model = '$model', client_asset_serial = '$serial', client_asset_note = '$note', client_id = $client_id");
+    mysqli_query($mysqli,"INSERT INTO client_assets SET client_asset_name = '$name', client_asset_type = '$type', client_asset_make = '$make', client_asset_model = '$model', client_asset_serial = '$serial', client_location_id = $location, client_vendor_id = $vendor, client_contact_id = $contact, client_asset_purchase_date = '$purchase_date', client_asset_warranty_expire = '$warranty_expire', client_asset_note = '$note', client_id = $client_id");
 
     if(!empty($_POST['username'])) {
         $asset_id = mysqli_insert_id($mysqli);
@@ -1671,15 +1676,37 @@ if(isset($_POST['add_client_asset'])){
 
 if(isset($_POST['edit_client_asset'])){
 
-    $client_asset_id = intval($_POST['client_asset_id']);
+    $asset_id = intval($_POST['client_asset_id']);
+    $login_id = intval($_POST['client_login_id']);
+    $client_id = intval($_POST['client_id']);
     $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
     $type = strip_tags(mysqli_real_escape_string($mysqli,$_POST['type']));
     $make = strip_tags(mysqli_real_escape_string($mysqli,$_POST['make']));
     $model = strip_tags(mysqli_real_escape_string($mysqli,$_POST['model']));
     $serial = strip_tags(mysqli_real_escape_string($mysqli,$_POST['serial']));
+    $location = intval($_POST['location']);
+    $vendor = intval($_POST['vendor']);
+    $contact = intval($_POST['contact']);
+    $purchase_date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['purchase_date']));
+    $warranty_expire = strip_tags(mysqli_real_escape_string($mysqli,$_POST['warranty_expire']));
     $note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['note']));
+    $username = strip_tags(mysqli_real_escape_string($mysqli,$_POST['username']));
+    $password = strip_tags(mysqli_real_escape_string($mysqli,$_POST['password']));
+    $description = "$type - $name";
 
-    mysqli_query($mysqli,"UPDATE client_assets SET client_asset_name = '$name', client_asset_type = '$type', client_asset_make = '$make', client_asset_model = '$model', client_asset_serial = '$serial', client_asset_note = '$note' WHERE client_asset_id = $client_asset_id");
+    mysqli_query($mysqli,"UPDATE client_assets SET client_asset_name = '$name', client_asset_type = '$type', client_asset_make = '$make', client_asset_model = '$model', client_asset_serial = '$serial', client_location_id = $location, client_vendor_id = $vendor, client_contact_id = $contact, client_asset_purchase_date = '$purchase_date', client_asset_warranty_expire = '$warranty_expire', client_asset_note = '$note' WHERE client_asset_id = $asset_id");
+
+    //If login exists then update the login
+    if($login_id > 0){
+        mysqli_query($mysqli,"UPDATE client_logins SET client_login_description = '$description', client_login_username = '$username', client_login_password = '$password' WHERE client_login_id = $login_id");
+    }else{
+    //If Username is filled in then add a login
+        if(!empty($_POST['username'])) {
+            
+            mysqli_query($mysqli,"INSERT INTO client_logins SET client_login_description = '$description', client_login_username = '$username', client_login_password = '$password', client_asset_id = $asset_id, client_id = $client_id");
+
+        }
+    }
 
     $_SESSION['alert_message'] = "Asset updated";
     
@@ -1921,11 +1948,11 @@ if(isset($_POST['add_client_domain'])){
 
     $client_id = intval($_POST['client_id']);
     $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
-    $registrar = strip_tags(mysqli_real_escape_string($mysqli,$_POST['registrar']));
+    $registrar = intval($_POST['registrar']);
+    $webhost = intval($_POST['webhost']);
     $expire = strip_tags(mysqli_real_escape_string($mysqli,$_POST['expire']));
-    $server = strip_tags(mysqli_real_escape_string($mysqli,$_POST['server']));
 
-    mysqli_query($mysqli,"INSERT INTO client_domains SET client_domain_name = '$name', client_domain_registrar = '$registrar', client_domain_expire = '$expire', client_domain_server = '$server', client_id = $client_id");
+    mysqli_query($mysqli,"INSERT INTO client_domains SET client_domain_name = '$name', client_domain_registrar = $registrar,  client_domain_webhost = $webhost, client_domain_expire = '$expire', client_id = $client_id");
 
     $_SESSION['alert_message'] = "Domain added";
     
@@ -1937,11 +1964,11 @@ if(isset($_POST['edit_client_domain'])){
 
     $client_domain_id = intval($_POST['client_domain_id']);
     $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
-    $registrar = strip_tags(mysqli_real_escape_string($mysqli,$_POST['registrar']));
+    $registrar = intval($_POST['registrar']);
+    $webhost = intval($_POST['webhost']);
     $expire = strip_tags(mysqli_real_escape_string($mysqli,$_POST['expire']));
-    $server = strip_tags(mysqli_real_escape_string($mysqli,$_POST['server']));
 
-    mysqli_query($mysqli,"UPDATE client_domains SET client_domain_name = '$name', client_domain_registrar = '$registrar', client_domain_expire = '$expire', client_domain_server = '$server' WHERE client_domain_id = $client_domain_id");
+    mysqli_query($mysqli,"UPDATE client_domains SET client_domain_name = '$name', client_domain_registrar = $registrar,  client_domain_webhost = $webhost, client_domain_expire = '$expire' WHERE client_domain_id = $client_domain_id");
 
     $_SESSION['alert_message'] = "Domain updated";