diff --git a/include/class.nav.php b/include/class.nav.php
index 0d5fddcbf3a48772db052a71363bfe0fb3b64ad5..78cae2fc8d2904f279f1c4f3d3496e0b5895bc82 100644
--- a/include/class.nav.php
+++ b/include/class.nav.php
@@ -162,12 +162,11 @@ class AdminNav extends StaffNav{
         if(!$this->tabs){
 
             $tabs=array();
-            $tabs['dashboard']=array('desc'=>'Dashboard','href'=>'admin.php','title'=>'Admin Dashboard');
+            $tabs['dashboard']=array('desc'=>'Dashboard','href'=>'logs.php','title'=>'Admin Dashboard');
             $tabs['settings']=array('desc'=>'Settings','href'=>'settings.php','title'=>'System Settings');
+            $tabs['manage']=array('desc'=>'Manage','href'=>'helptopics.php','title'=>'Manage Options');
             $tabs['emails']=array('desc'=>'Emails','href'=>'emails.php','title'=>'Email Settings');
-            $tabs['topics']=array('desc'=>'Help Topics','href'=>'helptopics.php','title'=>'Help Topics');
-            $tabs['staff']=array('desc'=>'Staff','href'=>'staff.php','title'=>'Staff Members');
-            $tabs['depts']=array('desc'=>'Departments','href'=>'departments.php','title'=>'Departments');
+            $tabs['staff']=array('desc'=>'Staff','href'=>'staff.php','title'=>'Manage Staff');
             $this->tabs=$tabs;
         }
 
@@ -185,36 +184,26 @@ class AdminNav extends StaffNav{
                     break;
                 case 'settings':
                     $subnav[]=array('desc'=>'Settings & Preferences','href'=>'settings.php','iconclass'=>'preferences');
+                    break;
+                case 'manage':
+                    $subnav[]=array('desc'=>'Help Topics','href'=>'helptopics.php','iconclass'=>'helpTopics');
+                    $subnav[]=array('desc'=>'Ticket Filters','href'=>'filters.php',
+                                        'title'=>'Ticket Filters','iconclass'=>'emailFilters');
                     $subnav[]=array('desc'=>'SLA Plans','href'=>'slas.php','iconclass'=>'sla');
                     $subnav[]=array('desc'=>'API Keys','href'=>'apikeys.php','iconclass'=>'api');
                     break;
                 case 'emails':
-                    $subnav[]=array('desc'=>'Email Addresses','href'=>'emails.php','iconclass'=>'emailSettings');
-                    $subnav[]=array('desc'=>'Email Filters','href'=>'filters.php',
-                                        'title'=>'Email Filters','iconclass'=>'emailFilters');
-                    $subnav[]=array('desc'=>'Email Banlist','href'=>'banlist.php',
+                    $subnav[]=array('desc'=>'Emails','href'=>'emails.php', 'title'=>'Email Addresses', 'iconclass'=>'emailSettings');
+                    $subnav[]=array('desc'=>'Banlist','href'=>'banlist.php',
                                         'title'=>'Banned Emails','iconclass'=>'emailDiagnostic');
-                    $subnav[]=array('desc'=>'Email Templates','href'=>'templates.php','title'=>'Email Templates','iconclass'=>'emailTemplates');
-                    $subnav[]=array('desc'=>'Email Diagnostic','href'=>'emailtest.php','iconclass'=>'emailDiagnostic');
-                    break;
-                case 'topics':
-                    $subnav[]=array('desc'=>'Help Topics','href'=>'helptopics.php','iconclass'=>'helpTopics');
-                    $subnav[]=array('desc'=>'Add New Help Topics',
-                                    'href'=>'helptopics.php?a=add',
-                                    'iconclass'=>'newHelpTopic',
-                                    'droponly'=>true);
+                    $subnav[]=array('desc'=>'Templates','href'=>'templates.php','title'=>'Email Templates','iconclass'=>'emailTemplates');
+                    $subnav[]=array('desc'=>'Diagnostic','href'=>'emailtest.php', 'title'=>'Email Diagnostic', 'iconclass'=>'emailDiagnostic');
                     break;
                 case 'staff':
                     $subnav[]=array('desc'=>'Staff Members','href'=>'staff.php','iconclass'=>'users');
                     $subnav[]=array('desc'=>'Teams','href'=>'teams.php','iconclass'=>'teams');
                     $subnav[]=array('desc'=>'Groups','href'=>'groups.php','iconclass'=>'groups');
-                    break;
-                case 'depts':
                     $subnav[]=array('desc'=>'Departments','href'=>'departments.php','iconclass'=>'departments');
-                    $subnav[]=array('desc'=>'Add New Department',
-                                    'href'=>'departments.php?a=add',
-                                    'iconclass'=>'newDepartment',
-                                    'droponly'=>true);
                     break;
             }
             if($subnav)
diff --git a/scp/apikeys.php b/scp/apikeys.php
index e393a31c5f2bea0647a238240ba5e9021ad3c9ab..1e17675442066356a077041f03357fa0c3913414 100644
--- a/scp/apikeys.php
+++ b/scp/apikeys.php
@@ -96,7 +96,7 @@ $page='apikeys.inc.php';
 if($api || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
     $page='apikey.inc.php';
 
-$nav->setTabActive('settings');
+$nav->setTabActive('manage');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/departments.php b/scp/departments.php
index ef1acb12d62adcaa3c6285a210e7aa9d3f57fc29..31fc4c6df5602f5959d9f4585517a8ebf04fc008 100644
--- a/scp/departments.php
+++ b/scp/departments.php
@@ -104,7 +104,7 @@ $page='departments.inc.php';
 if($dept || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
     $page='department.inc.php';
 
-$nav->setTabActive('depts');
+$nav->setTabActive('staff');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/filters.php b/scp/filters.php
index 4ce0f30765f5192617f22345c00571f26d206af2..2fe1f9fb7c06f9848f958d1e2e8b6ebe62b17390 100644
--- a/scp/filters.php
+++ b/scp/filters.php
@@ -100,7 +100,7 @@ $page='filters.inc.php';
 if($filter || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
     $page='filter.inc.php';
 
-$nav->setTabActive('emails');
+$nav->setTabActive('manage');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/helptopics.php b/scp/helptopics.php
index 5bd1ded7048f26307f2cd18d09d6b3a946f13f65..37e865b22057483bc87595023ad92ce9be1bb306 100644
--- a/scp/helptopics.php
+++ b/scp/helptopics.php
@@ -96,7 +96,7 @@ $page='helptopics.inc.php';
 if($topic || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
     $page='helptopic.inc.php';
 
-$nav->setTabActive('topics');
+$nav->setTabActive('manage');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/slas.php b/scp/slas.php
index 8f3b0f75ca331381beb6a348f46c2a703853b229..8dd5b86c90b33b6cf2e88558f9ac679f63af77be 100644
--- a/scp/slas.php
+++ b/scp/slas.php
@@ -96,7 +96,7 @@ $page='slaplans.inc.php';
 if($sla || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
     $page='slaplan.inc.php';
 
-$nav->setTabActive('settings');
+$nav->setTabActive('manage');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');