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 aa6d68e0e..945adde3a 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -1,15 +1,6 @@
 <menu>
     <!-- Core menu system including legacy stuff -->
     <System order="0" VisibleName="System" cssClass="glyphicon glyphicon-dashboard">
-        <Advanced url="/system_advanced_admin.php">
-                <Admin_Access VisibleName="Admin Access" url="/system_advanced_admin.php"/>
-                <Firewall_NAT VisibleName="Firewall/NAT" url="/system_advanced_firewall.php"/>
-                <Networking url="/system_advanced_network.php"></Networking>
-                <Miscellaneos url="/system_advanced_misc.php"/>
-                <System_Tunables VisibleName="System Tunables" url="/system_advanced_sysctl.php"/>
-                <Notifications url="system_advanced_notifications.php"/>
-        </Advanced>
-
         <CertificateManager VisibleName="Certificate Manager" url="/system_camanager.php">
                 <CAs url="/system_camanager.php"/>
                 <Certificates url="/system_certmanager.php"/>
@@ -27,6 +18,16 @@
 
         <Routing url="/system_gateways.php"/>
 
+        <Settings url="/system_general.php">
+                <General VisibleName="General" url="/system_general.php"/>
+                <Admin_Access VisibleName="Admin Access" url="/system_advanced_admin.php"/>
+                <Firewall_NAT VisibleName="Firewall/NAT" url="/system_advanced_firewall.php"/>
+                <Networking url="/system_advanced_network.php"></Networking>
+                <Miscellaneos url="/system_advanced_misc.php"/>
+                <System_Tunables VisibleName="System Tunables" url="/system_advanced_sysctl.php"/>
+                <Notifications url="system_advanced_notifications.php"/>
+        </Settings>
+
         <SetupWizard  VisibleName="Setup Wizard" url="wizard.php?xml=setup_wizard.xml"/>
 
         <UserManager  VisibleName="User Manager" url="/system_usermanager.php">
diff --git a/src/www/fbegin.inc b/src/www/fbegin.inc
index d0a8ead74..4b24872d1 100755
--- a/src/www/fbegin.inc
+++ b/src/www/fbegin.inc
@@ -126,9 +126,8 @@ function active_main_menu() {
 
 // System
 $system_menu = array();
-$system_menu[] = array(gettext("Advanced"), "/system_advanced_admin.php");
+$system_menu[] = array(gettext("Settings"), "/system_general.php");
 $system_menu[] = array(gettext("Firmware"), "/system_firmware_check.php");
-$system_menu[] = array(gettext("General Setup"), "/system_general.php");
 $system_menu[] = array(gettext("High Avail. Sync"), "/system_hasync.php");
 $system_menu[] = array(gettext("Setup Wizard"), "/wizard.php?xml=setup_wizard.xml");
 $system_menu[] = array(gettext("Routing"), "/system_gateways.php");
diff --git a/src/www/system_advanced_tabs.php b/src/www/system_advanced_tabs.php
index ad6ecae75..47614e624 100644
--- a/src/www/system_advanced_tabs.php
+++ b/src/www/system_advanced_tabs.php
@@ -6,6 +6,7 @@
 <?php
     $active_tab = isset($active_tab) ? $active_tab : $_SERVER['PHP_SELF'];
 	$tab_array = array();
+	$tab_array[] = array(gettext("General"), $active_tab == "/system_general.php", "system_general.php");
 	$tab_array[] = array(gettext("Admin Access"), $active_tab == "/system_advanced_admin.php", "system_advanced_admin.php");
 	$tab_array[] = array(gettext("Firewall / NAT"), $active_tab == "/system_advanced_firewall.php", "system_advanced_firewall.php");
 	$tab_array[] = array(gettext("Networking"), $active_tab == "/system_advanced_network.php", "system_advanced_network.php");
diff --git a/src/www/system_general.php b/src/www/system_general.php
index 7ffa648e7..9ce108031 100644
--- a/src/www/system_general.php
+++ b/src/www/system_general.php
@@ -287,8 +287,9 @@ include("head.inc");
 		if ($savemsg) print_info_box($savemsg);
             ?>
             <section class="col-xs-12">
+                <? include('system_advanced_tabs.php'); ?>
 
-                <div class="content-box table-responsive">
+                <div class="content-box tab-content">
 
 			<form action="system_general.php" method="post">
 				<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area" class="table table-striped">