diff --git a/ticket_add_modal.php b/ticket_add_modal.php
index 2dc71011..9482f141 100644
--- a/ticket_add_modal.php
+++ b/ticket_add_modal.php
@@ -18,13 +18,12 @@
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="pill" href="#pills-contacts"><i class="fa fa-fw fa-users"></i> Contacts</a>
                         </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-vendors"><i class="fa fa-fw fa-building"></i> Vendors</a>
-                        </li>
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="pill" href="#pills-assets"><i class="fa fa-fw fa-desktop"></i> Assets</a>
                         </li>
-                        
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-vendors"><i class="fa fa-fw fa-building"></i> Vendors</a>
+                        </li>              
                     </ul>
 
                     <hr>
@@ -141,30 +140,6 @@
                             </div>
                         </div>
 
-                        <div class="tab-pane fade" id="pills-vendors">
-
-                            <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 select2" name="vendor">
-                                        <option value="">- None -</option>
-                                        <?php
-                                        $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = $client_id ORDER BY vendor_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $vendor_id = $row['vendor_id'];
-                                            $vendor_name = htmlentities($row['vendor_name']); ?>
-                                            <option value="<?php echo $vendor_id; ?>" <?php if ($primary_contact == $vendor_id) { echo "selected"; } ?>><?php echo "$vendor_name"; ?></option>
-
-                                            <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                        </div>
-
                         <div class="tab-pane fade" id="pills-assets">
 
                             <div class="form-group">
@@ -190,6 +165,30 @@
                             
                         </div>
 
+                        <div class="tab-pane fade" id="pills-vendors">
+
+                            <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 select2" name="vendor">
+                                        <option value="">- None -</option>
+                                        <?php
+                                        $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = $client_id ORDER BY vendor_name ASC");
+                                        while ($row = mysqli_fetch_array($sql)) {
+                                            $vendor_id = $row['vendor_id'];
+                                            $vendor_name = htmlentities($row['vendor_name']); ?>
+                                            <option value="<?php echo $vendor_id; ?>" <?php if ($primary_contact == $vendor_id) { echo "selected"; } ?>><?php echo "$vendor_name"; ?></option>
+
+                                            <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                        </div>
+
                         <?php } ?>
 
                     </div>
diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php
index 23dc70ec..6c04afac 100644
--- a/ticket_edit_modal.php
+++ b/ticket_edit_modal.php
@@ -1,127 +1,192 @@
 <div class="modal" id="editTicketModal<?php echo $ticket_id; ?>" tabindex="-1">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-life-ring"></i> Editing Ticket: <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong> - <?php echo $client_name; ?></h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
