diff --git a/add_asset_modal.php b/add_asset_modal.php
index 2aa18fa9..3b9a7de9 100644
--- a/add_asset_modal.php
+++ b/add_asset_modal.php
@@ -10,24 +10,24 @@
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
         <div class="modal-body bg-white">
-          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab" role="tablist">
+          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab">
             <li class="nav-item">
-              <a class="nav-link active" id="pills-basic-tab" data-toggle="pill" href="#pills-basic" role="tab" aria-controls="pills-home" aria-selected="true">Basic</a>
+              <a class="nav-link active" id="pills-details-tab" data-toggle="pill" href="#pills-details">Details</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" id="pills-assignment-tab" data-toggle="pill" href="#pills-assignment" role="tab" aria-controls="pills-assignment" aria-selected="false">Assignment</a>
+              <a class="nav-link" id="pills-assignment-tab" data-toggle="pill" href="#pills-assignment">Assignment</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" id="pills-purchase-tab" data-toggle="pill" href="#pills-purchase" role="tab" aria-controls="pills-purchase" aria-selected="false">Purchase</a>
+              <a class="nav-link" id="pills-purchase-tab" data-toggle="pill" href="#pills-purchase">Purchase</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" id="pills-login-tab" data-toggle="pill" href="#pills-login" role="tab" aria-controls="pills-login" aria-selected="false">Login</a>
+              <a class="nav-link" id="pills-login-tab" data-toggle="pill" href="#pills-login">Login</a>
             </li>
           </ul>
           <hr>
           <div class="tab-content" id="pills-tabContent">
             
-            <div class="tab-pane fade show active" id="pills-basic" role="tabpanel" aria-labelledby="pills-basic-tab">
+            <div class="tab-pane fade show active" id="pills-details">
               
               <div class="form-group">
                 <label>Asset Name <strong class="text-danger">*</strong></label>
@@ -85,7 +85,7 @@
               </div>
             </div>
 
-            <div class="tab-pane fade" id="pills-assignment" role="tabpanel" aria-labelledby="pills-assignment-tab">
+            <div class="tab-pane fade" id="pills-assignment">
               
               <div class="form-group">
                 <label>Location</label>
@@ -173,7 +173,7 @@
             
             </div>
             
-            <div class="tab-pane fade" id="pills-purchase" role="tabpanel" aria-labelledby="pills-purchase-tab">
+            <div class="tab-pane fade" id="pills-purchase">
               
               <div class="form-group">
                 <label>Vendor</label>
@@ -220,7 +220,7 @@
 
             </div>
 
-            <div class="tab-pane fade" id="pills-login" role="tabpanel" aria-labelledby="pills-login-tab">
+            <div class="tab-pane fade" id="pills-login">
 
               <div class="form-group">
                 <label>Username</label>
diff --git a/add_login_modal.php b/add_login_modal.php
index dd616194..6ed29322 100644
--- a/add_login_modal.php
+++ b/add_login_modal.php
@@ -13,21 +13,21 @@
 
           <ul class="nav nav-pills nav-justified mb-3" id="pills-tab">
             <li class="nav-item">
-              <a class="nav-link active" id="pills-login-tab" data-toggle="pill" href="#pills-login">Login</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" id="pills-notes-tab" data-toggle="pill" href="#pills-notes">Notes</a>
+              <a class="nav-link active" id="pills-details-tab" data-toggle="pill" href="#pills-details">Details</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" id="pills-relation-tab" data-toggle="pill" href="#pills-relation">Relation</a>
             </li>
+            <li class="nav-item">
+              <a class="nav-link" id="pills-notes-tab" data-toggle="pill" href="#pills-notes">Notes</a>
+            </li>
           </ul>
 
           <hr>
           
           <div class="tab-content" id="pills-tabContent">
 
-            <div class="tab-pane fade show active" id="pills-login">
+            <div class="tab-pane fade show active" id="pills-details">
 
               <div class="form-group">
                 <label>Name <strong class="text-danger">*</strong></label>
@@ -74,15 +74,6 @@
 
             </div>
 
-            <div class="tab-pane fade" id="pills-notes">
-
-              <div class="form-group">
-                <label>Notes</label>
-                <textarea class="form-control" rows="5" name="note"></textarea>
-              </div>
-
-            </div>
-
             <div class="tab-pane fade" id="pills-relation">
 
               <div class="form-group">
