diff --git a/client_nav.php b/client_nav.php
index 514487b7..b244bb89 100644
--- a/client_nav.php
+++ b/client_nav.php
@@ -1,7 +1,8 @@
 <ul class="nav nav-pills nav-fill">
   <?php if($num_contacts > 0){ ?>
   <li class="nav-item">
-    <a class="nav-link active" href="?client_id=<?php echo $client_id; ?>&tab=contacts">
+    <a class="nav-link <?php if($_GET['tab'] == "contacts") { echo "active"; } ?>" 
+      href="?client_id=<?php echo $client_id; ?>&tab=contacts">
       <i class="fa fa-users"></i><br>
       Contacts<br>
       <span class="badge badge-pill badge-light"><?php echo $num_contacts; ?></span>
@@ -10,7 +11,8 @@
   <?php } ?>
   <?php if($num_locations > 0){ ?>
   <li class="nav-item">
-    <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=locations">
+    <a class="nav-link <?php if($_GET['tab'] == "locations") { echo "active"; } ?>" 
+      href="?client_id=<?php echo $client_id; ?>&tab=locations">
       <i class="fa fa-map-marker"></i><br>
       Locations<br>
       <span class="badge badge-pill badge-fark"><?php echo $num_locations; ?></span>
@@ -20,7 +22,8 @@
   <?php } ?>
   <?php if($num_assets > 0){ ?>
   <li class="nav-item">
-    <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=assets">
+    <a class="nav-link <?php if($_GET['tab'] == "assets") { echo "active"; } ?>" 
+      href="?client_id=<?php echo $client_id; ?>&tab=assets">
       <i class="fa fa-tag"></i><br>
       Assets<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_assets; ?></span>
@@ -29,7 +32,8 @@
   <?php } ?>
   <?php if($num_vendors > 0){ ?>
   <li class="nav-item">
-    <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=vendors">
+    <a class="nav-link <?php if($_GET['tab'] == "vendors") { echo "active"; } ?>" 
+      href="?client_id=<?php echo $client_id; ?>&tab=vendors">
       <i class="fa fa-building"></i><br>
       Vendors<br>
       <span class="badge badge-pill badge-secondary"><?php echo $num_vendors; ?></span>
@@ -38,7 +42,8 @@
   <?php } ?>
   <?php if($num_logins > 0){ ?>
   <li class="nav-item">
-    <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=logins">
+    <a class="nav-link <?php if($_GET['tab'] == "logins") { echo "active"; } ?>" 
+      href="?client_id=<?php echo $client_id; ?>&tab=logins">
       <i class="fa fa-key"></i><br>
       Logins<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_logins; ?></span>
@@ -47,7 +52,8 @@
   <?php } ?>
   <?php if($num_networks > 0){ ?>
   <li class="nav-item">
-    <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=networks">
+    <a class="nav-link <?php if($_GET['tab'] == "networks") { echo "active"; } ?>" 
+      href="?client_id=<?php echo $client_id; ?>&tab=networks">
       <i class="fa fa-network-wired"></i><br>
       Networks<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_networks; ?></span>
@@ -56,7 +62,8 @@
   <?php } ?>
   <?php if($num_domains > 0){ ?>
   <li class="nav-item">
-    <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=domains">
+    <a class="nav-link <?php if($_GET['tab'] == "domains") { echo "active"; } ?>" 
+      href="?client_id=<?php echo $client_id; ?>&tab=domains">
       <i class="fa fa-globe"></i><br>
       Domains<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_domains; ?></span>
@@ -65,7 +72,8 @@
   <?php } ?>
   <?php if($num_applications > 0){ ?>
   <li class="nav-item">
-    <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=applications">
+    <a class="nav-link <?php if($_GET['tab'] == "applications") { echo "active"; } ?>" 
+      href="?client_id=<?php echo $client_id; ?>&tab=applications">
       <i class="fa fa-box"></i><br>
       Applications<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_applications; ?></span>
@@ -74,7 +82,8 @@
   <?php } ?>
   <?php if($num_invoices > 0){ ?>
   <li class="nav-item">
-    <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=invoices">
+    <a class="nav-link <?php if($_GET['tab'] == "invoices") { echo "active"; } ?>" 
+      href="?client_id=<?php echo $client_id; ?>&tab=invoices">
       <i class="fa fa-file"></i><br>
       Invoices<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_invoices; ?></span>
@@ -83,7 +92,8 @@
   <?php } ?>
   <?php if($num_recurring > 0){ ?>
   <li class="nav-item">
-    <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=recurring">
+    <a class="nav-link <?php if($_GET['tab'] == "recurring") { echo "active"; } ?>" 
+      href="?client_id=<?php echo $client_id; ?>&tab=recurring">
       <i class="fa fa-copy"></i><br>
       Recurring<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_recurring; ?></span>
@@ -92,7 +102,8 @@
   <?php } ?>
   <?php if($num_quotes > 0){ ?>
   <li class="nav-item">
-    <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=quotes">
+    <a class="nav-link <?php if($_GET['tab'] == "quotes") { echo "active"; } ?>" 
+      href="?client_id=<?php echo $client_id; ?>&tab=quotes">
       <i class="fa fa-file-o"></i><br>
       Quotes<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_quotes; ?></span>
@@ -101,7 +112,8 @@
   <?php } ?>
   <?php if($num_files > 0){ ?>
   <li class="nav-item">
-    <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=files">
+    <a class="nav-link <?php if($_GET['tab'] == "files") { echo "active"; } ?>" 
+      href="?client_id=<?php echo $client_id; ?>&tab=files">
       <i class="fa fa-paperclip"></i><br>
       Files<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_files; ?></span>
@@ -110,7 +122,8 @@
   <?php } ?>
   <?php if($num_notes > 0){ ?>
   <li class="nav-item">
-    <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=notes">
+    <a class="nav-link <?php if($_GET['tab'] == "notes") { echo "active"; } ?>" 
+      href="?client_id=<?php echo $client_id; ?>&tab=notes">
       <i class="fa fa-edit"></i><br>
       Notes<br>
       <span class="badge badge-pill badge-dark"><?php echo $num_notes; ?></span>
diff --git a/settings-nav.php b/settings-nav.php
index 8f4f5e9d..90883be1 100644
--- a/settings-nav.php
+++ b/settings-nav.php
@@ -1,35 +1,40 @@
 <ul class="nav nav-pills nav-fill mb-3">
   
   <li class="nav-item">
-    <a class="nav-link active" href="settings-general.php">
+    <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-general.php") { echo "active"; } ?>" 
+      href="settings-general.php">
       <i class="fa fa-2x fa-cog"></i><br>
       Company
     </a> 
   </li>
 
   <li class="nav-item">
-    <a class="nav-link" href="settings-company.php">
+    <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-company.php") { echo "active"; } ?>" 
+      href="settings-company.php">
       <i class="fa fa-2x fa-building"></i><br>
       Company
     </a> 
   </li>
 
   <li class="nav-item">
-    <a class="nav-link" href="settings-mail.php">
+    <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-mail.php") { echo "active"; } ?>" 
+      href="settings-mail.php">
       <i class="fa fa-2x fa-envelope"></i><br>
       Mail
     </a> 
   </li>
 
   <li class="nav-item">
-    <a class="nav-link" href="settings-invoice.php">
+    <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-invoice.php") { echo "active"; } ?>" 
+      href="settings-invoice.php">
       <i class="fa fa-2x fa-file"></i><br>
       Invoice
     </a> 
   </li>
  
   <li class="nav-item">
-    <a class="nav-link" href="settings-backup.php">
+    <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-backup.php") { echo "active"; } ?>" 
+      href="settings-backup.php">
       <i class="fa fa-2x fa-database"></i><br>
       Backup
     </a>