diff --git a/client_tickets.php b/client_tickets.php
index 5a868fb5..41647883 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -42,6 +42,8 @@ $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o
 $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM tickets 
   LEFT JOIN contacts ON ticket_contact_id = contact_id
   LEFT JOIN users ON ticket_assigned_to = user_id
+  LEFT JOIN assets ON ticket_asset_id = asset_id
+  LEFT JOIN locations ON ticket_location_id = location_id
   WHERE ticket_client_id = $client_id
   AND (CONCAT(ticket_prefix,ticket_number) LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_status LIKE '%$q%' OR ticket_priority LIKE '%$q%' OR user_name LIKE '%$q%')
   ORDER BY $sb $o LIMIT $record_from, $record_to");
@@ -54,7 +56,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
   <div class="card-header py-2">
     <h3 class="card-title mt-2"><i class="fa fa-fw fa-tags"></i> Tickets</h3>
     <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketModal"><i class="fas fa-fw fa-plus"></i> New Ticket</button>
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#ticketAddModal"><i class="fas fa-fw fa-plus"></i> New Ticket</button>
       <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addScheduledTicketModal"><i class="fas fa-fw fa-plus"></i> Scheduled Ticket</button>
     </div>
   </div>
@@ -177,7 +179,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                   <i class="fas fa-ellipsis-h"></i>
                 </button>
                 <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketModal<?php echo $ticket_id; ?>">Edit</a>
+                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#ticketEditModal<?php echo $ticket_id; ?>">Edit</a>
                   <div class="dropdown-divider"></div>
                   <a class="dropdown-item text-danger" href="post.php?delete_ticket=<?php echo $ticket_id; ?>">Delete</a>
                 </div>
@@ -187,7 +189,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
           <?php
 
-          include("edit_ticket_modal.php");
+          include("ticket_edit_modal.php");
           }
 
           ?>
@@ -200,6 +202,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-include("add_ticket_modal.php");
+include("ticket_add_modal.php");
 include("add_scheduled_ticket_modal.php");
 ?>
diff --git a/edit_contact_modal.php b/edit_contact_modal.php
index 69855814..7bbf3550 100644
--- a/edit_contact_modal.php
+++ b/edit_contact_modal.php
@@ -121,9 +121,9 @@
 
             <div class="tab-pane fade" id="pills-photo<?php echo $contact_id; ?>">
 
-              <center>
+              <center class="mb-3">
                 <?php if(!empty($contact_photo)){ ?>
-                <img class="img-circle" src="<?php echo "uploads/clients/$session_company_id/$client_id/$contact_photo"; ?>" height="256" width="256">
+                <img class="img-fluid" src="<?php echo "uploads/clients/$session_company_id/$client_id/$contact_photo"; ?>">
                 <?php }else{ ?>
                 <span class="fa-stack fa-4x">
                   <i class="fa fa-circle fa-stack-2x text-secondary"></i>
@@ -133,7 +133,6 @@
               </center>
 
               <div class="form-group">
-                <label>Upload Photo</label>
                 <input type="file" class="form-control-file" name="file">
               </div>
 
diff --git a/edit_location_modal.php b/edit_location_modal.php
index bc8302a0..87d322c7 100644
--- a/edit_location_modal.php
+++ b/edit_location_modal.php
@@ -158,12 +158,12 @@
 
             <div class="tab-pane fade" id="pills-photo<?php echo $location_id; ?>">
 
-              <center>
+              <center class="mb-3">
                 <?php if(!empty($location_photo)){ ?>
                 <img class="img-fluid" src="<?php echo "uploads/clients/$session_company_id/$client_id/$location_photo"; ?>">
                 <?php } ?>
               </center>
-              
+
               <div class="form-group">
                 <input type="file" class="form-control-file" name="file">
               </div>
diff --git a/post.php b/post.php
index 43dc0469..27183961 100644
--- a/post.php
+++ b/post.php
@@ -1155,7 +1155,7 @@ if(isset($_POST['add_client'])){
 
     //Add Location
     if(!empty($location_phone) OR !empty($address) OR !empty($city) OR !empty($state) OR !empty($zip)){
-        mysqli_query($mysqli,"INSERT INTO locations SET location_name = 'Primary', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_country = '$country', location_created_at = NOW(), location_client_id = $client_id, company_id = $session_company_id");
+        mysqli_query($mysqli,"INSERT INTO locations SET location_name = 'Primary', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$location_phone', location_country = '$country', location_created_at = NOW(), location_client_id = $client_id, company_id = $session_company_id");
         
         //Update Primay location in clients
         $location_id = mysqli_insert_id($mysqli);
diff --git a/tickets.php b/tickets.php
index 228338dd..8a91b2ad 100644
--- a/tickets.php
+++ b/tickets.php
@@ -99,6 +99,8 @@
     LEFT JOIN clients ON ticket_client_id = client_id
     LEFT JOIN contacts ON ticket_contact_id = contact_id 
     LEFT JOIN users ON ticket_assigned_to = user_id
+    LEFT JOIN assets ON ticket_asset_id = asset_id
+    LEFT JOIN locations ON ticket_location_id = location_id
     WHERE tickets.company_id = $session_company_id
     AND ticket_status LIKE '%$status%'
     AND DATE(ticket_created_at) BETWEEN '$dtf' AND '$dtt'