@@ -158,6 +149,16 @@
               </div>
 
             </div>
+
+            <div class="tab-pane fade" id="pills-notes">
+
+              <div class="form-group">
+                <label>Notes</label>
+                <textarea class="form-control" rows="5" name="note"></textarea>
+              </div>
+
+            </div>
+            
           </div>
         </div>
         <div class="modal-footer bg-white">
diff --git a/add_network_modal.php b/add_network_modal.php
index 8fad5409..ba125870 100644
--- a/add_network_modal.php
+++ b/add_network_modal.php
@@ -19,6 +19,16 @@
               <input type="text" class="form-control" name="name" placeholder="Network name (VLAN, WAN, LAN2 etc)" required autofocus>
             </div>
           </div>
+
+          <div class="form-group">
+            <label>vLAN</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="number" class="form-control" name="vlan" placeholder="ex. 20" data-inputmask="'mask': '9999'">
+            </div>
+          </div>
           
           <div class="form-group">
             <label>Network <strong class="text-danger">*</strong></label>
diff --git a/add_note_modal.php b/add_note_modal.php
index b09fbed6..b632d670 100644
--- a/add_note_modal.php
+++ b/add_note_modal.php
@@ -11,11 +11,9 @@
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
         <div class="modal-body bg-white">  
           <div class="form-group">
-            <label>Title <strong class="text-danger">*</strong></label>
             <input type="text" class="form-control" name="subject" placeholder="Title" required autofocus>
           </div>
           <div class="form-group">
-            <label>Note <strong class="text-danger">*</strong></label>
             <textarea class="form-control summernote" name="note" id="addClientNote"></textarea>
           </div>
         </div>
