diff --git a/plist b/plist
index 41a1c8ec3..06ca0cf4a 100644
--- a/plist
+++ b/plist
@@ -443,6 +443,8 @@
 /usr/local/opnsense/mvc/app/models/OPNsense/Diagnostics/Migrations/M1_0_0.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Diagnostics/Netflow.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Diagnostics/Netflow.xml
+/usr/local/opnsense/mvc/app/models/OPNsense/Dnsmasq/Menu/Menu.xml
+/usr/local/opnsense/mvc/app/models/OPNsense/DynamicDNS/Menu/Menu.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/IDS/IDS.php
 /usr/local/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml
@@ -455,11 +457,13 @@
 /usr/local/opnsense/mvc/app/models/OPNsense/Proxy/Migrations/M1_0_0.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.php
 /usr/local/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
+/usr/local/opnsense/mvc/app/models/OPNsense/RFC2136/Menu/Menu.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/ACL/ACL.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/Menu/Menu.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/Migrations/M1_0_0.php
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.php
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
+/usr/local/opnsense/mvc/app/models/OPNsense/Unbound/Menu/Menu.xml
 /usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/clients.volt
 /usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/index.volt
 /usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/vouchers.volt
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 b281317d0..236d0520c 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -131,10 +131,11 @@
             </VLAN>
         </Types>
         <Diagnostics order="960" cssClass="fa fa-medkit fa-fw">
-            <PacketCapture order="40" VisibleName="Packet Capture" url="/diag_packet_capture.php"/>
-            <Ping order="50" url="/diag_ping.php"/>
-            <TestPort order="60" VisibleName="Test Port" url="/diag_testport.php"/>
-            <Traceroute order="70" url="/diag_traceroute.php"/>
+            <DNSLookup VisibleName="DNS Lookup" url="/diag_dns.php"/>
+            <PacketCapture VisibleName="Packet Capture" url="/diag_packet_capture.php"/>
+            <Ping url="/diag_ping.php"/>
+            <TestPort VisibleName="Port Probe" url="/diag_testport.php"/>
+            <Traceroute VisibleName="Trace Route" url="/diag_traceroute.php"/>
         </Diagnostics>
     </Interfaces>
     <Firewall order="40" cssClass="glyphicon glyphicon-fire">
@@ -230,31 +231,8 @@
                 <Details url="/status_dhcpv6_leases.php?*" visibility="hidden"/>
             </Leases>
         </DHCPv6>
-        <DNSForwarder VisibleName="DNS Forwarder" url="/services_dnsmasq.php" cssClass="fa fa-tags fa-fw">
-            <Hosts url="/services_dnsmasq_edit.php*" visibility="hidden"/>
-            <Domains url="/services_dnsmasq_domainoverride_edit.php*" visibility="hidden"/>
-        </DNSForwarder>
-        <DNSResolver VisibleName="DNS Resolver" cssClass="fa fa-tags fa-fw">
-            <General order="10" url="/services_unbound.php"/>
-            <Overrides order="15" url="/services_unbound_overrides.php">
-                <Hosts url="/services_unbound_host_edit.php*" visibility="hidden"/>
-                <Domains url="/services_unbound_domainoverride_edit.php*" visibility="hidden"/>
-            </Overrides>
-            <Advanced order="20" url="/services_unbound_advanced.php"/>
-            <ACL VisibleName="Access Lists" order="30" url="/services_unbound_acls.php">
-                <All url="/services_unbound_acls.php*" visibility="hidden"/>
-            </ACL>
-        </DNSResolver>
         <DNSTools VisibleName="DNS Tools" cssClass="fa fa-tags fa-fw">
