diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
index 600c1cb13..2bad28b6d 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
@@ -47,16 +47,17 @@
         <help><![CDATA[Sets the source address which will be used when connecting to the server(s).]]></help>
         <advanced>true</advanced>
     </field>
-    <field>
-        <label>Health Checking</label>
-        <type>header</type>
-    </field>
     <field>
         <id>backend.healthCheckEnabled</id>
-        <label>Enabled</label>
+        <label>Enable Health Checking</label>
         <type>checkbox</type>
         <help><![CDATA[Enable or disable health checking.]]></help>
     </field>
+    <field>
+        <label>Health Checking</label>
+        <type>header</type>
+        <style>healthcheck_table table_healthcheck_true</style>
+    </field>
     <field>
         <id>backend.healthCheck</id>
         <label>Health check</label>
diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml
index e6ed0b2c8..e1647255a 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml
@@ -48,6 +48,7 @@
     <field>
         <label>SSL Offloading</label>
         <type>header</type>
+        <style>mode_table table_http table_ssl</style>
     </field>
     <field>
         <id>frontend.ssl_enabled</id>
@@ -134,8 +135,9 @@
         <advanced>true</advanced>
     </field>
     <field>
-        <label>Advanced settings</label>
+        <label>HTTP(S) settings</label>
         <type>header</type>
+        <style>mode_table table_http table_ssl</style>
     </field>
     <field>
         <id>frontend.forwardFor</id>
@@ -143,6 +145,10 @@
         <type>checkbox</type>
         <help><![CDATA[Enable insertion of the X-Forwarded-For header to requests sent to servers.]]></help>
     </field>
+    <field>
+        <label>Advanced settings</label>
+        <type>header</type>
+    </field>
     <field>
         <id>frontend.connectionBehaviour</id>
         <label>Type</label>
diff --git a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt
index 097dce52b..9bc0e11ea 100644
--- a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt
+++ b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt
@@ -170,6 +170,27 @@ POSSIBILITY OF SUCH DAMAGE.
             $("#action\\.type").change();
         })
 
+        // hook into on-show event for dialog to extend layout.
+        $('#DialogBackend').on('shown.bs.modal', function (e) {
+            $("#backend\\.healthCheckEnabled").change(function(){
+                var service_id = 'table_healthcheck_' + $(this).is(':checked');
+                console.log("[debug_B] " + service_id + " | " + "\n")
+                $(".healthcheck_table").hide();
+                $("."+service_id).show();
+            });
+            $("#backend\\.healthCheckEnabled").change();
+        })
+
+        // hook into on-show event for dialog to extend layout.
+        $('#DialogFrontend').on('shown.bs.modal', function (e) {
+            $("#frontend\\.mode").change(function(){
+                var service_id = 'table_' + $(this).val();
+                $(".mode_table").hide();
+                $("."+service_id).show();
+            });
+            $("#frontend\\.mode").change();
+        })
+
         // hook into on-show event for dialog to extend layout.
         $('#DialogHealthcheck').on('shown.bs.modal', function (e) {
             $("#healthcheck\\.type").change(function(){