diff --git a/client_networks.php b/client_networks.php
index 1e08e265..b90c3f37 100644
--- a/client_networks.php
+++ b/client_networks.php
@@ -41,7 +41,7 @@ if(isset($_GET['o'])){
 
 $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM networks 
   WHERE client_id = $client_id 
-  AND (network_name LIKE '%$q%' OR network LIKE '%$q%' OR network_gateway LIKE '%$q%' OR network_dhcp_range LIKE '%$q%') 
+  AND (network_name LIKE '%$q%' OR network_vlan LIKE '%$q%' OR network LIKE '%$q%' OR network_gateway LIKE '%$q%' OR network_dhcp_range LIKE '%$q%') 
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
@@ -72,6 +72,7 @@ $total_pages = ceil($total_found_rows / 10);
         <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=network_name&o=<?php echo $disp; ?>">Name</a></th>
+            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=network_vlan&o=<?php echo $disp; ?>">vLAN</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=network&o=<?php echo $disp; ?>">Network</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=network_gateway&o=<?php echo $disp; ?>">Gateway</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=network_dhcp_range&o=<?php echo $disp; ?>">DHCP Range</a></th>
@@ -84,6 +85,7 @@ $total_pages = ceil($total_found_rows / 10);
           while($row = mysqli_fetch_array($sql)){
             $network_id = $row['network_id'];
             $network_name = $row['network_name'];
+            $network_vlan = $row['network_vlan'];
             $network = $row['network'];
             $network_gateway = $row['network_gateway'];
             $network_dhcp_range = $row['network_dhcp_range'];
@@ -92,6 +94,7 @@ $total_pages = ceil($total_found_rows / 10);
           ?>
           <tr>
             <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editNetworkModal<?php echo $network_id; ?>"><?php echo $network_name; ?></a></td>
+            <td><?php echo $network_vlan; ?></td>
             <td><?php echo $network; ?></td>
             <td><?php echo $network_gateway; ?></td>
             <td><?php echo $network_dhcp_range; ?></td>
diff --git a/client_software.php b/client_software.php
index 6b869b36..4318181f 100644
--- a/client_software.php
+++ b/client_software.php
@@ -87,7 +87,7 @@ $total_pages = ceil($total_found_rows / 10);
             $software_type = $row['software_type'];
             $software_license = $row['software_license'];
 
-            $sql_login = mysqli_query($mysqli,"SELECT * FROM logins WHERE software_id = $software_id");
+            $sql_login = mysqli_query($mysqli,"SELECT *, AES_DECRYPT(login_password, '$config_aes_key') AS login_password FROM logins WHERE software_id = $software_id");
             $row = mysqli_fetch_array($sql_login);
             $login_id = $row['login_id'];
             $login_username = $row['login_username'];
@@ -106,7 +106,7 @@ $total_pages = ceil($total_found_rows / 10);
               <button type="button" class="btn btn-dark btn-sm" data-toggle="modal" data-target="#viewPasswordModal<?php echo $login_id; ?>"><i class="fas fa-key"></i></button>
 
               <div class="modal" id="viewPasswordModal<?php echo $login_id; ?>" tabindex="-1">
-                <div class="modal-dialog modal-sm">
+                <div class="modal-dialog">
                   <div class="modal-content bg-dark">
                     <div class="modal-header text-white">
                       <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i><?php echo $software_name; ?></h5>
diff --git a/edit_asset_modal.php b/edit_asset_modal.php
index d626e89a..495e628b 100644
--- a/edit_asset_modal.php
+++ b/edit_asset_modal.php
@@ -14,9 +14,9 @@
         
         <div class="modal-body bg-white">
           
-          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab<?php echo $asset_id; ?>" role="tablist">
+          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab<?php echo $asset_id; ?>">
             <li class="nav-item">
-              <a class="nav-link active" id="pills-basic-tab<?php echo $asset_id; ?>" data-toggle="pill" href="#pills-basic<?php echo $asset_id; ?>" role="tab" aria-controls="pills-home<?php echo $asset_id; ?>" aria-selected="true">Basic</a>
+              <a class="nav-link active" id="pills-details-tab<?php echo $asset_id; ?>" data-toggle="pill" href="#pills-details<?php echo $asset_id; ?>" >Details</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" id="pills-assignment-tab<?php echo $asset_id; ?>" data-toggle="pill" href="#pills-assignment<?php echo $asset_id; ?>" role="tab" aria-controls="pills-assignment<?php echo $asset_id; ?>" aria-selected="false">Assignment</a>
@@ -33,7 +33,7 @@
           
           <div class="tab-content" id="pills-tabContent<?php echo $asset_id; ?>">
 
-            <div class="tab-pane fade show active" id="pills-basic<?php echo $asset_id; ?>" role="tabpanel" aria-labelledby="pills-basic-tab<?php echo $asset_id; ?>">
+            <div class="tab-pane fade show active" id="pills-details<?php echo $asset_id; ?>">
           
               <div class="form-group">
                 <label>Asset Name <strong class="text-danger">*</strong></label>
@@ -91,7 +91,7 @@
             
             </div>
 
-            <div class="tab-pane fade" id="pills-assignment<?php echo $asset_id; ?>" role="tabpanel" aria-labelledby="pills-assignment-tab<?php echo $asset_id; ?>">
+            <div class="tab-pane fade" id="pills-assignment<?php echo $asset_id; ?>">
 
               <div class="form-group">
                 <label>Location</label>
@@ -179,7 +179,7 @@
             
             </div>
 
-            <div class="tab-pane fade" id="pills-purchase<?php echo $asset_id; ?>" role="tabpanel" aria-labelledby="pills-purchase-tab<?php echo $asset_id; ?>">
+            <div class="tab-pane fade" id="pills-purchase<?php echo $asset_id; ?>">
 
               <div class="form-group">
                 <label>Vendor</label>
diff --git a/edit_login_modal.php b/edit_login_modal.php
index 9376a57f..cdd40784 100644
--- a/edit_login_modal.php
+++ b/edit_login_modal.php
@@ -13,21 +13,21 @@
 
           <ul class="nav nav-pills nav-justified mb-3" id="pills-tab<?php echo $login_id; ?>">
             <li class="nav-item">
-              <a class="nav-link active" id="pills-login-tab<?php echo $login_id; ?>" data-toggle="pill" href="#pills-login<?php echo $login_id; ?>">Login</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" id="pills-notes-tab" data-toggle="pill" href="#pills-notes<?php echo $login_id; ?>">Notes</a>
+              <a class="nav-link active" id="pills-details-tab<?php echo $login_id; ?>" data-toggle="pill" href="#pills-details<?php echo $login_id; ?>">Details</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" id="pills-relation-tab<?php echo $login_id; ?>" data-toggle="pill" href="#pills-relation<?php echo $login_id; ?>">Relation</a>
             </li>
+            <li class="nav-item">
+              <a class="nav-link" id="pills-notes-tab" data-toggle="pill" href="#pills-notes<?php echo $login_id; ?>">Notes</a>
+            </li>
           </ul>
 
           <hr>
           
           <div class="tab-content" id="pills-tabContent<?php echo $login_id; ?>">
 
-            <div class="tab-pane fade show active" id="pills-login<?php echo $login_id; ?>">
+            <div class="tab-pane fade show active" id="pills-details<?php echo $login_id; ?>">
 
               <div class="form-group">
                 <label>Name <strong class="text-danger">*</strong></label>
@@ -83,15 +83,6 @@
 
             </div>
 
-            <div class="tab-pane fade" id="pills-notes<?php echo $login_id; ?>">
-
-              <div class="form-group">
-                <label>Notes</label>
-                <textarea class="form-control" rows="5" name="note"><?php echo $login_note; ?></textarea>
-              </div>
-
-            </div>
-
             <div class="tab-pane fade" id="pills-relation<?php echo $login_id; ?>">
 
               <div class="form-group">
@@ -167,6 +158,16 @@
               </div>
 
             </div>
+
+            <div class="tab-pane fade" id="pills-notes<?php echo $login_id; ?>">
+
+              <div class="form-group">
+                <label>Notes</label>
+                <textarea class="form-control" rows="5" name="note"><?php echo $login_note; ?></textarea>
+              </div>
+
+            </div>
+
           </div>
         </div>
         <div class="modal-footer bg-white">
diff --git a/edit_network_modal.php b/edit_network_modal.php
index c87646c1..cdef1758 100644
--- a/edit_network_modal.php
+++ b/edit_network_modal.php
@@ -19,6 +19,16 @@
               <input type="text" class="form-control" name="name" placeholder="Network name (VLAN, WAN, LAN2 etc)"  value="<?php echo $network_name; ?>" required>
             </div>
           </div>
+
+          <div class="form-group">
+            <label>vLAN</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="number" class="form-control" name="vlan" placeholder="ex. 20" value="<?php echo $network_vlan; ?>" data-inputmask="'mask': '9999'">
+            </div>
+          </div>
           
           <div class="form-group">
             <label>Network <strong class="text-danger">*</strong></label>
diff --git a/edit_note_modal.php b/edit_note_modal.php
index 4d66c2dd..304b3d7f 100644
--- a/edit_note_modal.php
+++ b/edit_note_modal.php
@@ -11,11 +11,9 @@
         <input type="hidden" name="note_id" value="<?php echo $note_id; ?>">
         <div class="modal-body bg-white">  
           <div class="form-group">
-            <label>Subject <strong class="text-danger">*</strong></label>
             <input type="text" class="form-control" name="subject" value="<?php echo $note_subject; ?>" placeholder="Subject" required>
           </div>
           <div class="form-group">
-            <label>Note <strong class="text-danger">*</strong></label>
             <textarea class="form-control summernote" name="note"><?php echo $note_body; ?></textarea>
           </div>
         </div>
diff --git a/post.php b/post.php
index 6df29871..7beec1f7 100644
--- a/post.php
+++ b/post.php
@@ -2991,7 +2991,7 @@ if(isset($_POST['add_asset'])){
         $username = strip_tags(mysqli_real_escape_string($mysqli,$_POST['username']));
         $password = strip_tags(mysqli_real_escape_string($mysqli,$_POST['password']));
 
-        mysqli_query($mysqli,"INSERT INTO logins SET login_description = '$description', login_username = '$username', login_password = '$password', login_created_at = NOW(), asset_id = $asset_id, client_id = $client_id, company_id = $session_company_id");
+        mysqli_query($mysqli,"INSERT INTO logins SET login_name = '$name', login_username = '$username', login_password = AES_ENCRYPT('$password','$config_aes_key'), login_created_at = NOW(), asset_id = $asset_id, client_id = $client_id, company_id = $session_company_id");
 
     }
 
@@ -3035,12 +3035,12 @@ if(isset($_POST['edit_asset'])){
 
     //If login exists then update the login
     if($login_id > 0){
-        mysqli_query($mysqli,"UPDATE logins SET login_description = '$name', login_username = '$username', login_password = '$password', login_updated_at = NOW() WHERE login_id = $login_id AND company_id = $session_company_id");
+        mysqli_query($mysqli,"UPDATE logins SET login_name = '$name', login_username = '$username', login_password = AES_ENCRYPT('$password','$config_aes_key'), login_updated_at = NOW() WHERE login_id = $login_id AND company_id = $session_company_id");
     }else{
     //If Username is filled in then add a login
         if(!empty($username)) {
             
-            mysqli_query($mysqli,"INSERT INTO logins SET login_description = '$name', login_username = '$username', login_password = '$password', login_created_at = NOW(), asset_id = $asset_id, client_id = $client_id, company_id = $session_company_id");
+            mysqli_query($mysqli,"INSERT INTO logins SET login_name = '$name', login_username = '$username', login_password = AES_ENCRYPT('$password','$config_aes_key'), login_created_at = NOW(), asset_id = $asset_id, client_id = $client_id, company_id = $session_company_id");
 
         }
     }
@@ -3229,12 +3229,13 @@ if(isset($_POST['add_network'])){
 
     $client_id = intval($_POST['client_id']);
     $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
+    $vlan = intval($_POST['vlan']);
     $network = strip_tags(mysqli_real_escape_string($mysqli,$_POST['network']));
     $gateway = strip_tags(mysqli_real_escape_string($mysqli,$_POST['gateway']));
     $dhcp_range = strip_tags(mysqli_real_escape_string($mysqli,$_POST['dhcp_range']));
     $location_id = intval($_POST['location']);
 
-    mysqli_query($mysqli,"INSERT INTO networks SET network_name = '$name', network = '$network', network_gateway = '$gateway', network_dhcp_range = '$dhcp_range', network_created_at = NOW(), location_id = $location_id, client_id = $client_id, company_id = $session_company_id");
+    mysqli_query($mysqli,"INSERT INTO networks SET network_name = '$name', network_vlan = $vlan, network = '$network', network_gateway = '$gateway', network_dhcp_range = '$dhcp_range', network_created_at = NOW(), location_id = $location_id, client_id = $client_id, company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Network', log_action = 'Created', log_description = '$name', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
@@ -3249,12 +3250,13 @@ if(isset($_POST['edit_network'])){
 
     $network_id = intval($_POST['network_id']);
     $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
+    $vlan = intval($_POST['vlan']);
     $network = strip_tags(mysqli_real_escape_string($mysqli,$_POST['network']));
     $gateway = strip_tags(mysqli_real_escape_string($mysqli,$_POST['gateway']));
     $dhcp_range = strip_tags(mysqli_real_escape_string($mysqli,$_POST['dhcp_range']));
     $location_id = intval($_POST['location']);
 
-    mysqli_query($mysqli,"UPDATE networks SET network_name = '$name', network = '$network', network_gateway = '$gateway', network_dhcp_range = '$dhcp_range', network_updated_at = NOW(), location_id = $location_id WHERE network_id = $network_id AND company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE networks SET network_name = '$name', network_vlan = $vlan, network = '$network', network_gateway = '$gateway', network_dhcp_range = '$dhcp_range', network_updated_at = NOW(), location_id = $location_id WHERE network_id = $network_id AND company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Network', log_action = 'Modifed', log_description = '$name', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
@@ -3351,7 +3353,7 @@ if(isset($_POST['add_software'])){
         $username = strip_tags(mysqli_real_escape_string($mysqli,$_POST['username']));
         $password = strip_tags(mysqli_real_escape_string($mysqli,$_POST['password']));
 
-        mysqli_query($mysqli,"INSERT INTO logins SET login_description = '$name', login_username = '$username', login_password = '$password', software_id = $software_id, login_created_at = NOW(), client_id = $client_id, company_id = $session_company_id");
+        mysqli_query($mysqli,"INSERT INTO logins SET login_name = '$name', login_username = '$username', login_password = AES_ENCRYPT('$password','$config_aes_key'), software_id = $software_id, login_created_at = NOW(), client_id = $client_id, company_id = $session_company_id");
 
     }
 
@@ -3383,7 +3385,7 @@ if(isset($_POST['edit_software'])){
     //If Username is filled in then add a login
         if(!empty($username)) {
             
-            mysqli_query($mysqli,"INSERT INTO logins SET login_description = '$name', login_username = '$username', login_password = '$password', login_created_at = NOW(), asset_id = $asset_id, client_id = $client_id, company_id = $session_company_id");
+            mysqli_query($mysqli,"INSERT INTO logins SET login_name = '$name', login_username = '$username', login_password = AES_ENCRYPT('$password','$config_aes_key'), login_created_at = NOW(), asset_id = $asset_id, client_id = $client_id, company_id = $session_company_id");
 
         }
     }