diff --git a/benchmarks/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/Menu/Menu.xml b/benchmarks/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/Menu/Menu.xml
index 6803c24ea..c36a03924 100644
--- a/benchmarks/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/Menu/Menu.xml
+++ b/benchmarks/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/Menu/Menu.xml
@@ -1,7 +1,7 @@
 <menu>
-  <Interfaces>
-    <Diagnostics>
-      <Iperf url="/ui/iperf/" />
-    </Diagnostics>
-  </Interfaces>
+    <Interfaces>
+        <Diagnostics>
+            <Iperf url="/ui/iperf" />
+        </Diagnostics>
+    </Interfaces>
 </menu>
diff --git a/databases/redis/src/opnsense/mvc/app/models/OPNsense/Redis/Menu/Menu.xml b/databases/redis/src/opnsense/mvc/app/models/OPNsense/Redis/Menu/Menu.xml
index 84dc4c68c..7c3cce883 100644
--- a/databases/redis/src/opnsense/mvc/app/models/OPNsense/Redis/Menu/Menu.xml
+++ b/databases/redis/src/opnsense/mvc/app/models/OPNsense/Redis/Menu/Menu.xml
@@ -1,5 +1,5 @@
 <menu>
     <Services>
-        <Redis cssClass="fa fa-database fa-fw" url="/ui/redis/" />
+        <Redis cssClass="fa fa-database fa-fw" url="/ui/redis" />
     </Services>
 </menu>
diff --git a/devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/Menu/Menu.xml b/devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/Menu/Menu.xml
index 090c0a819..0fb0827a2 100644
--- a/devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/Menu/Menu.xml
+++ b/devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/Menu/Menu.xml
@@ -1,5 +1,5 @@
 <menu>
     <Lobby>
-        <HelloWorld VisibleName="Hello World!" cssClass="fa fa-comment-o fa-fw" url="/ui/helloworld/"/>
+        <HelloWorld VisibleName="Hello World!" cssClass="fa fa-comment-o fa-fw" url="/ui/helloworld"/>
     </Lobby>
 </menu>
diff --git a/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/Menu/Menu.xml b/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/Menu/Menu.xml
index f0a8cec3e..10ef5c238 100644
--- a/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/Menu/Menu.xml
+++ b/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/Menu/Menu.xml
@@ -1,5 +1,5 @@
 <menu>
   <Services>
-    <Rspamd cssClass="fa fa-envelope fa-fw" url="/ui/rspamd/" />
+    <Rspamd cssClass="fa fa-envelope fa-fw" url="/ui/rspamd" />
   </Services>
 </menu>
diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/Menu/Menu.xml b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/Menu/Menu.xml
index 03a723c1a..567e3ac6e 100644
--- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/Menu/Menu.xml
+++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/Menu/Menu.xml
@@ -1,10 +1,10 @@
 <menu>
     <Services>
       <ZabbixAgent VisibleName="Zabbix Agent" cssClass="fa fa-certificate fa-fw">
-          <Settings order="10" url="/ui/zabbixagent/">
-              <Main url="/ui/zabbixagent/#tab_zabbixagent-settings-main"/>
-              <Features url="/ui/zabbixagent/#tab_zabbixagent-settings-features"/>
-              <Tuning url="/ui/zabbixagent/#tab_zabbixagent-settings-tuning"/>
+          <Settings order="10" url="/ui/zabbixagent">
+              <Main url="/ui/zabbixagent#tab_zabbixagent-settings-main"/>
+              <Features url="/ui/zabbixagent#tab_zabbixagent-settings-features"/>
+              <Tuning url="/ui/zabbixagent#tab_zabbixagent-settings-tuning"/>
           </Settings>
           <Log VisibleName="Log File" order="50" url="/diag_logs_zabbixagent.php"/>
       </ZabbixAgent>
