diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index a1abda918..47642417e 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -55,15 +55,21 @@
             <System_Tunables VisibleName="System Tunables" url="/system_advanced_sysctl.php"/>
             <Notifications url="/system_advanced_notifications.php"/>
         </Settings>
-        <SetupWizard VisibleName="Wizard" url="/wizard.php" cssClass="fa fa-magic">
+        <Wizard url="/wizard.php" cssClass="fa fa-magic">
             <Step url="/wizard.php*"/>
-        </SetupWizard>
-        <UserManager VisibleName="Users" url="/system_usermanager.php" cssClass="fa fa-users">
-            <Users url="/system_usermanager.php"/>
-            <Groups url="/system_groupmanager.php"/>
+        </Wizard>
+        <Users cssClass="fa fa-users">
+            <All url="/system_usermanager.php">
+                <Privileges url="/system_usermanager_addprivs.php*"/>
+            </All>
+            <Groups url="/system_groupmanager.php">
+                <Privileges url="/system_groupmanager_addprivs.php*"/>
+            </Groups>
+            <Servers url="/system_authservers.php">
+                <Edit url="/system_authservers.php*"/>
+            </Servers>
             <Settings url="/system_usermanager_settings.php"/>
-            <Servers url="/system_authservers.php*"/>
-        </UserManager>
+        </Users>
     </System>
     <Interfaces order="2" cssClass="glyphicon glyphicon-wrench">
         <Assign VisibleName="(Assign)" order="999" url="/interfaces_assign.php">
