diff --git a/add_login_modal.php b/add_login_modal.php
index 4899e9fb..352817f3 100644
--- a/add_login_modal.php
+++ b/add_login_modal.php
@@ -10,131 +10,138 @@
       <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">  
-          <div class="form-group">
-            <label>Description <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-info-circle"></i></span>
-              </div>
-              <input type="text" class="form-control" name="description" placeholder="Description of the login" required autofocus>
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Web Link</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
-              </div>
-              <input type="url" class="form-control" name="web_link" placeholder="Please include http://">
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Username <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>
-              <input type="text" class="form-control" name="username" placeholder="Username" required>
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Password <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-lock"></i></span>
-              </div>
-              <input type="text" class="form-control" name="password" placeholder="Password" required>
-            </div>
-          </div>
-          <center><a class="btn btn-link" data-toggle="collapse" href="#optionsCollapse" role="button" aria-expanded="false" aria-controls="optionsCollapse">Link Options</a></center>
-          <div class="collapse multi-collapse" id="optionsCollapse">
-            <ul class="nav nav-pills mb-3" id="pills-tab" role="tablist">
-              <li class="nav-item">
-                <a class="nav-link" id="pills-vendor-tab" data-toggle="pill" href="#pills-vendor" role="tab" aria-controls="pills-vendor" aria-selected="true">Vendor</a>
-              </li>
-              <li class="nav-item">
-                <a class="nav-link" id="pills-asset-tab" data-toggle="pill" href="#pills-asset" role="tab" aria-controls="pills-asset" aria-selected="false">Asset</a>
-              </li>
-              <li class="nav-item">
-                <a class="nav-link" id="pills-application-tab" data-toggle="pill" href="#pills-application" role="tab" aria-controls="pill-application" aria-selected="false">Application</a>
-              </li>
-            </ul>
-            <div class="tab-content" id="pills-tabContent">
-              <div class="tab-pane fade" id="pills-vendor" role="tabpanel" aria-labelledby="pills-vendor-tab">
-                <div class="form-group">
-                  <label>Vendor</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" name="vendor">
-                      <option value="">- Vendor -</option>
-                      <?php 
-                      
-                      $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE client_id = $client_id"); 
-                      while($row = mysqli_fetch_array($sql_vendors)){
-                        $vendor_id = $row['vendor_id'];
-                        $vendor_name = $row['vendor_name'];
-                      ?>
-                        <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
-                      
-                      <?php
-                      }
-                      ?>
-                    </select>
+
+          <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-link-tab" data-toggle="pill" href="#pills-link">Link</a>
+            </li>
+          </ul>
+
+          <hr>
+          
+          <div class="tab-content" id="pills-tabContent">
+
+            <div class="tab-pane fade show active" id="pills-login">
+
+              <div class="form-group">
+                <label>Description <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-info-circle"></i></span>
                   </div>
+                  <input type="text" class="form-control" name="description" placeholder="Description of the login" required autofocus>
                 </div>
               </div>
-              <div class="tab-pane fade" id="pills-asset" role="tabpanel" aria-labelledby="pills-asset-tab">
-                <div class="form-group">
-                  <label>Asset</label>
-                  <div class="input-group">
-                    <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-                    </div>
-                    <select class="form-control" name="asset">
-                      <option value="">- Asset -</option>
-                      <?php 
-                      
-                      $sql = mysqli_query($mysqli,"SELECT * FROM assets WHERE client_id = $client_id"); 
-                      while($row = mysqli_fetch_array($sql)){
-                        $asset_id = $row['asset_id'];
-                        $asset_name = $row['asset_name'];
-                      ?>
-                        <option value="<?php echo $asset_id; ?>"><?php echo $asset_name; ?></option>
-                      
-                      <?php
-                      }
-                      ?>
-                    </select>
+            
+              <div class="form-group">
+                <label>Username <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>
+                  <input type="text" class="form-control" name="username" placeholder="Username" required>
                 </div>
               </div>