-            <DynamicDNS VisibleName="Dynamic DNS" order="10" url="/services_dyndns.php">
-                <Edit url="/services_dyndns_edit.php*" visibility="hidden"/>
-            </DynamicDNS>
-            <Filter order="20" url="/services_opendns.php"/>
-            <RFC2136 order="30" VisibleName="RFC 2136" url="/services_rfc2136.php">
-                <Edit url="/services_rfc2136_edit.php*" visibility="hidden"/>
-            </RFC2136>
-            <Lookup order="40" url="/diag_dns.php"/>
-            <LogFile order="100" VisibleName="Log File" url="/diag_logs_resolver.php"/>
+            <DNSFilter VisibleName="OpenDNS" url="/services_opendns.php"/>
         </DNSTools>
         <Diagnostics order="900" cssClass="fa fa-medkit fa-fw" url="/status_services.php">
           <All url="/status_services.php?*" visibility="hidden"/>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml
index 65e40e185..6cb1bb42f 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml
@@ -13,8 +13,8 @@
     </System>
     <Interfaces>
         <Diagnostics>
-            <ARPTable order="10" VisibleName="ARP Table" url="/ui/diagnostics/interface/arp/"/>
-            <NDPTable order="30" VisibleName="NDP Table" url="/ui/diagnostics/interface/ndp/"/>
+            <ARPTable VisibleName="ARP Table" url="/ui/diagnostics/interface/arp/"/>
+            <NDPTable VisibleName="NDP Table" url="/ui/diagnostics/interface/ndp/"/>
         </Diagnostics>
     </Interfaces>
 </menu>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Dnsmasq/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Dnsmasq/Menu/Menu.xml
new file mode 100644
index 000000000..3ff778c5a
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/Dnsmasq/Menu/Menu.xml
@@ -0,0 +1,8 @@
+<menu>
+    <Services>
+        <DNSForwarder VisibleName="Dnsmasq DNS" url="/services_dnsmasq.php" cssClass="fa fa-tags fa-fw">
+            <Hosts url="/services_dnsmasq_edit.php*" visibility="hidden"/>
+            <Domains url="/services_dnsmasq_domainoverride_edit.php*" visibility="hidden"/>
+        </DNSForwarder>
+    </Services>
+</menu>
diff --git a/src/opnsense/mvc/app/models/OPNsense/DynamicDNS/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/DynamicDNS/Menu/Menu.xml
new file mode 100644
index 000000000..4662764c2
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/DynamicDNS/Menu/Menu.xml
@@ -0,0 +1,9 @@
+<menu>
+    <Services>
+        <DNSTools>
+            <DynamicDNS VisibleName="Dynamic DNS" url="/services_dyndns.php">
+                <Edit url="/services_dyndns_edit.php*" visibility="hidden"/>
+            </DynamicDNS>
+        </DNSTools>
+    </Services>
+</menu>
diff --git a/src/opnsense/mvc/app/models/OPNsense/RFC2136/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/RFC2136/Menu/Menu.xml
new file mode 100644
index 000000000..fff71870b
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/RFC2136/Menu/Menu.xml
@@ -0,0 +1,9 @@
+<menu>
+    <Services>
+        <DNSTools>
+            <RFC2136 VisibleName="RFC 2136" url="/services_rfc2136.php">
+                <Edit url="/services_rfc2136_edit.php*" visibility="hidden"/>
+            </RFC2136>
+        </DNSTools>
+    </Services>
+</menu>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Unbound/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Unbound/Menu/Menu.xml
new file mode 100644
index 000000000..b8406d320
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/Unbound/Menu/Menu.xml
@@ -0,0 +1,16 @@
+<menu>
+    <Services>
+        <DNSResolver VisibleName="Unbound DNS" cssClass="fa fa-tags fa-fw">
+            <General order="10" url="/services_unbound.php"/>
+            <Overrides order="20" url="/services_unbound_overrides.php">
+                <Hosts url="/services_unbound_host_edit.php*" visibility="hidden"/>
+                <Domains url="/services_unbound_domainoverride_edit.php*" visibility="hidden"/>
+            </Overrides>
+            <Advanced order="30" url="/services_unbound_advanced.php"/>
+            <ACL VisibleName="Access Lists" order="40" url="/services_unbound_acls.php">
+                <All url="/services_unbound_acls.php*" visibility="hidden"/>
+            </ACL>
+            <LogFile VisibleName="Log File" order="50" url="/diag_logs_resolver.php"/>
+        </DNSResolver>
+    </Services>
+</menu>