-        <div class="modal-body bg-white">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-life-ring"></i> Editing ticket: <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong> - <?php echo $client_name; ?></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
+                <div class="modal-body bg-white">
+
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $ticket_id; ?>"><i class="fa fa-fw fa-life-ring"></i> Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-contacts<?php echo $ticket_id; ?>"><i class="fa fa-fw fa-users"></i> Contacts</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-assets<?php echo $ticket_id; ?>"><i class="fa fa-fw fa-desktop"></i> Assets</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-vendors<?php echo $ticket_id; ?>"><i class="fa fa-fw fa-building"></i> Vendors</a>
+                        </li>       
+                    </ul>
+
+                    <hr>
+
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-details<?php echo $ticket_id; ?>">
+
+                            <div class="form-group">
+                                <label>Subject <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-tag"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="subject" value="<?php echo $ticket_subject; ?>" placeholder="Subject" required>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <textarea class="form-control summernote" rows="8" name="details" required><?php echo $ticket_details; ?></textarea>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Priority <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-thermometer-half"></i></span>
+                                  </div>
+                                  <select class="form-control select2" name="priority" required>
+                                    <option <?php if ($ticket_priority == 'Low') { echo "selected"; } ?> >Low</option>
+                                    <option <?php if ($ticket_priority == 'Medium') { echo "selected"; } ?> >Medium</option>
+                                    <option <?php if ($ticket_priority == 'High') { echo "selected"; } ?> >High</option>
+                                  </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 select2" name="assigned_to">
+                                    <option value="0">Not Assigned</option>
+                                    <?php 
+
+                                    $sql_assign_to_select = mysqli_query($mysqli,"SELECT users.user_id, user_name FROM users
+                                      LEFT JOIN user_companies ON users.user_id = user_companies.user_id
+                                      LEFT JOIN user_settings on users.user_id = user_settings.user_id
+                                      WHERE user_companies.company_id = $session_company_id 
+                                      AND user_role > 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
+                                    );
+                                    while ($row = mysqli_fetch_array($sql_assign_to_select)) {
+                                      $user_id = $row['user_id'];
+                                      $user_name = htmlentities($row['user_name']);
+                                    ?>
+                                    <option <?php if ($ticket_assigned_to == $user_id) { echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
+
+                                    <?php
+                                    }
+                                    ?>
+                                    </select>
+                                </div>
+            
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-contacts<?php echo $ticket_id; ?>">
+
+                            <div class="form-group">
+                                <label>Client Contact</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 select2" name="contact">
+                                    <option value="">No One</option>
+                                    <?php 
+                                    
+                                    $sql_client_contacts_select = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
+                                    while ($row = mysqli_fetch_array($sql_client_contacts_select)) {
+                                      $contact_id_select = $row['contact_id'];
+                                      $contact_name_select = htmlentities($row['contact_name']);
+                                    ?>
+                                    <option <?php if ($contact_id_select == $contact_id) { echo "selected"; } ?> value="<?php echo $contact_id_select; ?>"><?php echo $contact_name_select; ?></option>
+                                    
+                                    <?php
+                                    }
+                                    ?>
+                                  </select>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-assets<?php echo $ticket_id; ?>">
+
+                            <div class="form-group">
+                                <label>Asset</label>
+                                <div class="input-group">
+                                  <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
+                                  </div>
+                                  <select class="form-control select2" name="asset">
+                                    <option value="0">- None -</option>
+                                    <?php
+
+                                      $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
+                                      while ($row = mysqli_fetch_array($sql_assets)) {
+                                        $asset_id_select = $row['asset_id'];
+                                        $asset_name_select = htmlentities($row['asset_name']);
+                                        ?>
+                                        <option <?php if (!empty($asset_id) && $asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
+
+                                    <?php
+                                    }
+                                    ?>
+                                  </select>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-vendors<?php echo $ticket_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 select2" name="vendor">
+                                    <option value="0">- None -</option>
+                                    <?php
+
+                                      $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = $client_id ORDER BY vendor_name ASC");
+                                      while ($row = mysqli_fetch_array($sql_vendors)) {
+                                        $vendor_id_select = $row['vendor_id'];
+                                        $vendor_name_select = htmlentities($row['vendor_name']);
+                                        ?>
+                                        <option <?php if (!empty($vendor_id) && $vendor_id == $vendor_id_select) { echo "selected"; } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
+
+                                    <?php
+                                    }
+                                    ?>
+                                  </select>
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </div>
+
+                </div>
+                
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="edit_ticket" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
+                </div>
+            
+            </form>
         
-          <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 select2" name="assigned_to">
-                <option value="0">Not Assigned</option>
-                <?php 
-                
-                $sql_assign_to_select = mysqli_query($mysqli,"SELECT users.user_id, user_name FROM users
-                  LEFT JOIN user_companies ON users.user_id = user_companies.user_id
-                  LEFT JOIN user_settings on users.user_id = user_settings.user_id
-                  WHERE user_companies.company_id = $session_company_id 
-                  AND user_role > 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
-                );
-                while ($row = mysqli_fetch_array($sql_assign_to_select)) {
-                  $user_id = $row['user_id'];
-                  $user_name = htmlentities($row['user_name']);
-                ?>
-                <option <?php if ($ticket_assigned_to == $user_id) { echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label>Priority <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-thermometer-half"></i></span>
-              </div>
-              <select class="form-control select2" name="priority" required>
-                <option <?php if ($ticket_priority == 'Low') { echo "selected"; } ?> >Low</option>
-                <option <?php if ($ticket_priority == 'Medium') { echo "selected"; } ?> >Medium</option>
-                <option <?php if ($ticket_priority == 'High') { echo "selected"; } ?> >High</option>
-              </select>
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label>Subject <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-tag"></i></span>
-              </div>
-              <input type="text" class="form-control" name="subject" value="<?php echo $ticket_subject; ?>" placeholder="Subject" required>
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label>Client Contact</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 select2" name="contact">
-                <option value="">No One</option>
-                <?php 
-                
-                $sql_client_contacts_select = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
-                while ($row = mysqli_fetch_array($sql_client_contacts_select)) {
-                  $contact_id_select = $row['contact_id'];
-                  $contact_name_select = htmlentities($row['contact_name']);
-                ?>
-                <option <?php if ($contact_id_select == $contact_id) { echo "selected"; } ?> value="<?php echo $contact_id_select; ?>"><?php echo $contact_name_select; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label>Asset</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
-              </div>
-              <select class="form-control select2" name="asset">
-                <option value="0">- None -</option>
-                <?php
-
-                  $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
-                  while ($row = mysqli_fetch_array($sql_assets)) {
-                    $asset_id_select = $row['asset_id'];
-                    $asset_name_select = htmlentities($row['asset_name']);
-                    ?>
-                    <option <?php if (!empty($asset_id) && $asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
-
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-
-          <div class="form-group">
-            <textarea class="form-control summernote" rows="8" name="details" required><?php echo $ticket_details; ?></textarea>
-          </div>
-
         </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_ticket" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
\ No newline at end of file