diff --git a/client_software_add_modal.php b/client_software_add_modal.php
index 06ba8aad..bd899b9a 100644
--- a/client_software_add_modal.php
+++ b/client_software_add_modal.php
@@ -16,10 +16,7 @@
                             <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-device-licenses">Device Licenses</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-user-licenses">User Licenses</a>
+                            <a class="nav-link" data-toggle="pill" href="#pills-licensing">Licensing</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
@@ -70,6 +67,10 @@
                                 </div>
                             </div>
 
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-licensing">
+
                             <div class="form-group">
                                 <label>License Type</label>
                                 <div class="input-group">
@@ -125,67 +126,54 @@
                                 </div>
                             </div>
 
-                        </div>
+                            <div class="form-group">
+                                <label>Devices</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="assets[]" data-placeholder="Select licensed Assets" multiple>
+                                        <?php
 
-                        <div class="tab-pane fade" id="pills-device-licenses">
+                                       $sql = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN contacts ON asset_contact_id = contact_id WHERE asset_archived_at IS NULL AND asset_client_id = $client_id ORDER BY asset_name ASC");
 
-                            <div class="alert alert-info">
-                                Select Assets that are licensed for this software
+                                        while ($row = mysqli_fetch_array($sql)) {
+                                            $asset_id = intval($row['asset_id']);
+                                            $asset_name = nullable_htmlentities($row['asset_name']);
+                                            $asset_type = nullable_htmlentities($row['asset_type']);
+                                            $contact_name = nullable_htmlentities($row['contact_name']);
+                                        ?>
+                                            <option value="<?php echo $asset_id; ?>"><?php echo "$asset_name - $contact_name"; ?></option>
+                                        <?php } ?>
+
+                                    </select>
+                                </div>
                             </div>
 
-                            <ul class="list-group">
+                            <div class="form-group">
+                                <label>Users</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-users"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="contacts[]" data-placeholder="Select licensed Users" multiple>
+                                        <?php
 
-                                <?php
-                                $sql = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN contacts ON asset_contact_id = contact_id WHERE asset_archived_at IS NULL AND asset_client_id = $client_id ORDER BY asset_name ASC");
+                                       $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
 
-                                while ($row = mysqli_fetch_array($sql)) {
-                                    $asset_id = intval($row['asset_id']);
-                                    $asset_name = nullable_htmlentities($row['asset_name']);
-                                    $asset_type = nullable_htmlentities($row['asset_type']);
-                                    $contact_name = nullable_htmlentities($row['contact_name']);
+                                        while ($row = mysqli_fetch_array($sql)) {
+                                            $contact_id = intval($row['contact_id']);
+                                            $contact_name = nullable_htmlentities($row['contact_name']);
+                                            $contact_email = nullable_htmlentities($row['contact_email']);
+                                            
+                                            ?>
+                                            <option value="<?php echo $contact_id; ?>"><?php echo "$contact_name - $contact_email"; ?></option>
+                                        <?php } ?>
 
-                                    ?>
-                                    <li class="list-group-item">
-                                        <div class="form-check">
-                                            <input type="checkbox" class="form-check-input" name="assets[]" value="<?php echo $asset_id; ?>">
-                                            <label class="form-check-label ml-2"><?php echo "$asset_name - $contact_name"; ?></label>
-                                        </div>
-                                    </li>
-
-                                <?php } ?>
-
-                            </ul>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-user-licenses">
-
-                            <div class="alert alert-info">
-                                Select Users that are licensed for this software
+                                    </select>
+                                </div>
                             </div>
 
-                            <ul class="list-group">
-
-                                <?php
-                                $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
-
-                                while ($row = mysqli_fetch_array($sql)) {
-                                    $contact_id = intval($row['contact_id']);
-                                    $contact_name = nullable_htmlentities($row['contact_name']);
-                                    $contact_email = nullable_htmlentities($row['contact_email']);
-
-                                    ?>
-                                    <li class="list-group-item">
-                                        <div class="form-check">
-                                            <input type="checkbox" class="form-check-input" name="contacts[]" value="<?php echo $contact_id; ?>">
-                                            <label class="form-check-label ml-2"><?php echo "$contact_name - $contact_email"; ?></label>
-                                        </div>
-                                    </li>
-
-                                <?php } ?>
-
-                            </ul>
-
                         </div>
 
                         <div class="tab-pane fade" id="pills-notes">