diff --git a/net/arp-scan/src/opnsense/mvc/app/models/OPNsense/ARPscanner/Menu/Menu.xml b/net/arp-scan/src/opnsense/mvc/app/models/OPNsense/ARPscanner/Menu/Menu.xml
index 46853c31f..0681e7add 100644
--- a/net/arp-scan/src/opnsense/mvc/app/models/OPNsense/ARPscanner/Menu/Menu.xml
+++ b/net/arp-scan/src/opnsense/mvc/app/models/OPNsense/ARPscanner/Menu/Menu.xml
@@ -1,7 +1,7 @@
 <menu>
    <Interfaces>
       <Diagnostics>
-      <ARPscanner VisibleName="ARP Scan" cssClass="fa fa-search fa-fw" url="/ui/arpscanner/"/>
+      <ARPScan VisibleName="ARP Scan" cssClass="fa fa-search fa-fw" url="/ui/arpscanner"/>
       </Diagnostics>
    </Interfaces>
 </menu>
diff --git a/net/ftp-proxy/src/opnsense/mvc/app/models/OPNsense/FtpProxy/Menu/Menu.xml b/net/ftp-proxy/src/opnsense/mvc/app/models/OPNsense/FtpProxy/Menu/Menu.xml
index 1e697e5a7..37c516a2a 100644
--- a/net/ftp-proxy/src/opnsense/mvc/app/models/OPNsense/FtpProxy/Menu/Menu.xml
+++ b/net/ftp-proxy/src/opnsense/mvc/app/models/OPNsense/FtpProxy/Menu/Menu.xml
@@ -1,5 +1,5 @@
 <menu>
    <Services>
-      <FtpProxy VisibleName="FTP Proxy" cssClass="fa fa-bolt fa-fw" url="/ui/ftpproxy/"/>
+      <FtpProxy VisibleName="FTP Proxy" cssClass="fa fa-bolt fa-fw" url="/ui/ftpproxy"/>
    </Services>
 </menu>
diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Menu/Menu.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Menu/Menu.xml
index b49bddb1f..8c4344843 100644
--- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Menu/Menu.xml
+++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Menu/Menu.xml
@@ -1,27 +1,27 @@
 <menu>
     <Services>
       <HAProxy VisibleName="HAProxy" cssClass="fa fa-truck fa-fw">
-          <Settings order="10" url="/ui/haproxy/">
-              <GeneralSettings VisibleName="Service Settings" url="/ui/haproxy/#subtab_haproxy-general-settings"/>
-              <PeerSync VisibleName="Peers / Session Sync" url="/ui/haproxy/#subtab_haproxy-general-peers"/>
-              <GlobalParameters VisibleName="Global Parameters" url="/ui/haproxy/#subtab_haproxy-general-global"/>
-              <DefaultParameters VisibleName="Detault Parameters" url="/ui/haproxy/#subtab_haproxy-general-defaults"/>
-              <LoggingConfiguration VisibleName="Logging Configuration" url="/ui/haproxy/#subtab_haproxy-general-logging"/>
-              <StatisticsConfiguration VisibleName="Statistics Configuration" url="/ui/haproxy/#subtab_haproxy-general-statistics"/>
-              <Frontends VisibleName="Frontends" url="/ui/haproxy/#frontends"/>
-              <Backends VisibleName="Backends" url="/ui/haproxy/#backends"/>
-              <Servers VisibleName="Servers" url="/ui/haproxy/#servers"/>
-              <HealthChecks VisibleName="Health Checks" url="/ui/haproxy/#healthchecks"/>
-              <Actions VisibleName="Actions" url="/ui/haproxy/#actions"/>
-              <Acls VisibleName="ACLs" url="/ui/haproxy/#acls"/>
-              <Luas VisibleName="Lua Scripts" url="/ui/haproxy/#luas"/>
-              <Errorfiles VisibleName="Error Files" url="/ui/haproxy/#errorfiles"/>
+          <Settings order="10" url="/ui/haproxy">
+              <GeneralSettings VisibleName="Service Settings" url="/ui/haproxy#subtab_haproxy-general-settings"/>
+              <PeerSync VisibleName="Peers / Session Sync" url="/ui/haproxy#subtab_haproxy-general-peers"/>
+              <GlobalParameters VisibleName="Global Parameters" url="/ui/haproxy#subtab_haproxy-general-global"/>
+              <DefaultParameters VisibleName="Detault Parameters" url="/ui/haproxy#subtab_haproxy-general-defaults"/>
+              <LoggingConfiguration VisibleName="Logging Configuration" url="/ui/haproxy#subtab_haproxy-general-logging"/>
+              <StatisticsConfiguration VisibleName="Statistics Configuration" url="/ui/haproxy#subtab_haproxy-general-statistics"/>
+              <Frontends VisibleName="Frontends" url="/ui/haproxy#frontends"/>
+              <Backends VisibleName="Backends" url="/ui/haproxy#backends"/>
+              <Servers VisibleName="Servers" url="/ui/haproxy#servers"/>
+              <HealthChecks VisibleName="Health Checks" url="/ui/haproxy#healthchecks"/>
+              <Actions VisibleName="Actions" url="/ui/haproxy#actions"/>
+              <Acls VisibleName="ACLs" url="/ui/haproxy#acls"/>
+              <Luas VisibleName="Lua Scripts" url="/ui/haproxy#luas"/>
+              <Errorfiles VisibleName="Error Files" url="/ui/haproxy#errorfiles"/>
           </Settings>
