diff --git a/agent/includes/client_overview_side_nav.php b/agent/includes/client_overview_side_nav.php
index 7bc66a2f..a70b0504 100644
--- a/agent/includes/client_overview_side_nav.php
+++ b/agent/includes/client_overview_side_nav.php
@@ -35,7 +35,7 @@ $num_software = $row['num'];
 
     <a class="pb-1 mt-1 brand-link" href="clients.php">
         <p class="h6"><i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
-            <span class="brand-text ">Back | <strong>Client Overview</strong>
+            <span class="brand-text ">Back | <strong>All Client Docs</strong>
         </p>
     </a>
 
@@ -72,6 +72,9 @@ $num_software = $row['num'];
                             </p>
                         </a>
                     </li>
+
+                    <li class="nav-header mt-3">INFRASTRUCTURE</li>
+
                     <li class="nav-item">
                         <a href="assets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "assets.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-desktop"></i>
@@ -84,30 +87,7 @@ $num_software = $row['num'];
                             </p>
                         </a>
                     </li>
-                    <li class="nav-item">
-                        <a href="software.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "software.php") { echo "active"; } ?>">
-                            <i class="nav-icon fas fa-cube"></i>
-                            <p>
-                                Licenses
-                                <?php
-                                if ($num_software > 0) { ?>
-                                    <span class="right badge text-light"><?php echo $num_software; ?></span>
-                                <?php } ?>
-                            </p>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="credentials.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "credentials.php") { echo "active"; } ?>">
-                            <i class="nav-icon fas fa-key"></i>
-                            <p>
-                                Credentials
-                                <?php
-                                if ($num_credentials > 0) { ?>
-                                    <span class="right badge text-light"><?php echo $num_credentials; ?></span>
-                                <?php } ?>
-                            </p>
-                        </a>
-                    </li>
+
                     <li class="nav-item">
                         <a href="networks.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "networks.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-network-wired"></i>
@@ -120,6 +100,22 @@ $num_software = $row['num'];
                             </p>
                         </a>
                     </li>
+
+                    <li class="nav-header mt-3">WEB & SECURITY</li>
+
+                    <li class="nav-item">
+                        <a href="credentials.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "credentials.php") { echo "active"; } ?>">
+                            <i class="nav-icon fas fa-key"></i>
+                            <p>
+                                Credentials
+                                <?php
+                                if ($num_credentials > 0) { ?>
+                                    <span class="right badge text-light"><?php echo $num_credentials; ?></span>
+                                <?php } ?>
+                            </p>
+                        </a>
+                    </li>
+                    
                     <li class="nav-item">
                         <a href="certificates.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "certificates.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-lock"></i>
@@ -144,6 +140,22 @@ $num_software = $row['num'];
                             </p>
                         </a>
                     </li>
+
+                    <li class="nav-header mt-3">DOCUMENTATION</li>
+
+                    <li class="nav-item">
+                        <a href="software.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "software.php") { echo "active"; } ?>">
+                            <i class="nav-icon fas fa-cube"></i>
+                            <p>
+                                Licenses
+                                <?php
+                                if ($num_software > 0) { ?>
+                                    <span class="right badge text-light"><?php echo $num_software; ?></span>
+                                <?php } ?>
+                            </p>
+                        </a>
+                    </li>
+
                     <li class="nav-item">
                         <a href="services.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "services.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-stream"></i>
@@ -156,6 +168,7 @@ $num_software = $row['num'];
                             </p>
                         </a>
                     </li>
+
                 <?php } ?>
 
             </ul>
diff --git a/agent/includes/client_side_nav.php b/agent/includes/client_side_nav.php
index 51849186..320a14cf 100644
--- a/agent/includes/client_side_nav.php
+++ b/agent/includes/client_side_nav.php
@@ -51,6 +51,32 @@
                     </a>
                 </li>
 
+                <li class="nav-item">
+                    <a href="/agent/vendors.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "vendors.php") { echo "active"; } ?>">
+                        <i class="nav-icon fas fa-building"></i>
+                        <p>
+                            Vendors
+                            <?php
+                            if ($num_vendors > 0) { ?>
+                                <span class="right badge text-light"><?php echo $num_vendors; ?></span>
+                            <?php } ?>
+                        </p>
+                    </a>
+                </li>
+
+                <li class="nav-item">
+                    <a href="/agent/calendar.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "calendar.php") { echo "active"; } ?>">
+                        <i class="nav-icon fas fa-calendar-alt"></i>
+                        <p>
+                            Calendar
+                            <?php
+                            if ($num_calendar_events > 0) { ?>
+                                <span class="right badge text-light"><?php echo $num_calendar_events; ?></span>
+                            <?php } ?>
+                        </p>
+                    </a>
+                </li>
+
                 <?php if ($config_module_enable_ticketing == 1 && lookupUserPermission("module_support") >= 1) { ?>
                     <li class="nav-header mt-3">SUPPORT</li>
 
@@ -96,35 +122,9 @@
 
                 <?php } ?>
 
