diff --git a/agent/modals/invoice/invoice_add.php b/agent/modals/invoice/invoice_add.php
index deebd27c..9916e6f3 100644
--- a/agent/modals/invoice/invoice_add.php
+++ b/agent/modals/invoice/invoice_add.php
@@ -18,16 +18,6 @@ ob_start();
 
     <div class="modal-body">
 
-        <div class="form-group">
-            <label>Scope</label>
-            <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
-                </div>
-                <input type="text" class="form-control" name="scope" placeholder="Quick description" maxlength="255">
-            </div>
-        </div>
-
         <?php if ($client_id) { ?>
             <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
         <?php }else{ ?>
@@ -39,7 +29,7 @@ ob_start();
                         <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                     </div>
                     <select class="form-control select2" name="client_id" required>
-                        <option value="">- Client -</option>
+                        <option value="">- Select a Client -</option>
                         <?php
                         //select unarchived clients
                         $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
@@ -58,6 +48,16 @@ ob_start();
 
         <?php } ?>
 
+        <div class="form-group">
+            <label>Scope</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
+                </div>
+                <input type="text" class="form-control" name="scope" placeholder="Quick description" maxlength="255">
+            </div>
+        </div>
+
         <div class="form-group">
             <label>Category <strong class="text-danger">*</strong></label>
             <div class="input-group">
diff --git a/agent/modals/quote/quote_add.php b/agent/modals/quote/quote_add.php
index 667eb911..fb004f4e 100644
--- a/agent/modals/quote/quote_add.php
+++ b/agent/modals/quote/quote_add.php
@@ -18,16 +18,6 @@ ob_start();
 
     <div class="modal-body">
 
-        <div class="form-group">
-            <label>Scope</label>
-            <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
-                </div>
-                <input type="text" class="form-control" name="scope" placeholder="Quick description" maxlength="255">
-            </div>
-        </div>
-
         <?php if ($client_id) { ?>
             <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
         <?php } else { ?>
@@ -39,7 +29,7 @@ ob_start();
                         <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                     </div>
                     <select class="form-control select2" name="client_id" required>
-                        <option value="">- Client -</option>
+                        <option value="">- Select a Client -</option>
                         <?php
 
                         //select unarchived clients
@@ -57,6 +47,16 @@ ob_start();
 
         <?php } ?>
 
+        <div class="form-group">
+            <label>Scope</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
+                </div>
+                <input type="text" class="form-control" name="scope" placeholder="Quick description" maxlength="255">
+            </div>
+        </div>
+
         <div class="form-group">
             <label>Category <strong class="text-danger">*</strong></label>
             <div class="input-group">
diff --git a/agent/modals/recurring_invoice/recurring_invoice_add.php b/agent/modals/recurring_invoice/recurring_invoice_add.php
index 6f9ec187..781f4a66 100644
--- a/agent/modals/recurring_invoice/recurring_invoice_add.php
+++ b/agent/modals/recurring_invoice/recurring_invoice_add.php
@@ -18,16 +18,6 @@ ob_start();
 
     <div class="modal-body">
 
-        <div class="form-group">
-            <label>Scope</label>
-            <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
-                </div>
-                <input type="text" class="form-control" name="scope" placeholder="Quick description" maxlength="255">
-            </div>
-        </div>
-
         <?php if ($client_id) { ?>
             <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
         <?php } else { ?>
@@ -39,7 +29,7 @@ ob_start();
                         <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                     </div>
                     <select class="form-control select2" name="client_id" required>
-                        <option value="">- Client -</option>
+                        <option value="">- Select a Client -</option>
                         <?php
                         //select unarchived clients
                         $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
@@ -58,6 +48,16 @@ ob_start();
 
         <?php } ?>
 
+        <div class="form-group">
+            <label>Scope</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
+                </div>
+                <input type="text" class="form-control" name="scope" placeholder="Quick description" maxlength="255">
+            </div>
+        </div>
+
         <div class="form-group">
             <label>Start Date <strong class="text-danger">*</strong></label>
             <div class="input-group">
diff --git a/agent/modals/recurring_ticket/recurring_ticket_add.php b/agent/modals/recurring_ticket/recurring_ticket_add.php
index 525fff30..dc9cff9e 100644
--- a/agent/modals/recurring_ticket/recurring_ticket_add.php
+++ b/agent/modals/recurring_ticket/recurring_ticket_add.php
@@ -28,11 +28,6 @@ ob_start();
             <li class="nav-item">
                 <a class="nav-link active" data-toggle="pill" href="#pills-add-details"><i class="fa fa-fw fa-life-ring mr-2"></i>Details</a>
             </li>
-            <?php if (!$contact_id) { ?>
-            <li class="nav-item">
-                <a class="nav-link" data-toggle="pill" href="#pills-add-contacts"><i class="fa fa-fw fa-users mr-2"></i>Contact</a>
-            </li>
-            <?php } ?>
             <li class="nav-item">
                 <a class="nav-link" data-toggle="pill" href="#pills-add-schedule"><i class="fa fa-fw fa-building mr-2"></i>Schedule</a>
             </li>