-              <div class="tab-pane fade" id="pills-application" role="tabpanel" aria-labelledby="pills-application-tab">
-                <div class="form-group">
-                  <label>Application</label>
-                  <div class="input-group">
-                    <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-fw fa-box"></i></span>
-                    </div>
-                    <select class="form-control" name="application">
-                      <option value="">- Application -</option>
-                      <?php 
-                      
-                      $sql = mysqli_query($mysqli,"SELECT * FROM applications WHERE client_id = $client_id"); 
-                      while($row = mysqli_fetch_array($sql)){
-                        $application_id = $row['application_id'];
-                        $application_name = $row['application_name'];
-                      ?>
-                        <option value="<?php echo $application_id; ?>"><?php echo $application_name; ?></option>
-                      
-                      <?php
-                      }
-                      ?>
-                    </select>
+              
+              <div class="form-group">
+                <label>Password <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-lock"></i></span>
                   </div>
+                  <input type="text" class="form-control" name="password" placeholder="Password" required>
                 </div>
               </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-link">
+  
+              <div class="form-group">
+                <label>Web Link</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
+                  </div>
+                  <input type="url" class="form-control" name="web_link" placeholder="Please include http://">
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Vendor</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" name="vendor">
+                    <option value="">- Vendor -</option>
+                    <?php 
+                    
+                    $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE client_id = $client_id"); 
+                    while($row = mysqli_fetch_array($sql_vendors)){
+                      $vendor_id = $row['vendor_id'];
+                      $vendor_name = $row['vendor_name'];
+                    ?>
+                      <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+            
+              <div class="form-group">
+                <label>Asset</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                  </div>
+                  <select class="form-control" name="asset">
+                    <option value="">- Asset -</option>
+                    <?php 
+                    
+                    $sql = mysqli_query($mysqli,"SELECT * FROM assets WHERE client_id = $client_id"); 
+                    while($row = mysqli_fetch_array($sql)){
+                      $asset_id = $row['asset_id'];
+                      $asset_name = $row['asset_name'];
+                    ?>
+                      <option value="<?php echo $asset_id; ?>"><?php echo $asset_name; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+            
+              <div class="form-group">
+                <label>software</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-box"></i></span>
+                  </div>
+                  <select class="form-control" name="software">
+                    <option value="">- software -</option>
+                    <?php 
+                    
+                    $sql = mysqli_query($mysqli,"SELECT * FROM software WHERE client_id = $client_id"); 
+                    while($row = mysqli_fetch_array($sql)){
+                      $software_id = $row['software_id'];
+                      $software_name = $row['software_name'];
+                    ?>
+                      <option value="<?php echo $software_id; ?>"><?php echo $software_name; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+
             </div>
           </div>
         </div>
diff --git a/add_software_modal.php b/add_software_modal.php
index 922599a1..46e08139 100644
--- a/add_software_modal.php
+++ b/add_software_modal.php
@@ -9,63 +9,84 @@
       </div>
       <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">    
-          
-          <div class="form-group">
-            <label>Software 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-cube"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" placeholder="Software name" required autofocus>
-            </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-tag"></i></span>
-              </div>
-              <select class="form-control selectpicker show-tick" name="type" required>
-                <option value="">- Type -</option>
-                <?php foreach($software_types_array as $software_type) { ?>
-                <option><?php echo $software_type; ?></option>
-                <?php } ?>
-              </select> 
-            </div>
-          </div>
-        
-          <div class="form-group">
-            <label>License</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-              </div>
-              <input type="text" class="form-control" name="license" placeholder="License key"> 
-            </div>
-          </div>
+        <div class="modal-body bg-white">
 
-          <center><a class="btn btn-link" data-toggle="collapse" href="#optionsCollapse" role="button" aria-expanded="false" aria-controls="optionsCollapse">Add a pasword</a></center>
-          <div class="collapse multi-collapse" id="optionsCollapse">
-            <div class="form-group">
-              <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>
+          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab">
+            <li class="nav-item">
+              <a class="nav-link active" id="pills-software-tab" data-toggle="pill" href="#pills-software">Software</a>
+            </li>
+            <li class="nav-item">
+              <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-software">
+          
+              <div class="form-group">
+                <label>Software 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-cube"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="name" placeholder="Software name" required autofocus>
                 </div>
-                <input type="text" class="form-control" name="username" placeholder="Username">
               </div>
-            </div>
-            <div class="form-group">
-              <label>Password</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
+              
+              <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-tag"></i></span>
+                  </div>
+                  <select class="form-control selectpicker show-tick" name="type" required>
+                    <option value="">- Type -</option>
+                    <?php foreach($software_types_array as $software_type) { ?>
+                    <option><?php echo $software_type; ?></option>
+                    <?php } ?>
+                  </select> 
                 </div>
-                <input type="text" class="form-control" name="password" placeholder="Password">
               </div>
+            
+              <div class="form-group">
+                <label>License</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="license" placeholder="License key"> 
+                </div>
+              </div>
+
             </div>
+
+            <div class="tab-pane fade" id="pills-login">
+
+              <div class="form-group">
+                <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>
+                  </div>
+                  <input type="text" class="form-control" name="username" placeholder="Username">
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Password</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="password" placeholder="Password">
+                </div>
+              </div>
+            
+            </div>
+
           </div>
 
         </div>
diff --git a/client_logins.php b/client_logins.php
index b748a0e4..7504b153 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -92,6 +92,9 @@ $total_pages = ceil($total_found_rows / 10);
             }
             $login_username = $row['login_username'];
             $login_password = $row['login_password'];
+            $vendor_id = $row['vendor_id'];
+            $asset_id = $row['asset_id'];
+            $software_id = $row['software_id'];
       
           ?>
           <tr>
diff --git a/client_software.php b/client_software.php
index 3fdb6ec9..318a9184 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 vendor_id = $vendor_id");
+            $sql_login = mysqli_query($mysqli,"SELECT * FROM logins WHERE software_id = $software_id");
             $row = mysqli_fetch_array($sql_login);
             $login_id = $row['login_id'];
             $login_username = $row['login_username'];
@@ -107,20 +107,35 @@ $total_pages = ceil($total_found_rows / 10);
 
               <div class="modal" id="viewPasswordModal<?php echo $login_id; ?>" tabindex="-1">
                 <div class="modal-dialog modal-sm">
-                  <div class="modal-content">
-                    <div class="modal-header">
-                      <h5 class="modal-title"><i class="fa fa-key"></i> Login</h5>
-                      <button type="button" class="close" data-dismiss="modal">
+                  <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>
+                      <button type="button" class="close text-white" data-dismiss="modal">
                         <span aria-hidden="true">&times;</span>
                       </button>
                     </div>
-                    <div class="modal-body">
-                      <h2><?php echo $login_username; ?></h2>
-                      <h3><?php echo $login_password; ?></h3>
+                    <div class="modal-body bg-white">
+                      <div class="form-group">
+                        <div class="input-group">
+                          <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-user"></i></span>
+                          </div>
+                          <input type="text" class="form-control" value="<?php echo $login_username; ?>" readonly>
+                        </div>
+                      </div>
+                      <div class="form-group">
+                        <div class="input-group">
+                          <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-lock"></i></span>
+                          </div>
+                          <input type="text" class="form-control" value="<?php echo $login_password; ?>" readonly>
+                        </div>
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
+
               <?php
               }
               ?>
diff --git a/clients.php b/clients.php
index 91c599c9..0995985b 100644
--- a/clients.php
+++ b/clients.php
@@ -49,7 +49,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
   <div class="card-header bg-dark text-white">
    
     <h6 class="float-left mt-2"><i class="fa fa-users mr-2"></i>Clients</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addClientModal"><i class="fas fa-fw fa-user-plus"></i> New</button>
+    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addClientModal"><i class="fas fa-fw fa-plus"></i></button>
       
   </div>
   <div class="card-body">
diff --git a/edit_account_modal.php b/edit_account_modal.php
index 30be6563..9d50f91e 100644
--- a/edit_account_modal.php
+++ b/edit_account_modal.php
@@ -21,6 +21,7 @@
           </div>
         </div>
         <div class="modal-footer bg-white">
+          <button type="submit" name="delete_acount" class="btn btn-outline-danger mr-auto">Delete</button>
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_account" class="btn btn-primary">Save</button>
         </div>
diff --git a/edit_login_modal.php b/edit_login_modal.php
index fc9b57fb..b8320c47 100644
--- a/edit_login_modal.php
+++ b/edit_login_modal.php
@@ -1,8 +1,8 @@
 <div class="modal" id="editLoginModal<?php echo $login_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-lock mr-2"></i><?php echo $login_description; ?></h5>
+      <div class="modal-header text-white">
+        <h5 class="modal-title"><i class="fa fa-fw fa-lock mr-2"></i><?php echo $login_description; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
@@ -10,40 +10,138 @@
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="login_id" value="<?php echo $login_id; ?>">
         <div class="modal-body bg-white">  
-          <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-info-circle"></i></span>
+
+          <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-link-tab<?php echo $login_id; ?>" data-toggle="pill" href="#pills-link<?php echo $login_id; ?>">Link</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="form-group">
+                <label>Description <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-info-circle"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="description" placeholder="Description of the login" value="<?php echo $login_description; ?>" required>
+                </div>
               </div>
-              <input type="text" class="form-control" name="description" value="<?php echo $login_description; ?>" required>
+            
+              <div class="form-group">
+                <label>Username <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>
+                  <input type="text" class="form-control" name="username" placeholder="Username" value="<?php echo $login_username; ?>" required>
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Password <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-lock"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="password" placeholder="Password" value="<?php echo $login_password; ?>" required>
+                </div>
+              </div>
+
             </div>
-          </div>
-          <div class="form-group">
-            <label>Web Link</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-link"></i></span>
+
+            <div class="tab-pane fade" id="pills-link<?php echo $login_id; ?>">
+  
+              <div class="form-group">
+                <label>Web Link</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
+                  </div>
+                  <input type="url" class="form-control" name="web_link" placeholder="Please include http://" value="<?php echo $login_web_link; ?>">
+                </div>
               </div>
-              <input type="text" class="form-control" name="web_link" placeholder="Please include http://" value="<?php echo $login_web_link; ?>">
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Username</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-user"></i></span>
+
+              <div class="form-group">
+                <label>Vendor</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" name="vendor">
+                    <option value="0">- None -</option>
+                    <?php 
+                    
+                    $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE client_id = $client_id"); 
+                    while($row = mysqli_fetch_array($sql_vendors)){
+                      $vendor_id_select = $row['vendor_id'];
+                      $vendor_name_select = $row['vendor_name'];
+                    ?>
+                      <option <?php if($vendor_id == $vendor_id_select){ echo "selected"; } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
               </div>
-              <input type="text" class="form-control" name="username" value="<?php echo $login_username; ?>" required>
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Password</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-lock"></i></span>
+            
+              <div class="form-group">
+                <label>Asset</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                  </div>
+                  <select class="form-control" name="asset">
+                    <option value="0">- None -</option>
+                    <?php 
+                    
+                    $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE client_id = $client_id"); 
+                    while($row = mysqli_fetch_array($sql_assets)){
+                      $asset_id_select = $row['asset_id'];
+                      $asset_name_select = $row['asset_name'];
+                    ?>
+                      <option <?php if($asset_id == $asset_id_select){ echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
               </div>
-              <input type="text" class="form-control" name="password" value="<?php echo $login_password; ?>" required>
+            
+              <div class="form-group">
+                <label>Software</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-box"></i></span>
+                  </div>
+                  <select class="form-control" name="software">
+                    <option value="0">- None -</option>
+                    <?php 
+                    
+                    $sql_software = mysqli_query($mysqli,"SELECT * FROM software WHERE client_id = $client_id"); 
+                    while($row = mysqli_fetch_array($sql_applications)){
+                      $software_id_select = $row['software_id'];
+                      $software_name_select = $row['software_name'];
+                    ?>
+                      <option <?php if($software_id == $software_id_select){ echo "selected"; } ?> value="<?php echo $software_id_select; ?>"><?php echo $software_name_select; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+
             </div>
           </div>
         </div>
diff --git a/edit_software_modal.php b/edit_software_modal.php
index dd710d22..4424496d 100644
--- a/edit_software_modal.php
+++ b/edit_software_modal.php
@@ -9,41 +9,83 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="software_id" value="<?php echo $software_id; ?>">
+        <input type="hidden" name="login_id" value="<?php echo $login_id; ?>">
         <div class="modal-body bg-white">    
           
-          <div class="form-group">
-            <label>Application 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-cube"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" placeholder="Software name" value="<?php echo $software_name; ?>" required>
-            </div>
-          </div>
+          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab">
+            <li class="nav-item">
+              <a class="nav-link active" id="pills-software-tab<?php echo $software_id; ?>" data-toggle="pill" href="#pills-software<?php echo $software_id; ?>">Software</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" id="pills-login-tab<?php echo $software_id; ?>" data-toggle="pill" href="#pills-login<?php echo $software_id; ?>">Login</a>
+            </li>
+          </ul>
+
+          <hr>
           
-          <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-tag"></i></span>
+          <div class="tab-content" id="pills-tabContent<?php echo $software_id; ?>">
+
+            <div class="tab-pane fade show active" id="pills-software<?php echo $software_id; ?>">
+
+              <div class="form-group">
+                <label>Application 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-cube"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="name" placeholder="Software name" value="<?php echo $software_name; ?>" required>
+                </div>
               </div>
-              <select class="form-control selectpicker show-tick" name="type" required>
-                <?php foreach($software_types_array as $software_type_select) { ?>
-                <option <?php if($software_type == $software_type_select) { echo "selected"; } ?>><?php echo $software_type_select; ?></option>
-                <?php } ?>
-              </select>
-            </div>
-          </div>
-        
-          <div class="form-group">
-            <label>License</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+              
+              <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-tag"></i></span>
+                  </div>
+                  <select class="form-control selectpicker show-tick" name="type" required>
+                    <?php foreach($software_types_array as $software_type_select) { ?>
+                    <option <?php if($software_type == $software_type_select) { echo "selected"; } ?>><?php echo $software_type_select; ?></option>
+                    <?php } ?>
+                  </select>
+                </div>
               </div>
-              <input type="text" class="form-control" name="license" placeholder="License key" value="<?php echo $software_license; ?>" required> 
+            
+              <div class="form-group">
+                <label>License</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="license" placeholder="License key" value="<?php echo $software_license; ?>" required> 
+                </div>
+              </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-login<?php echo $software_id; ?>">
+
+              <div class="form-group">
+                <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>
+                  </div>
+                  <input type="text" class="form-control" name="username" placeholder="Username" value="<?php echo $login_username; ?>">
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Password</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="password" placeholder="Password" value="<?php echo $login_password; ?>">
+                </div>
+              </div>
+            
             </div>
-          </div>
 
         </div>
         <div class="modal-footer bg-white">
diff --git a/login.php b/login.php
index ecd12b1b..e6ae74f5 100644
--- a/login.php
+++ b/login.php
@@ -65,8 +65,6 @@ if(isset($_POST['login'])){
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <meta name="description" content="">
-  <meta name="author" content="">
 
   <title><?php echo $config_company_name; ?> | Login</title>
 
@@ -84,26 +82,26 @@ if(isset($_POST['login'])){
 
   <div class="container">
     <div class="card card-login mx-auto mt-5 bg-dark">
-      <div class="card-header mt-2 text-white"><h3><i class="fa fa-cloud"></i> <?php echo $config_company_name; ?></h3></div>
+      <div class="card-header mt-2 text-white"><h3><i class="fa fa-cloud"></i> <?php echo $config_company_name; ?> CRM</h3></div>
       <div class="card-body bg-white">
         <?php if(isset($response)) { echo $response; } ?>
         <form method="post">
           <div class="form-group">
             <div class="form-label-group">
-              <input type="email" id="inputEmail" name="email" class="form-control" placeholder="Email address" required="required" autofocus="autofocus">
+              <input type="email" id="inputEmail" name="email" class="form-control" placeholder="Email address" required autofocus>
               <label for="inputEmail">Email address</label>
             </div>
           </div>
           <div class="form-group">
             <div class="form-label-group">
-              <input type="password" id="inputPassword" name="password" class="form-control" placeholder="Password" required="required">
+              <input type="password" id="inputPassword" name="password" class="form-control" placeholder="Password" required>
               <label for="inputPassword">Password</label>
             </div>
           </div>
           <div class="form-group">
             <div class="form-label-group">
               <input type="text" id="inputToken" name="current_code" class="form-control" placeholder="2FA Token if applicable">
-              <label for="inputToken">2FA Token</label>
+              <label for="inputToken">Token</label>
             </div>
           </div>
           <button class="btn btn-primary btn-block" type="submit" name="login">Login</button>
diff --git a/login_no_label.php b/login_no_label.php
new file mode 100644
index 00000000..e254988f
--- /dev/null
+++ b/login_no_label.php
@@ -0,0 +1,114 @@
+<?php include("config.php"); ?>
+
+<?php
+
+session_start();
+
+if(isset($_POST['login'])){
+  
+  $email = mysqli_real_escape_string($mysqli,$_POST['email']);
+  $password = md5(mysqli_real_escape_string($mysqli,$_POST['password']));
+  $current_code = $_POST['current_code'];
+
+  $sql = mysqli_query($mysqli,"SELECT * FROM users WHERE email = '$email' AND password = '$password'");
+  
+  if(mysqli_num_rows($sql) == 1){
+    $row = mysqli_fetch_array($sql);
+    $token = $row['token'];
+    $_SESSION['user_id'] = $row['user_id'];
+    $_SESSION['name'] = $row['name'];
+    $_SESSION['client_id'] = $row['client_id'];
+    $client_id = $row['client_id'];
+    
+    if(empty($token)){
+      $_SESSION['logged'] = TRUE;
+         
+      if($client_id > 0){
+        header("Location: client.php?client_id=$client_id");
+      }else{
+        header("Location: $config_start_page");
+      }
+    
+    }else{
+      require_once("rfc6238.php");
+
+      if(TokenAuth6238::verify($token,$current_code)){
+        $_SESSION['logged'] = TRUE;
+        header("Location: $config_start_page");
+      }
+    }
+  }
+}
+
+?>
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta name="description" content="">
+  <meta name="author" content="">
+
+  <title></title>
+
+  <!-- Custom fonts for this template-->
+  <link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css">
+
+  <!-- Custom styles for this template-->
+  <link href="css/sb-admin.css" rel="stylesheet">
+
+  <link href="css/style.css" rel="stylesheet">
+
+</head>
+
+<body class="bg-secondary">
+
+  <div class="container">
+    <div class="card card-login mx-auto mt-5 bg-dark">
+      
+      <div class="card-body bg-white">
+        <form method="post">
+          <div class="form-group">
+           
+            <input type="email" name="email" class="form-control" required autofocus>
+           
+          </div>
+          <div class="form-group">
+           
+            <input type="password" name="password" class="form-control" required>
+            
+          </div>
+          <div class="form-group">
+           
+            <input type="text" name="current_code" class="form-control">
+           
+          </div>
+          <button class="btn btn-dark btn-block p-4" type="submit" name="login"></button>
+        </form>
+      </div>
+    </div>
+  </div>
+
+  <!-- Bootstrap core JavaScript-->
+  <script src="vendor/jquery/jquery.min.js"></script>
+  <script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
+
+  <!-- Core plugin JavaScript-->
+  <script src="vendor/jquery-easing/jquery.easing.min.js"></script>
+
+  <!-- Prevents resubmit on refresh or back -->
+  <script>
+  
+  if ( window.history.replaceState ) {
+    window.history.replaceState( null, null, window.location.href );
+  }
+  
+  </script>
+
+</body>
+
+</html>
diff --git a/post.php b/post.php
index b18c3ebe..bb2c5db0 100644
--- a/post.php
+++ b/post.php
@@ -2319,7 +2319,7 @@ if(isset($_POST['add_asset'])){
         $asset_id = mysqli_insert_id($mysqli);
         $username = strip_tags(mysqli_real_escape_string($mysqli,$_POST['username']));
         $password = strip_tags(mysqli_real_escape_string($mysqli,$_POST['password']));
-        $description = "$type - $name";
+
         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");
 
     }
@@ -2356,18 +2356,17 @@ if(isset($_POST['edit_asset'])){
     $note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['note']));
     $username = strip_tags(mysqli_real_escape_string($mysqli,$_POST['username']));
     $password = strip_tags(mysqli_real_escape_string($mysqli,$_POST['password']));
-    $description = "$type - $name";
 
     mysqli_query($mysqli,"UPDATE assets SET asset_name = '$name', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_ip = '$ip', location_id = $location, vendor_id = $vendor, contact_id = $contact, asset_purchase_date = '$purchase_date', asset_warranty_expire = '$warranty_expire', asset_note = '$note', asset_updated_at = NOW(), network_id = $network WHERE asset_id = $asset_id");
 
     //If login exists then update the login
     if($login_id > 0){
-        mysqli_query($mysqli,"UPDATE logins SET login_description = '$description', login_username = '$username', login_password = '$password', login_updated_at = NOW() WHERE login_id = $login_id");
+        mysqli_query($mysqli,"UPDATE logins SET login_description = '$name', login_username = '$username', login_password = '$password', login_updated_at = NOW() WHERE login_id = $login_id");
     }else{
     //If Username is filled in then add a login
-        if(!empty($_POST['username'])) {
+        if(!empty($username)) {
             
-            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");
+            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");
 
         }
     }
@@ -2399,9 +2398,9 @@ if(isset($_POST['add_login'])){
     $note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['note']));
     $vendor_id = intval($_POST['vendor']);
     $asset_id = intval($_POST['asset']);
-    $application_id = intval($_POST['application']);
+    $software_id = intval($_POST['software']);
 
-    mysqli_query($mysqli,"INSERT INTO logins SET login_description = '$description', login_web_link = '$web_link', login_username = '$username', login_password = '$password', login_note = '$note', login_created_at = NOW(), vendor_id = $vendor_id, asset_id = $asset_id, application_id = $application_id, client_id = $client_id");
+    mysqli_query($mysqli,"INSERT INTO logins SET login_description = '$description', login_web_link = '$web_link', login_username = '$username', login_password = '$password', login_note = '$note', login_created_at = NOW(), vendor_id = $vendor_id, asset_id = $asset_id, software_id = $software_id, client_id = $client_id");
 
     $_SESSION['alert_message'] = "Login added";
     
@@ -2417,8 +2416,11 @@ if(isset($_POST['edit_login'])){
     $username = strip_tags(mysqli_real_escape_string($mysqli,$_POST['username']));
     $password = strip_tags(mysqli_real_escape_string($mysqli,$_POST['password']));
     $note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['note']));
+    $vendor_id = intval($_POST['vendor']);
+    $asset_id = intval($_POST['asset']);
+    $software_id = intval($_POST['software']);
 
-    mysqli_query($mysqli,"UPDATE logins SET login_description = '$description', login_web_link = '$web_link', login_username = '$username', login_password = '$password', login_note = '$note', login_updated_at = NOW() WHERE login_id = $login_id");
+    mysqli_query($mysqli,"UPDATE logins SET login_description = '$description', login_web_link = '$web_link', login_username = '$username', login_password = '$password', login_note = '$note', login_updated_at = NOW(), vendor_id = $vendor_id, asset_id = $asset_id, software_id = $software_id WHERE login_id = $login_id");
 
     $_SESSION['alert_message'] = "Login updated";
     
@@ -2622,8 +2624,8 @@ if(isset($_POST['add_software'])){
         $software_id = mysqli_insert_id($mysqli);
         $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_username = '$username', login_password = '$password', software_id = $software_id, login_created_at = NOW(), client_id = $client_id");
+
+        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");
 
     }
 
@@ -2636,12 +2638,27 @@ if(isset($_POST['add_software'])){
 if(isset($_POST['edit_software'])){
 
     $software_id = intval($_POST['software_id']);
+    $login_id = intval($_POST['login_id']);
     $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
     $type = strip_tags(mysqli_real_escape_string($mysqli,$_POST['type']));
     $license = strip_tags(mysqli_real_escape_string($mysqli,$_POST['license']));
+    $username = strip_tags(mysqli_real_escape_string($mysqli,$_POST['username']));
+    $password = strip_tags(mysqli_real_escape_string($mysqli,$_POST['password']));
 
     mysqli_query($mysqli,"UPDATE software SET software_name = '$name', software_type = '$type', software_license = '$license', software_updated_at = NOW() WHERE software_id = $software_id");
 
+    //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");
+    }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");
+
+        }
+    }
+
     $_SESSION['alert_message'] = "Software updated";
     
     header("Location: " . $_SERVER["HTTP_REFERER"]);
diff --git a/side_nav.php b/side_nav.php
index a15f2024..ff2b7aab 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -1,9 +1,7 @@
 <!-- Sidebar -->
 <ul class="sidebar navbar-nav d-print-none">
-  <li class="nav-item">
-    <h2 class="text-white text-center my-3"><?php echo $config_company_name; ?></h2>
-  </li>
-  <li class="nav-item <?php if(basename($_SERVER["REQUEST_URI"]) == "dashboard.php") { echo "active"; } ?>">
+
+  <li class="nav-item mt-4 <?php if(basename($_SERVER["REQUEST_URI"]) == "dashboard.php") { echo "active"; } ?>">
     <a class="nav-link" href="dashboard.php">
       <i class="fas fa-fw fa-tachometer-alt mx-2"></i>
       <span>Dashboard</span>
diff --git a/top_nav.php b/top_nav.php
index ffc3d841..1580e79d 100644
--- a/top_nav.php
+++ b/top_nav.php
@@ -1,5 +1,7 @@
 <nav class="navbar navbar-expand navbar-dark bg-primary static-top">
 
+  <a class="navbar-brand mr-1" href="index.php"><i class="fa fa-fw fa-cloud"></i> <?php echo $config_company_name; ?> CRM</a>
+
   <button class="btn btn-link btn-sm text-white order-1 order-sm-0" id="sidebarToggle" href="#">
     <i class="fas fa-bars"></i>
   </button>