diff --git a/client_contact_details_modal.php b/client_contact_details_modal.php
index 721609b7..f1a08197 100644
--- a/client_contact_details_modal.php
+++ b/client_contact_details_modal.php
@@ -127,20 +127,13 @@ $sql_software = mysqli_query($mysqli,"SELECT * FROM software WHERE contact_id =
 
                 <?php
 
-                while($row = mysqli_fetch_array($sql_logins)){
+                while($row = mysqli_fetch_array($sql_software)){
                   $software_id = $row['software_id'];
                   $software_name = $row['software_name'];
                   $software_type = $row['software_type'];
                   $software_license = $row['software_license'];
                   $software_notes = $row['software_notes'];
 
-                  $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'];
-                  $login_password = $row['login_password'];
-                  $software_id_relation = $row['software_id'];
-
                 ?>
                 
                 <td><?php echo $software_name; ?></td>
@@ -160,11 +153,7 @@ $sql_software = mysqli_query($mysqli,"SELECT * FROM software WHERE contact_id =
         </div>
 
       </div>
-      <div class="modal-footer bg-white">
-        <a href="post.php?delete_contact=<?php echo $contact_id; ?>" class="btn btn-danger mr-auto"><i class="fa fa-trash text-white"></i></a>
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-        <button type="submit" name="edit_contact" class="btn btn-primary">Save</button>
-      </div>
+
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/client_side_nav.php b/client_side_nav.php
index 717803f1..33a7f3fd 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -41,6 +41,8 @@
           </a>
         </li>
 
+        <li class="nav-header">ASSETS</li>
+
         <li class="nav-item">
           <a href="?client_id=<?php echo $client_id; ?>&tab=assets" class="nav-link <?php if($_GET['tab'] == "assets") { echo "active"; } ?>">
             <i class="nav-icon fas fa-laptop"></i>
@@ -55,33 +57,18 @@
         </li>
 
         <li class="nav-item">
-          <a href="?client_id=<?php echo $client_id; ?>&tab=tickets" class="nav-link <?php if($_GET['tab'] == "tickets") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-tags"></i>
+          <a href="?client_id=<?php echo $client_id; ?>&tab=software" class="nav-link <?php if($_GET['tab'] == "software") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-rocket"></i>
             <p>
-              Tickets
+              Software
               <?php 
-              if($num_tickets > 0){ ?>
-              <span class="right badge badge-light"><?php echo $num_tickets; ?></span>
+              if($num_software > 0){ ?>
+              <span class="right badge badge-light"><?php echo $num_software; ?></span>
               <?php } ?>
             </p>
           </a>
         </li>
 
-        <li class="nav-item">
-          <a href="?client_id=<?php echo $client_id; ?>&tab=vendors" class="nav-link <?php if($_GET['tab'] == "vendors") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-building"></i>
-            <p>
-              Vendors
-              <?php 
-              if($num_vendors > 0){ ?>
-              <span class="right badge badge-light"><?php echo $num_vendors; ?></span>
-              <?php } ?>
-            </p>
-          </a>
-        </li>
-
-        <li class="nav-header">ASSETS</li>
-
         <li class="nav-item">
           <a href="?client_id=<?php echo $client_id; ?>&tab=logins" class="nav-link <?php if($_GET['tab'] == "logins") { echo "active"; } ?>">
             <i class="nav-icon fas fa-key"></i>
@@ -121,20 +108,7 @@
           </a>
         </li>
 
-        <li class="nav-item">
-          <a href="?client_id=<?php echo $client_id; ?>&tab=software" class="nav-link <?php if($_GET['tab'] == "software") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-rocket"></i>
-            <p>
-              Software
-              <?php 
-              if($num_software > 0){ ?>
-              <span class="right badge badge-light"><?php echo $num_software; ?></span>
-              <?php } ?>
-            </p>
-          </a>
-        </li>
-
-        <li class="nav-header">PAYMENTS</li>
+        <li class="nav-header">SALES</li>
 
         <li class="nav-item">
           <a href="?client_id=<?php echo $client_id; ?>&tab=invoices" class="nav-link <?php if($_GET['tab'] == "invoices") { echo "active"; } ?>">
@@ -188,7 +162,33 @@
           </a>
         </li>
 
-        <li class="nav-header">MORE</li>
+        <li class="nav-header">SUPPORT</li>
+
+        <li class="nav-item">
+          <a href="?client_id=<?php echo $client_id; ?>&tab=tickets" class="nav-link <?php if($_GET['tab'] == "tickets") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-tags"></i>
+            <p>
+              Tickets
+              <?php 
+              if($num_tickets > 0){ ?>
+              <span class="right badge badge-light"><?php echo $num_tickets; ?></span>
+              <?php } ?>
+            </p>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a href="?client_id=<?php echo $client_id; ?>&tab=vendors" class="nav-link <?php if($_GET['tab'] == "vendors") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-building"></i>
+            <p>
+              Vendors
+              <?php 
+              if($num_vendors > 0){ ?>
+              <span class="right badge badge-light"><?php echo $num_vendors; ?></span>
+              <?php } ?>
+            </p>
+          </a>
+        </li>
 
         <li class="nav-item">
           <a href="?client_id=<?php echo $client_id; ?>&tab=trips" class="nav-link <?php if($_GET['tab'] == "trips") { echo "active"; } ?>">
diff --git a/side_nav.php b/side_nav.php
index 02e1d7d6..a35423c3 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -9,8 +9,6 @@
 
       <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" data-accordion="false">
 
-        <li class="nav-header">MAIN</li>
-
         <li class="nav-item">
           <a href="dashboard.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "dashboard.php") { echo "active"; } ?>">
             <i class="nav-icon fas fa-tachometer-alt"></i>
@@ -24,18 +22,13 @@
             <p>Clients</p>
           </a>
         </li>
+        <li class="nav-header">SUPPORT</li>
         <li class="nav-item">
           <a href="tickets.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "tickets.php") { echo "active"; } ?>">
             <i class="nav-icon fas fa-tags"></i>
             <p>Tickets</p>
           </a>
         </li>
-        <li class="nav-item">
-          <a href="products.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "products.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-box"></i>
-            <p>Products</p>
-          </a>
-        </li>
         <li class="nav-item">
           <a href="vendors.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "vendors.php") { echo "active"; } ?>">
             <i class="nav-icon fas fa-building"></i>
@@ -48,7 +41,7 @@
             <p>Calendar</p>
           </a>
         </li>
-        <li class="nav-header">INCOME</li>
+        <li class="nav-header">SALES</li>
         <li class="nav-item">
           <a href="quotes.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "quotes.php") { echo "active"; } ?>">
             <i class="nav-icon fas fa-file-invoice"></i>
@@ -73,6 +66,12 @@
             <p>Recurring</p>
           </a>
         </li>
+        <li class="nav-item">
+          <a href="products.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "products.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-box"></i>
+            <p>Products</p>
+          </a>
+        </li>
         <li class="nav-header">ACCOUNTING</li>
         <li class="nav-item">
           <a href="payments.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "payments.php") { echo "active"; } ?>">
@@ -110,15 +109,16 @@
             <p>Transfers</p>
           </a>
         </li>
-        <li class="nav-header">MORE</li>
+        <a href="#" class="nav-link">
+          <i class="nav-icon fas fa-chart-area"></i>
+          <p>
+            Reports
+            <i class="right fas fa-angle-left"></i>
+          </p>
+        </a>
+        <li class="nav-header">SETTINGS</li>
         <li class="nav-item has-treeview">
-          <a href="#" class="nav-link">
-            <i class="nav-icon fas fa-chart-area"></i>
-            <p>
-              Reports
-              <i class="right fas fa-angle-left"></i>
-            </p>
-          </a>
+          
           <ul class="nav nav-treeview">
             <li class="nav-item">
               <a href="report_income_summary.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "report_income_summary.php") { echo "active"; } ?>">