-          <Statistics order="20" url="/ui/haproxy/statistics/">
-              <Overview VisibleName="Overview" url="/ui/haproxy/statistics/#info"/>
-              <Status VisibleName="Status" url="/ui/haproxy/statistics/#status"/>
-              <Counters VisibleName="Counters" url="/ui/haproxy/statistics/#counters"/>
-              <StickTables VisibleName="Stick Tables" url="/ui/haproxy/statistics/#tables"/>
+          <Statistics order="20" url="/ui/haproxy/statistics">
+              <Overview VisibleName="Overview" url="/ui/haproxy/statistics#info"/>
+              <Status VisibleName="Status" url="/ui/haproxy/statistics#status"/>
+              <Counters VisibleName="Counters" url="/ui/haproxy/statistics#counters"/>
+              <StickTables VisibleName="Stick Tables" url="/ui/haproxy/statistics#tables"/>
           </Statistics>
           <Log VisibleName="Log File" order="30" url="/diag_logs_haproxy.php"/>
       </HAProxy>
diff --git a/net/mdns-repeater/src/opnsense/mvc/app/models/OPNsense/MDNSRepeater/Menu/Menu.xml b/net/mdns-repeater/src/opnsense/mvc/app/models/OPNsense/MDNSRepeater/Menu/Menu.xml
index baf2a980f..c3cea26cb 100644
--- a/net/mdns-repeater/src/opnsense/mvc/app/models/OPNsense/MDNSRepeater/Menu/Menu.xml
+++ b/net/mdns-repeater/src/opnsense/mvc/app/models/OPNsense/MDNSRepeater/Menu/Menu.xml
@@ -1,5 +1,5 @@
 <menu>
    <Services>
-      <MDNSRepeater VisibleName="MDNS Repeater" cssClass="fa fa-bolt fa-fw" url="/ui/mdnsrepeater/"/>
+      <MDNSRepeater VisibleName="MDNS Repeater" cssClass="fa fa-bolt fa-fw" url="/ui/mdnsrepeater"/>
    </Services>
 </menu>
diff --git a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Menu/Menu.xml b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Menu/Menu.xml
index 7e3c36adf..e15e5824a 100644
--- a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Menu/Menu.xml
+++ b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Menu/Menu.xml
@@ -1,8 +1,8 @@
 <menu>
    <Services>
       <Relayd cssClass="fa fa-truck fa-fw">
-         <Settings url="/ui/relayd/"/>
-         <Status url="/ui/relayd/status/"/>
+         <Settings url="/ui/relayd"/>
+         <Status url="/ui/relayd/status"/>
          <Log VisibleName="Log File" order="100" url="/diag_logs_relayd.php"/>
       </Relayd>
    </Services>