@@ -45,13 +40,64 @@ ob_start();
 
             <div class="tab-pane fade show active" id="pills-add-details">
 
+                <?php if ($contact_id) { ?>
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
+                <?php } else { ?>
+                <div class="row">
+                    <div class="col">
+                        <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_id" id="changeClientSelect" required <?php if ($client_id) { echo "disabled"; } ?>>
+                                    <option value="">- Select a Client -</option>
+                                    <?php
+
+                                    $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+                                    while ($row = mysqli_fetch_assoc($sql)) {
+                                        $client_id_select = intval($row['client_id']);
+                                        $client_name = nullable_htmlentities($row['client_name']); ?>
+
+                                        <option value="<?php echo $client_id_select; ?>" <?php if ($client_id == $client_id_select) {echo "selected"; } ?>><?php echo $client_name; ?></option>
+
+                                    <?php } ?>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col">
+                        <div class="form-group">
+                            <label>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_id" id="contactSelect">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                
+                <?php } ?>
+
                 <div class="form-group">
-                    <label>Subject <strong class="text-danger">*</strong></label>
+                    <label>Subject <strong class="text-danger">*</strong> <?php if ($config_module_enable_accounting) { ?>/ <span class="text-secondary">Billable</span><?php } ?></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" maxlength="500" required>
+                        <?php if ($config_module_enable_accounting) { ?>
+                        <div class="input-group-append">
+                            <div class="input-group-text">
+                                <input type="checkbox" name="billable" <?php if ($config_ticket_default_billable == 1) { echo "checked"; } ?> value="1">
+                            </div>
+                        </div>
+                        <?php } ?>
                     </div>
                 </div>
 
@@ -133,63 +179,9 @@ ob_start();
                     </div>
                 </div>
 
-                <?php if ($config_module_enable_accounting) { ?>
-                <div class="form-group">
-                    <div class="custom-control custom-switch">
-                        <input type="checkbox" class="custom-control-input" name="billable" <?php if ($config_ticket_default_billable == 1) { echo "checked"; } ?> value="1" id="billable">
-                        <label class="custom-control-label" for="billable">Mark Billable</label>
-                    </div>
-                </div>
-                <?php } ?>
-
             </div>
 
