diff --git a/ticket_add_modal.php b/ticket_add_modal.php
index 1b45ccdd..9f60c406 100644
--- a/ticket_add_modal.php
+++ b/ticket_add_modal.php
@@ -10,126 +10,168 @@
             <form action="post.php" method="post" autocomplete="off">
                 <div class="modal-body bg-white">
 
-                    <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" placeholder="Subject" required>
-                        </div>
-                    </div>
-
-
-
-                    <div class="form-group">
-                        <textarea class="form-control summernote" rows="5" name="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>Low</option>
-                                <option>Medium</option>
-                                <option>High</option>
-                            </select>
-                        </div>
-                    </div>
-
                     <?php if (isset($_GET['client_id'])) { ?>
-                        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-                        <div class="form-group">
-                            <label>Contact <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details"><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"><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>
+                        
+                    </ul>
+
+                    <hr>
+
+                    <?php } ?>
+
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-details">
+
+                            <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" placeholder="Subject" required>
                                 </div>
-                                <select class="form-control select2" name="contact" required>
-                                    <option value="">- Contact -</option>
-                                    <?php
-                                    $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $contact_id = $row['contact_id'];
-                                        $contact_name = htmlentities($row['contact_name']); ?>
-                                        <option value="<?php echo $contact_id; ?>" <?php if ($primary_contact == $contact_id) { echo "selected"; } ?>><?php echo "$contact_name"; ?></option>
+                            </div>
+
+                            <div class="form-group">
+                                <textarea class="form-control summernote" rows="5" name="details"></textarea>
+                            </div>
+
+                            <?php if (empty($_GET['client_id'])) { ?>
+                            
+                            <div class="form-group">
+                                <label>Client <strong class="text-danger">*</strong></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="client" required>
+                                        <option value="">- Client -</option>
+                                        <?php
+
+                                        $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
+                                        while ($row = mysqli_fetch_array($sql)) {
+                                            $client_id = $row['client_id'];
+                                            $client_name = htmlentities($row['client_name']); ?>
+                                            <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option>
 
                                         <?php } ?>
-                                </select>
-                            </div>
-                        </div>
-                    <?php } else { ?>
-                        <div class="form-group">
-                            <label>Client <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                                    </select>
                                 </div>
-                                <select class="form-control select2" name="client" required>
-                                    <option value="">- Client -</option>
-                                    <?php
-
-                                    $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $client_id = $row['client_id'];
-                                        $client_name = htmlentities($row['client_name']); ?>
-                                        <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option>
-
-                                    <?php } ?>
-                                </select>
                             </div>
-                        </div>
-                    <?php } ?>
 
-                    <?php if (isset($_GET['client_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>
+                            <?php } ?>
+
+                            <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>Low</option>
+                                        <option>Medium</option>
+                                        <option>High</option>
+                                    </select>
                                 </div>
-                                <select class="form-control select2" name="asset">
-                                    <option value="0">- None -</option>
-                                    <?php
+                            </div>
 
-                                    $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>
+                            <div class="form-group">
+                                <label>Assign to</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="assigned_to">
+                                        <option value="0">Not Assigned</option>
+                                        <?php
 
-                                    <?php } ?>
-                                </select>
+                                        $sql = 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)) {
+                                            $user_id = $row['user_id'];
+                                            $user_name = htmlentities($row['user_name']); ?>
+                                            <option <?php if ($session_user_id == $user_id) { echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <?php if (isset($_GET['client_id'])) { ?>
+
+                        <div class="tab-pane fade" id="pills-contacts">
+
+                            <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+                            <div class="form-group">
+                                <label>Contact <strong class="text-danger">*</strong></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="contact" required>
+                                        <option value="">- Contact -</option>
+                                        <?php
+                                        $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
+                                        while ($row = mysqli_fetch_array($sql)) {
+                                            $contact_id = $row['contact_id'];
+                                            $contact_name = htmlentities($row['contact_name']); ?>
+                                            <option value="<?php echo $contact_id; ?>" <?php if ($primary_contact == $contact_id) { echo "selected"; } ?>><?php echo "$contact_name"; ?></option>
+
+                                            <?php } ?>
+                                    </select>
+                                </div>
                             </div>
                         </div>
-                    <?php } ?>
 
-                    <div class="form-group">
-                        <label>Assign to</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
-                            </div>
-                            <select class="form-control select2" name="assigned_to">
-                                <option value="0">Not Assigned</option>
-                                <?php
+                        <div class="tab-pane fade" id="pills-vendors">
 
-                                $sql = 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)) {
-                                    $user_id = $row['user_id'];
-                                    $user_name = htmlentities($row['user_name']); ?>
-                                    <option <?php if ($session_user_id == $user_id) { echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
-                                <?php } ?>
-                            </select>
                         </div>
+
+                        <div class="tab-pane fade" id="pills-assets">
+
+                            <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>
+
+                        <?php } ?>
+
                     </div>
 
                 </div>