diff --git a/src/www/system_authservers.php b/src/www/system_authservers.php
index 62a2c1c25..07abdfa21 100644
--- a/src/www/system_authservers.php
+++ b/src/www/system_authservers.php
@@ -71,7 +71,7 @@ $radius_srvcs = array(
 
 
 
-$pgtitle = array(gettext("System"), gettext("Authentication Servers"));
+$pgtitle = array(gettext('System'), gettext('Users'), gettext('Servers'));
 $shortcut_section = "authentication";
 
 if (isset($_GET['id']) && is_numericint($_GET['id'])) {
@@ -479,15 +479,6 @@ endif; ?>
 
 			    <section class="col-xs-12">
 
-					<?php
-                            $tab_array = array();
-                            $tab_array[] = array(gettext("Users"), false, "system_usermanager.php");
-                            $tab_array[] = array(gettext("Groups"), false, "system_groupmanager.php");
-                            $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php");
-                            $tab_array[] = array(gettext("Servers"), true, "system_authservers.php");
-                            display_top_tabs($tab_array);
-                        ?>
-
 						<div class="tab-content content-box col-xs-12 table-responsive">
 
 								<?php if ($act == "new" || $act == "edit") :
diff --git a/src/www/system_groupmanager.php b/src/www/system_groupmanager.php
index 05785412e..d036da849 100644
--- a/src/www/system_groupmanager.php
+++ b/src/www/system_groupmanager.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2008 Shrew Soft Inc.
@@ -30,9 +31,9 @@
 
 require_once("guiconfig.inc");
 
-$pgtitle = array(gettext("System"), gettext("Group manager"));
+$pgtitle = array(gettext('System'), gettext('Groups'));
 
-if (!is_array($config['system']['group'])) {
+if (!isset($config['system']['group'])) {
     $config['system']['group'] = array();
 }
 
@@ -250,17 +251,6 @@ function presubmit() {
                 ?>
 
 			    <section class="col-xs-12">
-
-
-					<?php
-                                    $tab_array = array();
-                                    $tab_array[] = array(gettext("Users"), false, "system_usermanager.php");
-                                    $tab_array[] = array(gettext("Groups"), true, "system_groupmanager.php");
-                                    $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php");
-                                    $tab_array[] = array(gettext("Servers"), false, "system_authservers.php");
-                                    display_top_tabs($tab_array);
-                        ?>
-
 						<div class="tab-content content-box col-xs-12">
 
 							<?php
diff --git a/src/www/system_groupmanager_addprivs.php b/src/www/system_groupmanager_addprivs.php
index f216111e7..ecbd5e663 100644
--- a/src/www/system_groupmanager_addprivs.php
+++ b/src/www/system_groupmanager_addprivs.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2006 Daniel S. Haischt.
@@ -44,7 +45,7 @@ function admin_groups_sort()
 
 require_once("guiconfig.inc");
 
-$pgtitle = array(gettext("System"),gettext("Group manager"),gettext("Add privileges"));
+$pgtitle = array(gettext('System'), gettext('Groups'), gettext('Privileges'));
 
 if (is_numericint($_GET['groupid'])) {
     $groupid = $_GET['groupid'];
@@ -163,15 +164,6 @@ function update_description() {
             }
             ?>
 			<section class="col-xs-12">
-
-						<?php
-                            $tab_array = array();
-                            $tab_array[] = array(gettext("Users"), false, "system_usermanager.php");
-                            $tab_array[] = array(gettext("Groups"), true, "system_groupmanager.php");
-                            $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php");
-                            $tab_array[] = array(gettext("Servers"), false, "system_authservers.php");
-                            display_top_tabs($tab_array);
-                        ?>
 						<div class="tab-content content-box col-xs-12">
 
 						<form action="system_groupmanager_addprivs.php" method="post" name="iform" id="iform">
diff --git a/src/www/system_usermanager.php b/src/www/system_usermanager.php
index 124f96a77..31e9cec4d 100644
--- a/src/www/system_usermanager.php
+++ b/src/www/system_usermanager.php
@@ -75,7 +75,7 @@ function get_user_privdesc(& $user)
 
 
 // start admin user code
-$pgtitle = array(gettext("System"),gettext("User Manager"));
+$pgtitle = array(gettext('System'), gettext('Users'));
 
 // find web ui authentication method
 $authcfg_type = auth_get_authserver($config['system']['webgui']['authmode'])['type'];
@@ -492,16 +492,6 @@ function import_ldap_users() {
 
 			    <section class="col-xs-12">
 
-
-					<?php
-                                    $tab_array = array();
-                                    $tab_array[] = array(gettext("Users"), true, "system_usermanager.php");
-                                    $tab_array[] = array(gettext("Groups"), false, "system_groupmanager.php");
-                                    $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php");
-                                    $tab_array[] = array(gettext("Servers"), false, "system_authservers.php");
-                                    display_top_tabs($tab_array);
-                        ?>
-
 						<div class="tab-content content-box col-xs-12 table-responsive">
 
 						<?php
diff --git a/src/www/system_usermanager_addprivs.php b/src/www/system_usermanager_addprivs.php
index a3f0b3734..11184a8b9 100644
--- a/src/www/system_usermanager_addprivs.php
+++ b/src/www/system_usermanager_addprivs.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2006 Daniel S. Haischt.
@@ -44,7 +45,7 @@ function sort_user_privs($privs) {
 }
 
 
-$pgtitle = array("System","User manager","Add privileges");
+$pgtitle = array(gettext('System'), gettext('Users'),gettext('Privileges'));
 
 if (is_numericint($_GET['userid'])) {
     $userid = $_GET['userid'];
@@ -155,15 +156,6 @@ function update_description() {
             }
             ?>
 			<section class="col-xs-12">
-				<?php
-                    $tab_array = array();
-                    $tab_array[] = array(gettext("Users"), true, "system_usermanager.php");
-                    $tab_array[] = array(gettext("Groups"), false, "system_groupmanager.php");
-                    $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php");
-                    $tab_array[] = array(gettext("Servers"), false, "system_authservers.php");
-                    display_top_tabs($tab_array);
-                ?>
-
 				<div class="tab-content content-box col-xs-12">
 					<form action="system_usermanager_addprivs.php" method="post" name="iform" id="iform">
 						<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area" class="table table-striped">
diff --git a/src/www/system_usermanager_settings.php b/src/www/system_usermanager_settings.php
index e2b9579f2..92fedde7f 100644
--- a/src/www/system_usermanager_settings.php
+++ b/src/www/system_usermanager_settings.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2007 Scott Ullrich <sullrich@gmail.com>
@@ -34,7 +35,7 @@ $pconfig['authmode'] = &$config['system']['webgui']['authmode'];
 $pconfig['backend'] = &$config['system']['webgui']['backend'];
 
 // Page title for main admin
-$pgtitle = array(gettext("System"),gettext("User manager settings"));
+$pgtitle = array(gettext('System'), gettext('Users'), gettext('Settings'));
 
 $save_and_test = false;
 if ($_POST) {
@@ -109,16 +110,7 @@ if ($save_and_test) {
 }?>
 
 			    <section class="col-xs-12">
-
-
 					<?php
-                            $tab_array = array();
-                            $tab_array[] = array(gettext("Users"), false, "system_usermanager.php");
-                            $tab_array[] = array(gettext("Groups"), false, "system_groupmanager.php");
-                            $tab_array[] = array(gettext("Settings"), true, "system_usermanager_settings.php");
-                            $tab_array[] = array(gettext("Servers"), false, "system_authservers.php");
-                            display_top_tabs($tab_array);
-
                             /* Default to pfsense backend type if none is defined */
                     if (!$pconfig['backend']) {
                         $pconfig['backend'] = "pfsense";