-                <li class="nav-item">
-                    <a href="/agent/vendors.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "vendors.php") { echo "active"; } ?>">
-                        <i class="nav-icon fas fa-building"></i>
-                        <p>
-                            Vendors
-                            <?php
-                            if ($num_vendors > 0) { ?>
-                                <span class="right badge text-light"><?php echo $num_vendors; ?></span>
-                            <?php } ?>
-                        </p>
-                    </a>
-                </li>
-
-                <li class="nav-item">
-                    <a href="/agent/calendar.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "calendar.php") { echo "active"; } ?>">
-                        <i class="nav-icon fas fa-calendar-alt"></i>
-                        <p>
-                            Calendar
-                            <?php
-                            if ($num_calendar_events > 0) { ?>
-                                <span class="right badge text-light"><?php echo $num_calendar_events; ?></span>
-                            <?php } ?>
-                        </p>
-                    </a>
-                </li>
-
                 <?php if ($config_module_enable_itdoc == 1) { ?>
 
-                    <li class="nav-header mt-3">DOCUMENTATION</li>
+                    <li class="nav-header mt-3">INFRASTRUCTURE</li>
 
                     <?php if (lookupUserPermission("module_support") >= 1) { ?>
                         <li class="nav-item">
@@ -140,34 +140,6 @@
                             </a>
                         </li>
 
-                        <li class="nav-item">
-                            <a href="/agent/software.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "software.php") { echo "active"; } ?>">
-                                <i class="nav-icon fas fa-cube"></i>
-                                <p>
-                                    Licenses
-                                    <?php
-                                    if ($num_software > 0) { ?>
-                                        <span class="right badge <?php if ($num_software_expiring > 0) { ?> badge-warning text-dark <?php } ?> <?php if ($num_software_expired > 0) { ?> badge-danger <?php } ?> text-white"><?php echo $num_software; ?></span>
-                                    <?php } ?>
-                                </p>
-                            </a>
-                        </li>
-
-                        <?php if (lookupUserPermission("module_credential") >= 1) { ?>
-                            <li class="nav-item">
-                                <a href="/agent/credentials.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "credentials.php") { echo "active"; } ?>">
-                                    <i class="nav-icon fas fa-key"></i>
-                                    <p>
-                                        Credentials
-                                        <?php
-                                        if ($num_credentials > 0) { ?>
-                                            <span class="right badge text-light"><?php echo $num_credentials; ?></span>
-                                        <?php } ?>
-                                    </p>
-                                </a>
-                            </li>
-                        <?php } ?>
-
                         <li class="nav-item">
                             <a href="/agent/networks.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "networks.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-network-wired"></i>
@@ -194,6 +166,23 @@
                             </a>
                         </li>
 
+                        <li class="nav-header mt-3">WEB & SECURITY</li>
+
+                        <?php if (lookupUserPermission("module_credential") >= 1) { ?>
+                            <li class="nav-item">
+                                <a href="/agent/credentials.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "credentials.php") { echo "active"; } ?>">
+                                    <i class="nav-icon fas fa-key"></i>
+                                    <p>
+                                        Credentials
+                                        <?php
+                                        if ($num_credentials > 0) { ?>
+                                            <span class="right badge text-light"><?php echo $num_credentials; ?></span>
+                                        <?php } ?>
+                                    </p>
+                                </a>
+                            </li>
+                        <?php } ?>
+
                         <li class="nav-item">
                             <a href="/agent/certificates.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "certificates.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-lock"></i>
@@ -220,6 +209,21 @@
                             </a>
                         </li>
 
+                        <li class="nav-header mt-3">DOCUMENTATION</li>
+
+                        <li class="nav-item">
+                            <a href="/agent/software.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "software.php") { echo "active"; } ?>">
+                                <i class="nav-icon fas fa-cube"></i>
+                                <p>
+                                    Licenses
+                                    <?php
+                                    if ($num_software > 0) { ?>
+                                        <span class="right badge <?php if ($num_software_expiring > 0) { ?> badge-warning text-dark <?php } ?> <?php if ($num_software_expired > 0) { ?> badge-danger <?php } ?> text-white"><?php echo $num_software; ?></span>
+                                    <?php } ?>
+                                </p>
+                            </a>
+                        </li>
+
                         <li class="nav-item">
                             <a href="/agent/services.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "services.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-stream"></i>
@@ -257,6 +261,19 @@
 
                     <?php if (lookupUserPermission("module_sales") >= 1) { ?>
 
+                        <li class="nav-item">
+                            <a href="/agent/quotes.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "quotes.php" || basename($_SERVER["PHP_SELF"]) == "quote.php") { echo "active"; } ?>">
+                                <i class="nav-icon fas fa-comment-dollar"></i>
+                                <p>
+                                    Quotes
+                                    <?php
+                                    if ($num_quotes > 0) { ?>
+                                        <span class="right badge text-light"><?php echo $num_quotes; ?></span>
+                                    <?php } ?>
+                                </p>
+                            </a>
+                        </li>
+
                         <li class="nav-item">
                             <a href="/agent/invoices.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "invoices.php" || basename($_SERVER["PHP_SELF"]) == "invoice.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-file-invoice"></i>
@@ -283,19 +300,6 @@
                             </a>
                         </li>
 
-                        <li class="nav-item">
-                            <a href="/agent/quotes.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "quotes.php" || basename($_SERVER["PHP_SELF"]) == "quote.php") { echo "active"; } ?>">
-                                <i class="nav-icon fas fa-comment-dollar"></i>
-                                <p>
-                                    Quotes
-                                    <?php
-                                    if ($num_quotes > 0) { ?>
-                                        <span class="right badge text-light"><?php echo $num_quotes; ?></span>
-                                    <?php } ?>
-                                </p>
-                            </a>
-                        </li>
-
                     <?php } ?>
 
                     <?php if (lookupUserPermission("module_financial") >= 1) { ?>