diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index fe4c39c73..768b1ebb3 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -5431,5 +5431,3 @@ function get_ppp_uptime($port){
 		return $total_time;
 	}
 }
-
-
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index 0d0373611..479a69e7b 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -997,4 +997,3 @@ function calculate_ipv6_delegation_length($if) {
 	}
 	return($pdlen);
 }
-
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 e24dbc117..f9e872955 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -77,11 +77,11 @@
             <Interface url="/firewall_rules.php?if=*"/>
         </Rules>
         <Schedules url="/firewall_schedule.php">
-        	<SchedulesEdit  url="/firewall_schedule_edit.php*"/>
+		<SchedulesEdit  url="/firewall_schedule_edit.php*"/>
         </Schedules>
         <TrafficShaper url="/ui/trafficshaper/" VisibleName="Traffic Shaper"/>
         <VirtualIPs VisibleName="Virtual IPs" url="/firewall_virtual_ip.php">
-        	<VirtualIPEdit url="/firewall_virtual_ip_edit.php*"/>
+		<VirtualIPEdit url="/firewall_virtual_ip_edit.php*"/>
         </VirtualIPs>
     </Firewall>
 
@@ -97,7 +97,7 @@
         </CaptivePortal>
         <DHCPRelay VisibleName="DHCP Relay" url="/services_dhcp_relay.php"/>
         <DHCPServer VisibleName="DHCP Server" url="/services_dhcp.php">
-        	<DHCPServerEdit  url="/services_dhcp_edit.php?*"/>
+		<DHCPServerEdit  url="/services_dhcp_edit.php?*"/>
         </DHCPServer>
         <DHCPv6Relay VisibleName="DHCPv6 Relay" url="/services_dhcpv6_relay.php"/>
         <DHCPv6ServerRA VisibleName="DHCPv6 Server/RA" url="/services_dhcpv6.php">
@@ -108,7 +108,7 @@
         <DNSForwarder VisibleName="DNS Forwarder" url="/services_dnsmasq.php"/>
         <DNSResolver VisibleName="DNS Resolver" url="/services_unbound.php">
             <Advanced url="/services_unbound_advanced.php"/>
-            <ACLs url="/services_unbound_acls.php*"/>            
+            <ACLs url="/services_unbound_acls.php*"/>
         </DNSResolver>
         <DynamicDNS VisibleName="Dynamic DNS" url="/services_dyndns.php">
             <DynamicDNSRFC2136Clients url="/services_rfc2136.php"/>
@@ -116,7 +116,7 @@
             <DynamicDNSEdit url="/services_dyndns_edit.php"/>
         </DynamicDNS>
         <IGMPProxy VisibleName="IGMP Proxy" url="/services_igmpproxy.php">
-        	<IGMPProxyEdit url="/services_igmpproxy_edit.php"/>
+		<IGMPProxyEdit url="/services_igmpproxy_edit.php"/>
         </IGMPProxy>
         <LoadBalancer VisibleName="Load Balancer" url="/load_balancer_pool.php">
             <Edit url="/load_balancer_pool_edit.php"/>
@@ -126,20 +126,20 @@
             <Settings url="/load_balancer_setting.php"/>
         </LoadBalancer>
         <NTP VisibleName="Network Time Protocol" url="/services_ntpd.php">
-        	<GPS url="/services_ntpd_gps.php"/>
-        	<PPS url="/services_ntpd_pps.php"/>
+		<GPS url="/services_ntpd_gps.php"/>
+		<PPS url="/services_ntpd_pps.php"/>
         </NTP>
         <PPPoEServer VisibleName="PPPoE Server" url="/services_vpn_pppoe.php">
-        	<PPPoeServerEdit url="/vpn_pppoe_edit.php"/>
-        	<VPNPPPOE url="/vpn_pppoe.php"/>
+		<PPPoeServerEdit url="/vpn_pppoe_edit.php"/>
+		<VPNPPPOE url="/vpn_pppoe.php"/>
         </PPPoEServer>
         <Proxy VisibleName="Proxy Server" url="/ui/proxy/"/>
         <SNMP VisibleName="SNMP" url="/services_snmp.php"/>
         <UPnP VisibleName="Universal Plug and Play" url="/services_upnp.php">
-        	<UPnPEdit url="/services_upnp.php?*"/>
+		<UPnPEdit url="/services_upnp.php?*"/>
         </UPnP>
         <WoL VisibleName="Wake on LAN" url="/services_wol.php">
-        	<WoLEdit url="/services_wol_edit.php*"/>
+		<WoLEdit url="/services_wol_edit.php*"/>
         </WoL>
         <IDS VisibleName="Intrusion Detection" url="/ui/ids/"/>
     </Services>
@@ -172,14 +172,14 @@
 
     <Status order="6" cssClass="glyphicon glyphicon-tasks">
         <CaptivePortal VisibleName="Captive Portal" url="/status_captiveportal.php">
-        	<CaptivePortalDetails url="/status_captiveportal.php?*"/>
+		<CaptivePortalDetails url="/status_captiveportal.php?*"/>
         </CaptivePortal>
         <CARP url="/carp_status.php"/>
         <DHCPLeases VisibleName="DHCP IPv4 Leases" url="/status_dhcp_leases.php">
-        	<DHCPLeasesDetails  url="/status_dhcp_leases.php?*"/>
+		<DHCPLeasesDetails  url="/status_dhcp_leases.php?*"/>
         </DHCPLeases>
         <DHCPv6Leases VisibleName="DHCP IPv6 Leases" url="/status_dhcpv6_leases.php">
-        	<DHCPv6LeasesDetails url="/status_dhcpv6_leases.php?*"/>
+		<DHCPv6LeasesDetails url="/status_dhcpv6_leases.php?*"/>
         </DHCPv6Leases>
         <FilterReload VisibleName="Filter Reload" url="/status_filter_reload.php"/>
         <Gateways url="/status_gateways.php">
@@ -201,7 +201,7 @@
             <Settings url="/status_rrd_graph_settings.php"/>
         </RRDGraphs>
         <Services url="/status_services.php">
-        	<ServicesActions url="/status_services.php?*"/>
+		<ServicesActions url="/status_services.php?*"/>
         </Services>
         <SystemLogs VisibleName="System Logs" url="/diag_logs.php">
             <System url="/diag_logs.php">
@@ -227,7 +227,7 @@
         </SystemLogs>
 
         <TrafficGraphs VisibleName="Traffic Graphs" url="/status_graph.php">
-        	<TrafficGraphsDetails  url="/status_graph.php?*"/>
+		<TrafficGraphsDetails  url="/status_graph.php?*"/>
         </TrafficGraphs>
         <UPnP VisibleName="Universal Plug and Play" url="/status_upnp.php"/>
     </Status>
@@ -252,7 +252,7 @@
         <Routes url="/diag_routes.php"/>
         <SmartStatus VisibleName="SMART Status" url="/diag_smart.php"/>
         <Sockets url="/diag_sockets.php">
-        	<SocketsDetails url="/diag_sockets.php?*"/>
+		<SocketsDetails url="/diag_sockets.php?*"/>
         </Sockets>
         <States url="/diag_dump_states.php"/>
         <StatesSummary VisibleName="States Summary" url="/diag_states_summary.php"/>