diff --git a/agent/modals/asset/asset_add.php b/agent/modals/asset/asset_add.php
index 45c795c8..6a1e6b05 100644
--- a/agent/modals/asset/asset_add.php
+++ b/agent/modals/asset/asset_add.php
@@ -49,10 +49,10 @@ ob_start();
                 <a class="nav-link active" data-toggle="pill" href="#pills-asset-details">Details</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" data-toggle="pill" href="#pills-asset-network">Network</a>
+                <a class="nav-link" data-toggle="pill" href="#pills-asset-assignment">Assignment</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" data-toggle="pill" href="#pills-asset-assignment">Assignment</a>
+                <a class="nav-link" data-toggle="pill" href="#pills-asset-network">Network</a>
             </li>
             <li class="nav-item">
                 <a class="nav-link" data-toggle="pill" href="#pills-asset-purchase">Purchase</a>
@@ -97,6 +97,21 @@ ob_start();
 
                 <?php } ?>
 
+                <div class="form-group">
+                    <label>Type <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-layer-group"></i></span>
+                        </div>
+                        <select class="form-control select2" name="type" required>
+                            <option value="">- Select Type -</option>
+                            <?php foreach($asset_types_array as $asset_type => $asset_icon) { ?>
+                                <option><?= $asset_type ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
                 <div class="form-group">
                     <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary" title="Pin to Overview">Favorite</span></label>
                     <div class="input-group">
@@ -114,38 +129,13 @@ ob_start();
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <label>Description</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-align-left"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="description" placeholder="Description of the asset" maxlength="255">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Type <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-tags"></i></span>
-                        </div>
-                        <select class="form-control select2" name="type" required>
-                            <option value="">- Select Type -</option>
-                            <?php foreach($asset_types_array as $asset_type => $asset_icon) { ?>
-                                <option><?= $asset_type ?></option>
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
                 <?php //Do not display Make Model or Serial if Virtual is selected
                 if ($type !== 'Virtual') { ?>
                     <div class="form-group">
                         <label>Make</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                                <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
                             </div>
                             <input type="text" class="form-control" name="make" placeholder="Manufacturer" maxlength="200">
                         </div>
@@ -155,7 +145,7 @@ ob_start();
                         <label>Model</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
                             </div>
                             <input type="text" class="form-control" name="model" placeholder="Model Number" maxlength="200">
                         </div>
@@ -177,13 +167,104 @@ ob_start();
                         <label>Operating System</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fab fa-fw fa-windows"></i></span>
+                                <span class="input-group-text"><i class="fas fa-fw fa-laptop-code"></i></span>
                             </div>
                             <input type="text" class="form-control" name="os" id="os" placeholder="ex Windows 10 Pro" maxlength="200">
                         </div>
                     </div>
                 <?php } ?>
 
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-align-left"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description" placeholder="Description of the asset" maxlength="255">
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-asset-assignment">
+
+                <?php if ($client_id) { ?>
+                <div class="form-group">
+                    <label>Location</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="location">
+                            <option value="">- Select Location -</option>
+                            <?php
+
+                            while ($row = mysqli_fetch_assoc($sql_location_select)) {
+                                $location_id = intval($row['location_id']);
+                                $location_name = nullable_htmlentities($row['location_name']);
+                                ?>
+                                <option value="<?= $location_id ?>"><?= $location_name ?></option>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+                <?php } ?>
+
+                <div class="form-group">
+                    <label>Physical Location</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200">
+                    </div>
+                </div>
+
+                <?php if ($client_id) { ?>
+                <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="contact">
+                            <option value="">- Select Contact -</option>
+                            <?php
+
+                            while ($row = mysqli_fetch_assoc($sql_contact_select)) {
+                                $contact_id_select = intval($row['contact_id']);
+                                $contact_name = nullable_htmlentities($row['contact_name']);
+                                ?>
+                                <option
+                                    <?php if ($contact_id == $contact_id_select) {
+                                    echo "selected"; }
+                                    ?>
+                                    value="<?= $contact_id_select ?>"><?= $contact_name ?>
+                                </option>
+
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+                <?php } ?>
+
+                <div class="form-group">
+                    <label>Status</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-circle"></i></span>
+                        </div>
+                        <select class="form-control select2" name="status">
+                            <option value="">- Select Status -</option>
+                            <?php foreach($asset_status_array as $asset_status) { ?>
+                                <option><?php echo $asset_status; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
             </div>
 
             <div class="tab-pane fade" id="pills-asset-network">
@@ -213,7 +294,7 @@ ob_start();
                 <?php } ?>
 
                 <div class="form-group">
-                    <label>IP Address or DHCP</label>
+                    <label>IPv4 Address / <span class="text-muted">DHCP</span></label>
                     <div class="input-group">
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
@@ -228,12 +309,12 @@ ob_start();
                 </div>
 
                 <div class="form-group">
-                    <label>NAT IP Address</label>
+                    <label>MAC Address</label>
                     <div class="input-group">
                         <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-random"></i></span>
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="nat_ip" placeholder="10.52.4.55" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
+                        <input type="text" class="form-control" name="mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
                     </div>
                 </div>
 
@@ -248,12 +329,12 @@ ob_start();
                 </div>
 
                 <div class="form-group">
-                    <label>MAC Address</label>
+                    <label>NAT Address</label>
                     <div class="input-group">
                         <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                            <span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
+                        <input type="text" class="form-control" name="nat_ip" placeholder="10.52.4.55" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
                     </div>
                 </div>
 
@@ -289,85 +370,6 @@ ob_start();
 
             </div>
 
-            <div class="tab-pane fade" id="pills-asset-assignment">
-
-                <div class="form-group">
-                    <label>Physical Location</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200">
-                    </div>
-                </div>
-
-                <?php if ($client_id) { ?>
-                <div class="form-group">
-                    <label>Location</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                        </div>
-                        <select class="form-control select2" name="location">
-                            <option value="">- Select Location -</option>
-                            <?php
-
-                            while ($row = mysqli_fetch_assoc($sql_location_select)) {
-                                $location_id = intval($row['location_id']);
-                                $location_name = nullable_htmlentities($row['location_name']);
-                                ?>
-                                <option value="<?= $location_id ?>"><?= $location_name ?></option>
-                            <?php } ?>
-
-                        </select>
-                    </div>
-                </div>
-
-                <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"></i></span>
-                        </div>
-                        <select class="form-control select2" name="contact">
-                            <option value="">- Select Contact -</option>
-                            <?php
-
-                            while ($row = mysqli_fetch_assoc($sql_contact_select)) {
-                                $contact_id_select = intval($row['contact_id']);
-                                $contact_name = nullable_htmlentities($row['contact_name']);
-                                ?>
-                                <option
-                                    <?php if ($contact_id == $contact_id_select) {
-                                    echo "selected"; }
-                                    ?>
-                                    value="<?= $contact_id_select ?>"><?= $contact_name ?>
-                                </option>
-
-                            <?php } ?>
-
-                        </select>
-                    </div>
-                </div>
-                <?php } ?>
-
-                <div class="form-group">
-                    <label>Status</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
-                        </div>
-                        <select class="form-control select2" name="status">
-                            <option value="">- Select Status -</option>
-                            <?php foreach($asset_status_array as $asset_status) { ?>
-                                <option><?php echo $asset_status; ?></option>
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
-            </div>
-
             <div class="tab-pane fade" id="pills-asset-purchase">
 
                 <?php if ($client_id) { ?>
@@ -398,7 +400,7 @@ ob_start();
                         <label>Purchase Reference</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                                <span class="input-group-text"><i class="fa fa-fw fa-receipt"></i></span>
                             </div>
                             <input type="text" class="form-control" name="purchase_reference" placeholder="eg. Invoice, PO Number">
                         </div>
@@ -445,7 +447,7 @@ ob_start();
                     <label>Username</label>
                     <div class="input-group">
                         <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa  fa-fw fa-user"></i></span>
+                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                         </div>
                         <input type="text" class="form-control" name="username" placeholder="Username">
                     </div>
@@ -466,12 +468,12 @@ ob_start();
             <div class="tab-pane fade" id="pills-asset-notes">
 
                 <div class="form-group">
-                    <label>Upload Photo</label>
-                    <input type="file" class="form-control-file" name="file" accept="image/*">
+                    <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
                 </div>
 
                 <div class="form-group">
-                    <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
+                    <label>Upload Photo</label>
+                    <input type="file" class="form-control-file" name="file" accept="image/*">
                 </div>
 
                 <div class="form-group">
diff --git a/agent/modals/asset/asset_copy.php b/agent/modals/asset/asset_copy.php
index 401183f3..c3152281 100644
--- a/agent/modals/asset/asset_copy.php
+++ b/agent/modals/asset/asset_copy.php
@@ -62,10 +62,10 @@ ob_start();
                 <a class="nav-link active" data-toggle="pill" href="#pillsDetailsCopy<?php echo $asset_id; ?>">Details</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" data-toggle="pill" href="#pillsNetworkCopy<?php echo $asset_id; ?>">Network</a>
+                <a class="nav-link" data-toggle="pill" href="#pillsAssignmentCopy<?php echo $asset_id; ?>">Assignment</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" data-toggle="pill" href="#pillsAssignmentCopy<?php echo $asset_id; ?>">Assignment</a>
+                <a class="nav-link" data-toggle="pill" href="#pillsNetworkCopy<?php echo $asset_id; ?>">Network</a>
             </li>
             <li class="nav-item">
                 <a class="nav-link" data-toggle="pill" href="#pillsPurchaseCopy<?php echo $asset_id; ?>">Purchase</a>
@@ -84,31 +84,11 @@ ob_start();
 
             <div class="tab-pane fade show active" id="pillsDetailsCopy<?php echo $asset_id; ?>">
 
-                <div class="form-group">
-                    <label>Name <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="name" placeholder="Name the asset" value="<?php echo $asset_name; ?>" required>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Description</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="description" placeholder="Description of the asset" value="<?php echo $asset_description; ?>">
-                    </div>
-                </div>
-
                 <div class="form-group">
                     <label>Type <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-tags"></i></span>
+                            <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
                         </div>
                         <select class="form-control select2" name="type" required>
                             <?php foreach($asset_types_array as $asset_type_select => $asset_icon_select) { ?>
@@ -118,13 +98,23 @@ ob_start();
                     </div>
                 </div>
 
+                <div class="form-group">
+                    <label>Name <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="name" placeholder="Name the asset" value="<?php echo $asset_name; ?>" required>
+                    </div>
+                </div>
+
                 <?php //Do not display Make Model or Serial if Virtual is selected
                 if ($asset_type !== 'virtual') { ?>
                     <div class="form-group">
-                        <label>Make </label>
+                        <label>Make</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                                <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
                             </div>
                             <input type="text" class="form-control" name="make" placeholder="Manufacturer" value="<?php echo $asset_make; ?>">
                         </div>
@@ -134,7 +124,7 @@ ob_start();
                         <label>Model</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
                             </div>
                             <input type="text" class="form-control" name="model" placeholder="Model Number" value="<?php echo $asset_model; ?>">
                         </div>
@@ -156,13 +146,95 @@ ob_start();
                         <label>Operating System</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fab fa-fw fa-windows"></i></span>
+                                <span class="input-group-text"><i class="fas fa-fw fa-laptop-code"></i></span>
                             </div>
                             <input type="text" class="form-control" name="os" placeholder="ex Windows 10 Pro" value="<?php echo $asset_os; ?>">
                         </div>
                     </div>
                 <?php } ?>
 
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-align-left"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description" placeholder="Description of the asset" value="<?php echo $asset_description; ?>">
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pillsAssignmentCopy<?php echo $asset_id; ?>">
+
+                <div class="form-group">
+                    <label>Location</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="location">
+                            <option value="">- Select Location -</option>
+                            <?php
+
+                            $sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
+                            while ($row = mysqli_fetch_assoc($sql_locations)) {
+                                $location_id_select = intval($row['location_id']);
+                                $location_name_select = nullable_htmlentities($row['location_name']);
+                                ?>
+                                <option <?php if ($asset_location_id == $location_id_select) { echo "selected"; } ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name_select; ?></option>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Physical Location</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B">
+                    </div>
+                </div>
+
+                <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="contact">
+                            <option value="">- Select Contact -</option>
+                            <?php
+
+                            $sql_contacts = 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_assoc($sql_contacts)) {
+                                $contact_id_select = intval($row['contact_id']);
+                                $contact_name_select = nullable_htmlentities($row['contact_name']);
+                                ?>
+                                <option value="<?php echo $contact_id_select; ?>"><?php echo $contact_name_select; ?></option>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Status</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-circle"></i></span>
+                        </div>
+                        <select class="form-control select2" name="status">
+                            <?php foreach($asset_status_array as $asset_status_select) { ?>
+                                <option <?php if ($asset_status_select == $asset_status) { echo "selected"; } ?>><?php echo $asset_status_select; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
             </div>
 
             <div class="tab-pane fade" id="pillsNetworkCopy<?php echo $asset_id; ?>">
@@ -192,7 +264,7 @@ ob_start();
                 </div>
 
                 <div class="form-group">
-                    <label>IP Address or DHCP</label>
+                    <label>IP Address / <span class="text-muted">DHCP</span></label>
                     <div class="input-group">
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
@@ -207,12 +279,12 @@ ob_start();
                 </div>
 
                 <div class="form-group">
-                    <label>NAT IP</label>
+                    <label>MAC Address</label>
                     <div class="input-group">
                         <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-random"></i></span>
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="nat_ip" placeholder="10.52.4.55" data-inputmask="'alias': 'ip'" data-mask>
+                        <input type="text" class="form-control" name="mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" data-mask>
                     </div>
                 </div>
 
@@ -227,12 +299,12 @@ ob_start();
                 </div>
 
                 <div class="form-group">
-                    <label>MAC Address</label>
+                    <label>NAT Address</label>
                     <div class="input-group">
                         <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                            <span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" data-mask>
+                        <input type="text" class="form-control" name="nat_ip" placeholder="10.52.4.55" data-inputmask="'alias': 'ip'" data-mask>
                     </div>
                 </div>
 
@@ -258,78 +330,6 @@ ob_start();
 
             </div>
 
-            <div class="tab-pane fade" id="pillsAssignmentCopy<?php echo $asset_id; ?>">
-
-                <div class="form-group">
-                    <label>Physical Location</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Location</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                        </div>
-                        <select class="form-control select2" name="location">
-                            <option value="">- Select Location -</option>
-                            <?php
-
-                            $sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
-                            while ($row = mysqli_fetch_assoc($sql_locations)) {
-                                $location_id_select = intval($row['location_id']);
-                                $location_name_select = nullable_htmlentities($row['location_name']);
-                                ?>
-                                <option <?php if ($asset_location_id == $location_id_select) { echo "selected"; } ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name_select; ?></option>
-                            <?php } ?>
-
-                        </select>
-                    </div>
-                </div>
-
-                <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"></i></span>
-                        </div>
-                        <select class="form-control select2" name="contact">
-                            <option value="">- Select Contact -</option>
-                            <?php
-
-                            $sql_contacts = 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_assoc($sql_contacts)) {
-                                $contact_id_select = intval($row['contact_id']);
-                                $contact_name_select = nullable_htmlentities($row['contact_name']);
-                                ?>
-                                <option value="<?php echo $contact_id_select; ?>"><?php echo $contact_name_select; ?></option>
-                            <?php } ?>
-
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Status</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
-                        </div>
-                        <select class="form-control select2" name="status">
-                            <?php foreach($asset_status_array as $asset_status_select) { ?>
-                                <option <?php if ($asset_status_select == $asset_status) { echo "selected"; } ?>><?php echo $asset_status_select; ?></option>
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
-            </div>
-
             <div class="tab-pane fade" id="pillsPurchaseCopy<?php echo $asset_id; ?>">
 
                 <div class="form-group">
@@ -379,7 +379,7 @@ ob_start();
                         <label>Purchase Date</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                                <span class="input-group-text"><i class="fa fa-fw fa-receipt"></i></span>
                             </div>
                             <input type="date" class="form-control" name="purchase_date" max="2999-12-31" value="<?php echo $asset_purchase_date; ?>">
                         </div>
@@ -425,12 +425,12 @@ ob_start();
             <div class="tab-pane fade" id="pillsNotesCopy<?php echo $asset_id; ?>">
 
                 <div class="form-group">
-                    <label>Upload Photo</label>
-                    <input type="file" class="form-control-file" name="file">
+                    <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $asset_notes; ?></textarea>
                 </div>
 
                 <div class="form-group">
-                    <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $asset_notes; ?></textarea>
+                    <label>Upload Photo</label>
+                    <input type="file" class="form-control-file" name="file">
                 </div>
 
             </div>
diff --git a/agent/modals/asset/asset_edit.php b/agent/modals/asset/asset_edit.php
index 704fc78d..be7a6686 100644
--- a/agent/modals/asset/asset_edit.php
+++ b/agent/modals/asset/asset_edit.php
@@ -80,10 +80,10 @@ ob_start();
                 <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-network">Network</a>
+                <a class="nav-link" data-toggle="pill" href="#pills-assignment">Assignment</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" data-toggle="pill" href="#pills-assignment">Assignment</a>
+                <a class="nav-link" data-toggle="pill" href="#pills-network">Network</a>
             </li>
             <li class="nav-item">
                 <a class="nav-link" data-toggle="pill" href="#pills-purchase">Purchase</a>
@@ -102,6 +102,20 @@ ob_start();
 
             <div class="tab-pane fade show active" id="pills-details">
 
+                <div class="form-group">
+                    <label>Type <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-layer-group"></i></span>
+                        </div>
+                        <select class="form-control select2" name="type" required>
+                            <?php foreach($asset_types_array as $asset_type_select => $asset_icon_select) { ?>
+                                <option <?php if ($asset_type_select == $asset_type) { echo "selected"; } ?>><?php echo $asset_type_select; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
                 <div class="form-group">
                     <label>Name <strong class="text-danger">*</strong></label>
                     <div class="input-group">
@@ -123,37 +137,13 @@ ob_start();
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <label>Description</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-align-left"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="description" placeholder="Description of the asset" maxlength="255" value="<?= $asset_description ?>">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Type <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-tags"></i></span>
-                        </div>
-                        <select class="form-control select2" name="type" required>
-                            <?php foreach($asset_types_array as $asset_type_select => $asset_icon_select) { ?>
-                                <option <?php if ($asset_type_select == $asset_type) { echo "selected"; } ?>><?php echo $asset_type_select; ?></option>
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
                 <?php //Do not display Make Model or Serial if Virtual is selected
                 if ($asset_type !== 'virtual') { ?>
                     <div class="form-group">
-                        <label>Make </label>
+                        <label>Make</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                                <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
                             </div>
                             <input type="text" class="form-control" name="make" placeholder="Manufacturer" maxlength="200" value="<?= $asset_make ?>">
                         </div>
@@ -163,7 +153,7 @@ ob_start();
                         <label>Model</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
                             </div>
                             <input type="text" class="form-control" name="model" placeholder="Model Number" maxlength="200" value="<?= $asset_model ?>">
                         </div>
@@ -185,13 +175,109 @@ ob_start();
                         <label>Operating System</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fab fa-fw fa-windows"></i></span>
+                                <span class="input-group-text"><i class="fas fa-fw fa-laptop-code"></i></span>
                             </div>
                             <input type="text" class="form-control" name="os" id="os" placeholder="ex Windows 10 Pro" maxlength="200" value="<?= $asset_os ?>">
                         </div>
                     </div>
                 <?php } ?>
 
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-align-left"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description" placeholder="Description of the asset" maxlength="255" value="<?= $asset_description ?>">
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-assignment">
+
+                <div class="form-group">
+                    <label>Location</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="location">
+                            <option value="">- Select Location -</option>
+                            <?php
+
+                            $sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_id = $asset_location_id OR location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
+                            while ($row = mysqli_fetch_assoc($sql_locations)) {
+                                $location_id_select = intval($row['location_id']);
+                                $location_name_select = nullable_htmlentities($row['location_name']);
+                                $location_archived_at = nullable_htmlentities($row['location_archived_at']);
+                                if ($location_archived_at) {
+                                    $location_name_select_display = "($location_name_select) - ARCHIVED";
+                                } else {
+                                    $location_name_select_display = $location_name_select;
+                                }
+                                ?>
+                                <option <?php if ($asset_location_id == $location_id_select) { echo "selected"; } ?> value="<?= $location_id_select ?>"><?= $location_name_select_display ?></option>
+
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Physical Location</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200" value="<?= $asset_physical_location ?>">
+                    </div>
+                </div>
+
+                <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="contact">
+                            <option value="">- Select Contact -</option>
+                            <?php
+
+                            $sql_contacts = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_id = $asset_contact_id OR contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
+                            while ($row = mysqli_fetch_assoc($sql_contacts)) {
+                                $contact_id_select = intval($row['contact_id']);
+                                $contact_name_select = nullable_htmlentities($row['contact_name']);
+                                $contact_archived_at = nullable_htmlentities($row['contact_archived_at']);
+                                if ($contact_archived_at) {
+                                    $contact_name_select_display = "($contact_name_select) - ARCHIVED";
+                                } else {
+                                    $contact_name_select_display = $contact_name_select;
+                                }
+                                ?>
+                                <option <?php if ($asset_contact_id == $contact_id_select) { echo "selected"; } ?> value="<?= $contact_id_select ?>">
+                                    <?= $contact_name_select_display ?>
+                                </option>
+
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Status</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-circle"></i></span>
+                        </div>
+                        <select class="form-control select2" name="status">
+                            <?php foreach($asset_status_array as $asset_status_select) { ?>
+                                <option <?php if ($asset_status_select == $asset_status) { echo "selected"; } ?>><?= $asset_status_select ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
             </div>
 
             <div class="tab-pane fade" id="pills-network">
@@ -227,7 +313,7 @@ ob_start();
                 </div>
 
                 <div class="form-group">
-                    <label>IP Address or DHCP</label>
+                    <label>IPv4 Address / <span class="text-muted">DHCP</span></label>
                     <div class="input-group">
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
@@ -242,12 +328,12 @@ ob_start();
                 </div>
 
                 <div class="form-group">
-                    <label>NAT IP</label>
+                    <label>MAC Address</label>
                     <div class="input-group">
                         <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-random"></i></span>
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="nat_ip" value="<?= $asset_nat_ip ?>" placeholder="10.52.4.55" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
+                        <input type="text" class="form-control" name="mac" value="<?= $asset_mac ?>" placeholder="MAC Address" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
                     </div>
                 </div>
 
@@ -262,12 +348,12 @@ ob_start();
                 </div>
 
                 <div class="form-group">
-                    <label>MAC Address</label>
+                    <label>NAT Address</label>
                     <div class="input-group">
                         <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                            <span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="mac" value="<?= $asset_mac ?>" placeholder="MAC Address" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
+                        <input type="text" class="form-control" name="nat_ip" value="<?= $asset_nat_ip ?>" placeholder="10.52.4.55" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
                     </div>
                 </div>
 
@@ -302,92 +388,6 @@ ob_start();
 
             </div>
 
-            <div class="tab-pane fade" id="pills-assignment">
-
-                <div class="form-group">
-                    <label>Physical Location</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200" value="<?= $asset_physical_location ?>">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Location</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                        </div>
-                        <select class="form-control select2" name="location">
-                            <option value="">- Select Location -</option>
-                            <?php
-
-                            $sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_id = $asset_location_id OR location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
-                            while ($row = mysqli_fetch_assoc($sql_locations)) {
-                                $location_id_select = intval($row['location_id']);
-                                $location_name_select = nullable_htmlentities($row['location_name']);
-                                $location_archived_at = nullable_htmlentities($row['location_archived_at']);
-                                if ($location_archived_at) {
-                                    $location_name_select_display = "($location_name_select) - ARCHIVED";
-                                } else {
-                                    $location_name_select_display = $location_name_select;
-                                }
-                                ?>
-                                <option <?php if ($asset_location_id == $location_id_select) { echo "selected"; } ?> value="<?= $location_id_select ?>"><?= $location_name_select_display ?></option>
-
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
-                <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"></i></span>
-                        </div>
-                        <select class="form-control select2" name="contact">
-                            <option value="">- Select Contact -</option>
-                            <?php
-
-                            $sql_contacts = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_id = $asset_contact_id OR contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
-                            while ($row = mysqli_fetch_assoc($sql_contacts)) {
-                                $contact_id_select = intval($row['contact_id']);
-                                $contact_name_select = nullable_htmlentities($row['contact_name']);
-                                $contact_archived_at = nullable_htmlentities($row['contact_archived_at']);
-                                if ($contact_archived_at) {
-                                    $contact_name_select_display = "($contact_name_select) - ARCHIVED";
-                                } else {
-                                    $contact_name_select_display = $contact_name_select;
-                                }
-                                ?>
-                                <option <?php if ($asset_contact_id == $contact_id_select) { echo "selected"; } ?> value="<?= $contact_id_select ?>">
-                                    <?= $contact_name_select_display ?>
-                                </option>
-
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Status</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
-                        </div>
-                        <select class="form-control select2" name="status">
-                            <?php foreach($asset_status_array as $asset_status_select) { ?>
-                                <option <?php if ($asset_status_select == $asset_status) { echo "selected"; } ?>><?= $asset_status_select ?></option>
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
-            </div>
-
             <div class="tab-pane fade" id="pills-purchase">
 
                 <div class="form-group">
@@ -423,7 +423,7 @@ ob_start();
                         <label>Purchase Reference</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                                <span class="input-group-text"><i class="fa fa-fw fa-receipt"></i></span>
                             </div>
                             <input type="text" class="form-control" name="purchase_reference" placeholder="eg. Invoice, PO Number" value="<?= $asset_purchase_reference ?>">
                         </div>