diff --git a/net/wol/src/opnsense/mvc/app/models/OPNsense/Wol/Menu/Menu.xml b/net/wol/src/opnsense/mvc/app/models/OPNsense/Wol/Menu/Menu.xml
index f5f232734..8c5d8510f 100644
--- a/net/wol/src/opnsense/mvc/app/models/OPNsense/Wol/Menu/Menu.xml
+++ b/net/wol/src/opnsense/mvc/app/models/OPNsense/Wol/Menu/Menu.xml
@@ -1,5 +1,5 @@
 <menu>
     <Services>
-        <WoL VisibleName="Wake on LAN" url="/ui/wol/" cssClass="fa fa-power-off fa-fw" />
+        <WoL VisibleName="Wake on LAN" url="/ui/wol" cssClass="fa fa-power-off fa-fw" />
     </Services>
 </menu>
diff --git a/net/zerotier/src/opnsense/mvc/app/models/OPNsense/Zerotier/Menu/Menu.xml b/net/zerotier/src/opnsense/mvc/app/models/OPNsense/Zerotier/Menu/Menu.xml
index 75af8d0db..0fddde3e8 100644
--- a/net/zerotier/src/opnsense/mvc/app/models/OPNsense/Zerotier/Menu/Menu.xml
+++ b/net/zerotier/src/opnsense/mvc/app/models/OPNsense/Zerotier/Menu/Menu.xml
@@ -1,8 +1,8 @@
 <menu>
     <VPN>
         <Zerotier order="30" VisibleName="Zerotier" cssClass="fa fa-lock fa-fw">
-            <Settings order="40" VisibleName="Settings" url="/ui/zerotier/"/>
-            <Overview order="50" VisibleName="Overview" url="/ui/zerotier/overview/"/>
+            <Settings order="40" VisibleName="Settings" url="/ui/zerotier"/>
+            <Overview order="50" VisibleName="Overview" url="/ui/zerotier/overview"/>
         </Zerotier>
     </VPN>
 </menu>
diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Menu/Menu.xml b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Menu/Menu.xml
index 97de62f21..6ed9f6393 100644
--- a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Menu/Menu.xml
+++ b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Menu/Menu.xml
@@ -2,18 +2,14 @@
     <Services>
       <!-- using LE prefix for proper sorting -->
       <LEAcmeClient VisibleName="Let's Encrypt" cssClass="fa fa-certificate fa-fw">
-          <Settings order="10" url="/ui/acmeclient/">
-              <GeneralSettings VisibleName="Service Settings" url="/ui/acmeclient/#general-settings"/>
+          <Settings order="10" url="/ui/acmeclient">
+              <General url="/ui/acmeclient#general-settings"/>
           </Settings>
-          <Accounts VisibleName="Accounts" order="20" url="/ui/acmeclient/accounts/">
-          </Accounts>
-          <Validations VisibleName="Validation Methods" order="30" url="/ui/acmeclient/validations/">
-          </Validations>
-          <Actions VisibleName="Restart Actions" order="40" url="/ui/acmeclient/actions/">
-          </Actions>
-          <Certificates order="50" url="/ui/acmeclient/certificates/">
-          </Certificates>
-          <Log VisibleName="Log File" order="60" url="/diag_logs_acmeclient.php"/>
+          <Accounts VisibleName="Accounts" order="20" url="/ui/acmeclient/accounts"/>
+          <Validations VisibleName="Validation Methods" order="30" url="/ui/acmeclient/validations"/>
+          <Actions VisibleName="Restart Actions" order="40" url="/ui/acmeclient/actions"/>
+          <Certificates order="50" url="/ui/acmeclient/certificates"/>
+          <LogFile VisibleName="Log File" order="60" url="/diag_logs_acmeclient.php"/>
       </LEAcmeClient>
     </Services>
 </menu>
diff --git a/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Menu/Menu.xml b/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Menu/Menu.xml
index ffcf026f4..5ebeed1cb 100644
--- a/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Menu/Menu.xml
+++ b/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Menu/Menu.xml
@@ -1,8 +1,8 @@
 <menu>
     <VPN>
       <Tinc cssClass="fa fa-lock fa-fw" order="100">