-            <?php if ($contact_id) { ?>
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
-            <?php } else { ?>
-            <div class="tab-pane fade" id="pills-add-contacts">
-
-                <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_id" id="changeClientSelect" required <?php if ($client_id) { echo "disabled"; } ?>>
-                            <option value="">- Client -</option>
-                            <?php
-
-                            $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
-                            while ($row = mysqli_fetch_assoc($sql)) {
-                                $client_id_select = intval($row['client_id']);
-                                $client_name = nullable_htmlentities($row['client_name']); ?>
-
-                                <option value="<?php echo $client_id_select; ?>" <?php if ($client_id == $client_id_select) {echo "selected"; } ?>><?php echo $client_name; ?></option>
-
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
-
-                <div class="form-group">
-                    <label>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_id" id="contactSelect">
-                        </select>
-                    </div>
-                </div>
-
-                <div id="contacts-section">
-
-                </div>
-            </div>
-
-            <?php } ?>
+            
 
             <div class="tab-pane fade" id="pills-add-schedule">
 
@@ -345,7 +337,7 @@ ob_start();
 
     </div>
     <div class="modal-footer">
-        <button type="submit" name="add_recurring_ticket" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+        <button type="submit" name="add_recurring_ticket" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create Recurring Ticket</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
diff --git a/agent/modals/ticket/ticket_add_v2.php b/agent/modals/ticket/ticket_add_v2.php
index 63cc2c82..254186d6 100644
--- a/agent/modals/ticket/ticket_add_v2.php
+++ b/agent/modals/ticket/ticket_add_v2.php
@@ -33,11 +33,6 @@ ob_start();
             <li class="nav-item">
                 <a class="nav-link active" data-toggle="pill" href="#pills-add-details"><i class="fa fa-fw fa-life-ring mr-2"></i>Details</a>
             </li>
-            <?php if (!$contact_id) { ?>
-                <li class="nav-item">
-                    <a class="nav-link" data-toggle="pill" href="#pills-add-contacts"><i class="fa fa-fw fa-users mr-2"></i>Contact</a>
-                </li>
-            <?php } ?>
             <li class="nav-item">
                 <a class="nav-link" data-toggle="pill" href="#pills-add-relationships"><i class="fa fa-fw fa-desktop mr-2"></i>Assignment</a>
             </li>
@@ -49,6 +44,52 @@ ob_start();
             <!-- Ticket details -->
             <div class="tab-pane fade show active" id="pills-add-details">
 
+                <!-- Ticket client/contact -->
+                <?php if ($contact_id) { ?>
+                    <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
+                <?php } else { ?>
+
+                    <div class="row">
+                        <div class="col">
+                            <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_id" id="changeClientSelect" required <?php if ($client_id) { echo "disabled"; } ?>>
+                                        <option value="">- Select a Client -</option>
+                                        <?php
+
+                                        $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_lead = 0 AND client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+                                        while ($row = mysqli_fetch_assoc($sql)) {
+                                            $client_id_select = intval($row['client_id']);
+                                            $client_name = nullable_htmlentities($row['client_name']); ?>
+
+                                            <option value="<?php echo $client_id_select; ?>" <?php if ($client_id == $client_id_select) {echo "selected"; } ?>><?php echo $client_name; ?></option>
+
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col">
+                            <div class="form-group">
+                                <label>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_id" id="contactSelect">
+                                        <option value="">No Contact</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                <?php } ?>
+
                 <div class="form-group">
                     <label>Template</label>
                     <div class="input-group">
@@ -90,12 +131,19 @@ ob_start();
                 </div>
 
                 <div class="form-group">
-                    <label>Subject <strong class="text-danger">*</strong></label>
+                    <label>Subject <strong class="text-danger">*</strong> <?php if ($config_module_enable_accounting) { ?>/ <span class="text-secondary">Billable</span><?php } ?></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" id="subjectInput" name="subject" placeholder="Subject" maxlength="500" required>
+                        <?php if ($config_module_enable_accounting) { ?>
+                        <div class="input-group-append">
+                            <div class="input-group-text">
+                                <input type="checkbox" name="billable" <?php if ($config_ticket_default_billable == 1) { echo "checked"; } ?> value="1">
+                            </div>
+                        </div>
+                        <?php } ?>
                     </div>
                 </div>
 
@@ -176,59 +224,8 @@ ob_start();
                     </div>
                 </div>
 
-                <?php if ($config_module_enable_accounting) { ?>
-                    <div class="form-group">
-                        <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" name="billable" <?php if ($config_ticket_default_billable == 1) { echo "checked"; } ?> value="1" id="billable">
-                            <label class="custom-control-label" for="billable">Mark Billable</label>
-                        </div>
-                    </div>
-                <?php } ?>
-
             </div>
 
-            <!-- Ticket client/contact -->
-            <?php if ($contact_id) { ?>
-                <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
-            <?php } else { ?>
-                <div class="tab-pane fade" id="pills-add-contacts">
-
-                    <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_id" id="changeClientSelect" required <?php if ($client_id) { echo "disabled"; } ?>>
-                                <option value="">- Client -</option>
-                                <?php
-
-                                $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_lead = 0 AND client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
-                                while ($row = mysqli_fetch_assoc($sql)) {
-                                    $client_id_select = intval($row['client_id']);
-                                    $client_name = nullable_htmlentities($row['client_name']); ?>
-
-                                    <option value="<?php echo $client_id_select; ?>" <?php if ($client_id == $client_id_select) {echo "selected"; } ?>><?php echo $client_name; ?></option>
-
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>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_id" id="contactSelect">
-                            </select>
-                        </div>
-                    </div>
-
-                </div>
-            <?php } ?>
-
             <div class="tab-pane fade" id="pills-add-relationships">
                 To-do: project, etc.
 
@@ -290,7 +287,7 @@ ob_start();
     </div>
 
     <div class="modal-footer">
-        <button type="submit" name="add_ticket" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+        <button type="submit" name="add_ticket" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create Ticket</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
 
diff --git a/agent/modals/trip/trip_add.php b/agent/modals/trip/trip_add.php
index db252617..54a6cd6b 100644
--- a/agent/modals/trip/trip_add.php
+++ b/agent/modals/trip/trip_add.php
@@ -18,6 +18,36 @@ ob_start();
 
     <div class="modal-body">
 
+        <?php if ($client_id) { ?>
+            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+        <?php }else{ ?>
+
+            <div class="form-group">
+                <label>Client</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_id" required>
+                        <option value="0">- Client (Optional) -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at is NULL $access_permission_query ORDER BY client_name ASC");
+                        while ($row = mysqli_fetch_assoc($sql)) {
+                            $client_id_select = intval($row['client_id']);
+                            $client_name = nullable_htmlentities($row['client_name']);
+                            ?>
+                            <option value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
+
+                            <?php
+                        }
+                        ?>
+                    </select>
+                </div>
+            </div>
+
+        <?php } ?>
+
         <div class="form-row">
             <div class="form-group col">
                 <label>Date <strong class="text-danger">*</strong></label>
@@ -111,36 +141,6 @@ ob_start();
             </div>
         </div>
 
-        <?php if ($client_id) { ?>
-            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <?php }else{ ?>
-
-            <div class="form-group">
-                <label>Client</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_id" required>
-                        <option value="0">- Client (Optional) -</option>
-                        <?php
-
-                        $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at is NULL $access_permission_query ORDER BY client_name ASC");
-                        while ($row = mysqli_fetch_assoc($sql)) {
-                            $client_id_select = intval($row['client_id']);
-                            $client_name = nullable_htmlentities($row['client_name']);
-                            ?>
-                            <option value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
-
-                            <?php
-                        }
-                        ?>
-                    </select>
-                </div>
-            </div>
-
-        <?php } ?>
-
     </div>
 
     <div class="modal-footer">