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 dee75e7c7..5f37b07ef 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -1,5 +1,5 @@
 <menu>
-    <Lobby order="0" cssClass="fa fa-laptop">
+    <Lobby order="10" cssClass="fa fa-laptop">
         <Dashboard order="0" url="/index.php" cssClass="fa fa-dashboard fa-fw">
             <Root url="/" visibility="hidden"/>
         </Dashboard>
@@ -7,7 +7,7 @@
         <Password order="2" url="/system_usermanager_passwordmg.php" cssClass="fa fa-key fa-fw"/>
         <Logout order="3" url="/index.php?logout" cssClass="fa fa-sign-out fa-fw"/>
     </Lobby>
-    <System order="1" VisibleName="System" cssClass="fa fa-server">
+    <System order="20" VisibleName="System" cssClass="fa fa-server">
         <Trust order="120" cssClass="fa fa-certificate fa-fw">
             <Certificates url="/system_certmanager.php">
                 <workAround url="/system_certmanager.php*" visibility="hidden"/>
@@ -84,7 +84,7 @@
             <Tester order="50" url="/diag_authentication.php"/>
         </Access>
     </System>
-    <Interfaces order="2" cssClass="fa fa-sitemap">
+    <Interfaces order="30" cssClass="fa fa-sitemap">
         <Overview order="900" url="/status_interfaces.php" cssClass="fa fa-tasks fa-fw"/>
         <Assignments order="910" url="/interfaces_assign.php" cssClass="fa fa-pencil fa-fw"/>
         <Settings order="920" url="/system_advanced_network.php" cssClass="fa fa-cogs fa-fw"/>
@@ -136,7 +136,7 @@
             </Traffic>
         </Diagnostics>
     </Interfaces>
-    <Firewall order="3" cssClass="glyphicon glyphicon-fire">
+    <Firewall order="40" cssClass="glyphicon glyphicon-fire">
         <Aliases order="10" cssClass="fa fa-list-alt fa-fw">
             <View order="100"  url="/firewall_aliases.php">
                 <Edit url="/firewall_aliases_edit.php*" visibility="hidden"/>
@@ -190,7 +190,7 @@
             <Plain VisibleName="Plain View" order="400" url="/diag_logs_filter_plain.php"/>
         </LogFiles>
     </Firewall>
-    <Services order="5" cssClass="fa fa-cog">
+    <Services order="60" cssClass="fa fa-cog">
         <DHCP cssClass="fa fa-bullseye fa-fw">
             <Server order="100" url="/services_dhcp.php">
                 <Tab url="/services_dhcp.php?if=*" visibility="hidden"/>
@@ -281,7 +281,7 @@
           <All url="/status_services.php?*" visibility="hidden"/>
         </Diagnostics>
     </Services>
-    <VPN order="4" cssClass="fa fa-globe">
+    <VPN order="50" cssClass="fa fa-globe">
         <IPsec cssClass="fa fa-lock fa-fw" order="10">
             <Tunnels order="10" VisibleName="Tunnel Settings" url="/vpn_ipsec.php">
                 <Phase1 url="/vpn_ipsec_phase1.php*" visibility="hidden"/>
@@ -320,7 +320,7 @@
             <Log order="70" VisibleName="Log File" url="/diag_logs_openvpn.php"/>
         </OpenVPN>
     </VPN>
-    <Help order="6" cssClass="fa fa-support">
+    <Help order="70" cssClass="fa fa-support">
         <Documentation order="10" url="https://docs.opnsense.org/" cssClass="fa fa-book" IsExternal="Y"/>
         <Forum VisibleName="User Forum" order="20" url="https://forum.opnsense.org/" cssClass="fa fa-ticket" IsExternal="Y"/>
         <Support VisibleName="Commercial Support" order="30" url="https://opnsense.org/support-overview/commercial-support/" cssClass="fa fa-phone" IsExternal="Y"/>