-        <config VisibleName="Configuration" order="10" url="/ui/tinc/"/>
-        <log VisibleName="Log File" order="20" url="/diag_logs_tinc.php"/>
+        <Configuration order="10" url="/ui/tinc"/>
+        <LogFile VisibleName="Log File" order="20" url="/diag_logs_tinc.php"/>
       </Tinc>
     </VPN>
 </menu>
diff --git a/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Menu/Menu.xml b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Menu/Menu.xml
index 73cc0c316..5a79ef071 100644
--- a/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Menu/Menu.xml
+++ b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Menu/Menu.xml
@@ -1,7 +1,7 @@
 <menu>
   <Services>
     <Tor cssClass="fa fa-bolt fa-fw">
-      <Configuration url="/ui/tor/" />
+      <Configuration url="/ui/tor" />
       <Information url="/ui/tor/index/info" />
       <Diagnostics url="/ui/tor/index/diagnostics" />
     </Tor>
diff --git a/sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/Menu/Menu.xml b/sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/Menu/Menu.xml
index 841575d23..39a9defcd 100644
--- a/sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/Menu/Menu.xml
+++ b/sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/Menu/Menu.xml
@@ -1,8 +1,8 @@
 <menu>
    <Services>
-      <Monit VisibleName="Monit" cssClass="fa fa-heartbeat fa-fw">
-         <Settings url="/ui/monit/"/>
-         <Status url="/ui/monit/status/"/>
+      <Monit cssClass="fa fa-heartbeat fa-fw">
+         <Settings url="/ui/monit"/>
+         <Status url="/ui/monit/status"/>
       </Monit>
    </Services>
 </menu>
diff --git a/sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Menu/Menu.xml b/sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Menu/Menu.xml
index aa44febc2..1011f45de 100644
--- a/sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Menu/Menu.xml
+++ b/sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Menu/Menu.xml
@@ -1,5 +1,5 @@
 <menu>
   <Services>
-    <Nut cssClass="fa fa-battery-full fa-fw" url="/ui/nut/"/>
+    <Nut cssClass="fa fa-battery-full fa-fw" url="/ui/nut"/>
   </Services>
 </menu>
diff --git a/www/web-proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/Menu/Menu.xml b/www/web-proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/Menu/Menu.xml
index 94f4cd060..5cba07e34 100644
--- a/www/web-proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/Menu/Menu.xml
+++ b/www/web-proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/Menu/Menu.xml
@@ -1,7 +1,7 @@
 <menu>
     <Services>
         <WebProxy>
-            <ProxySSO VisibleName="Single Sign-On" order="26" url="/ui/proxysso/" />
+            <ProxySSO VisibleName="Single Sign-On" order="26" url="/ui/proxysso" />
         </WebProxy>
     </Services>
 </menu>
diff --git a/www/web-proxy-useracl/src/opnsense/mvc/app/models/OPNsense/ProxyUserACL/Menu/Menu.xml b/www/web-proxy-useracl/src/opnsense/mvc/app/models/OPNsense/ProxyUserACL/Menu/Menu.xml
index 2ece1d18d..395d8c503 100644
--- a/www/web-proxy-useracl/src/opnsense/mvc/app/models/OPNsense/ProxyUserACL/Menu/Menu.xml
+++ b/www/web-proxy-useracl/src/opnsense/mvc/app/models/OPNsense/ProxyUserACL/Menu/Menu.xml
@@ -1,7 +1,7 @@
 <menu>
-	<Services>
-		<WebProxy>
-			<ProxyUserACL VisibleName="Groups and Users" order="30" url="/ui/proxyuseracl/"/>
-		</WebProxy>
-	</Services>
+    <Services>
+        <WebProxy>
+            <ProxyUserACL VisibleName="Groups and Users" order="30" url="/ui/proxyuseracl"/>
+        </WebProxy>
+    </Services>
 </menu>