diff --git a/core/src/main/resources/lib/form/optionalBlock.jelly b/core/src/main/resources/lib/form/optionalBlock.jelly
index d3cd5bec93bd..45d037005494 100644
--- a/core/src/main/resources/lib/form/optionalBlock.jelly
+++ b/core/src/main/resources/lib/form/optionalBlock.jelly
@@ -66,7 +66,7 @@ THE SOFTWARE.
 
   <j:choose>
     <j:when test="${attrs.title!=null}">
-      <div class="optionalBlock-container jenkins-form-item">
+      <div class="optionalBlock-container jenkins-form-item jenkins-form-item--tight">
         <div class="help-sibling tr optional-block-start row-group-start ${attrs.inline?'':'row-set-start'}" hasHelp="${attrs.help!=null}"><!-- this ID marks the beginning -->
           <div class="jenkins-checkbox-help-wrapper">
             <f:checkbox name="${attrs.name}" class="optional-block-control block-control" onclick="javascript:updateOptionalBlock(this,true)"
@@ -87,7 +87,8 @@ THE SOFTWARE.
     </j:when>
 
     <j:otherwise>
-      <f:rowSet name="${attrs.name}">
+      hello
+      <f:rowSet name="${attrs.name}" class="jenkins-form-item--tight">
         <d:invokeBody />
       </f:rowSet>
     </j:otherwise>
diff --git a/core/src/main/resources/lib/form/rowSet.jelly b/core/src/main/resources/lib/form/rowSet.jelly
index c6823375030a..6558e243b75b 100644
--- a/core/src/main/resources/lib/form/rowSet.jelly
+++ b/core/src/main/resources/lib/form/rowSet.jelly
@@ -35,6 +35,9 @@ THE SOFTWARE.
     <st:attribute name="ref">
       id of the thing that serves as the group head, if that's available separately
     </st:attribute>
+    <st:attribute name="class">
+      Classes to apply to the row set
+    </st:attribute>
   </st:documentation>
 
   <j:choose>
@@ -43,9 +46,12 @@ THE SOFTWARE.
       <d:invokeBody />
     </j:when>
     <j:otherwise>
-      <div ref="${attrs.ref}" class="row-set-start row-group-start tr" style="display:none" name="${attrs.name}"></div>
-      <d:invokeBody />
-      <div class="row-set-end row-group-end tr"></div>
+      <p>asda</p>
+      <div class="jenkins-form-item ${class}">
+        <div ref="${attrs.ref}" class="row-set-start row-group-start tr" style="display:none" name="${attrs.name}"></div>
+        <d:invokeBody />
+        <div class="row-set-end row-group-end tr"></div>
+      </div>
     </j:otherwise>
   </j:choose>
 </j:jelly>
diff --git a/core/src/main/resources/lib/form/section_.js b/core/src/main/resources/lib/form/section_.js
index 3a9472aca8dd..ebdcc91f5d44 100644
--- a/core/src/main/resources/lib/form/section_.js
+++ b/core/src/main/resources/lib/form/section_.js
@@ -54,6 +54,9 @@ var section = (function (){
                     if (e.nodeType==1) {
                         if (e.className == "jenkins-section__title" && isVisible(e)) {
                             var child = new SectionNode(e);
+
+                            console.log(e.className)
+
                             parent.children.push(child);
                             // The next line seems to be unnecessary, as there are no children inside the section header itself.
                             // So this code will always returns a flat list of section headers.
diff --git a/war/src/main/js/config-scrollspy.less b/war/src/main/js/config-scrollspy.less
index ed1392baa7f0..52376d07e794 100644
--- a/war/src/main/js/config-scrollspy.less
+++ b/war/src/main/js/config-scrollspy.less
@@ -21,7 +21,7 @@
 .jenkins-config {
   // The Section header for the General section was manufactured,
   // so the default is to not display it.
-  .section-header-row.config_general .jenkins-section__header {
+  .section-header-row.config_general .jenkins-section__title {
     display: none;
   }
 
diff --git a/war/src/main/js/widgets/config/model/ConfigTableMetaData.js b/war/src/main/js/widgets/config/model/ConfigTableMetaData.js
index 1a5fd1762c5f..e1a5d3038158 100644
--- a/war/src/main/js/widgets/config/model/ConfigTableMetaData.js
+++ b/war/src/main/js/widgets/config/model/ConfigTableMetaData.js
@@ -60,7 +60,7 @@ function fromConfigTable(configTable) {
       } else {
         tr = 'div';
       }
-      var generalRow = $('<'+tr+' class="section-header-row insert first tr" title="General"><div class="jenkins-section__header"><a class="section-anchor">#</a>General</div></'+tr+'>');
+      var generalRow = $('<'+tr+' class="section-header-row insert first tr" title="General"><div class="jenkins-section__title"><a class="section-anchor">#</a>General</div></'+tr+'>');
       firstRow.before(generalRow);
       firstRow = configTableMetadata.getFirstRow();
       var newArray = $.makeArray(topRows);
diff --git a/war/src/main/js/widgets/config/tabbar.js b/war/src/main/js/widgets/config/tabbar.js
index 519853f338cf..9e76352d9cab 100644
--- a/war/src/main/js/widgets/config/tabbar.js
+++ b/war/src/main/js/widgets/config/tabbar.js
@@ -83,6 +83,7 @@ export var addTabs = function(configTable, options) {
     }
 
     var section;
+
     for (var i = 0; i < configTableMetadata.sections.length; i++) {
         section = configTableMetadata.sections[i];
         var tab = newTab(section);
diff --git a/war/src/main/less/modules/form.less b/war/src/main/less/modules/form.less
index 93808f67f2b5..f2556c485fe4 100644
--- a/war/src/main/less/modules/form.less
+++ b/war/src/main/less/modules/form.less
@@ -15,6 +15,10 @@
     clear: both;
   }
 
+  &--tight + .jenkins-form-item--tight {
+    background: red;
+  }
+
   &--small {
     max-width: var(--form-item-max-width--small);
   }
diff --git a/war/src/test/js/widgets/config/freestyle-config-scrollspy.html b/war/src/test/js/widgets/config/freestyle-config-scrollspy.html
index b517d179d64a..a194b021160b 100644
--- a/war/src/test/js/widgets/config/freestyle-config-scrollspy.html
+++ b/war/src/test/js/widgets/config/freestyle-config-scrollspy.html
@@ -40,7 +40,7 @@
 
             <tr>
                 <td colspan="4">
-                    <div class="jenkins-section__header"><a id="section0" class="section-anchor">#</a>Advanced Project Options</div>
+                    <div class="jenkins-section__title"><a id="section0" class="section-anchor">#</a>Advanced Project Options</div>
                 </td>
             </tr>
             <tr>
@@ -128,7 +128,7 @@
             <tr style="display:none" class="row-set-end radio-block-end row-group-end"></tr>
             <tr>
                 <td colspan="4">
-                    <div class="jenkins-section__header"><a id="section2" class="section-anchor">#</a>Build Triggers</div>
+                    <div class="jenkins-section__title"><a id="section2" class="section-anchor">#</a>Build Triggers</div>
                 </td>
             </tr>
             <tr class="optional-block-start row-group-start row-set-start" hashelp="true" ref="cb19">
@@ -140,7 +140,7 @@
             </tr>
             <tr>
                 <td colspan="4">
-                    <div class="jenkins-section__header"><a id="section3" class="section-anchor">#</a>Build</div>
+                    <div class="jenkins-section__title"><a id="section3" class="section-anchor">#</a>Build</div>
                 </td>
             </tr>
             <tr>
diff --git a/war/src/test/js/widgets/config/freestyle-config-scrollspy_bg.html b/war/src/test/js/widgets/config/freestyle-config-scrollspy_bg.html
index 8e65df1c0b2f..cdc0b53fc42a 100644
--- a/war/src/test/js/widgets/config/freestyle-config-scrollspy_bg.html
+++ b/war/src/test/js/widgets/config/freestyle-config-scrollspy_bg.html
@@ -40,7 +40,7 @@
 
             <tr>
                 <td colspan="4">
-                    <div class="jenkins-section__header"><a id="section0" class="section-anchor">#</a>oДопълнителни настройки на проекта</div>
+                    <div class="jenkins-section__title"><a id="section0" class="section-anchor">#</a>oДопълнителни настройки на проекта</div>
                 </td>
             </tr>
             <tr>
@@ -128,7 +128,7 @@
             <tr style="display:none" class="row-set-end radio-block-end row-group-end"></tr>
             <tr>
                 <td colspan="4">
-                    <div class="jenkins-section__header"><a id="section2" class="section-anchor">#</a>Автоматично изпълнявани действия при изграждане</div>
+                    <div class="jenkins-section__title"><a id="section2" class="section-anchor">#</a>Автоматично изпълнявани действия при изграждане</div>
                 </td>
             </tr>
             <tr class="optional-block-start row-group-start row-set-start" hashelp="true" ref="cb19">
@@ -140,7 +140,7 @@
             </tr>
             <tr>
                 <td colspan="4">
-                    <div class="jenkins-section__header"><a id="section3" class="section-anchor">#</a>Изграждане</div>
+                    <div class="jenkins-section__title"><a id="section3" class="section-anchor">#</a>Изграждане</div>
                 </td>
             </tr>
             <tr>
diff --git a/war/src/test/js/widgets/config/freestyle-config-tabbed.html b/war/src/test/js/widgets/config/freestyle-config-tabbed.html
index 3e9e84a566fa..de4f76d1aac4 100644
--- a/war/src/test/js/widgets/config/freestyle-config-tabbed.html
+++ b/war/src/test/js/widgets/config/freestyle-config-tabbed.html
@@ -35,7 +35,7 @@
 
         <div class="tr">
             <div colspan="4">
-                <div class="jenkins-section__header"><a id="section0" class="section-anchor">#</a>Advanced Project Options</div>
+                <div class="jenkins-section__title"><a id="section0" class="section-anchor">#</a>Advanced Project Options</div>
             </div>
         </div>
         <div class="tr">
@@ -123,7 +123,7 @@
         <div style="display:none" class="tr row-set-end radio-block-end row-group-end"></div>
         <div class="tr">
             <div colspan="4">
-                <div class="jenkins-section__header"><a id="section2" class="section-anchor">#</a>Build Triggers</div>
+                <div class="jenkins-section__title"><a id="section2" class="section-anchor">#</a>Build Triggers</div>
             </div>
         </div>
         <div class="tr optional-block-start row-group-start row-set-start" hashelp="true" ref="cb19">
@@ -135,7 +135,7 @@
         </div>
         <div class="tr">
             <div colspan="4">
-                <div class="jenkins-section__header"><a id="section3" class="section-anchor">#</a>Build</div>
+                <div class="jenkins-section__title"><a id="section3" class="section-anchor">#</a>Build</div>
             </div>
         </div>
         <div class="tr">
diff --git a/war/src/test/js/widgets/config/freestyle-config-tabbed_bg.html b/war/src/test/js/widgets/config/freestyle-config-tabbed_bg.html
index 2e731389fddd..e42471d144bf 100644
--- a/war/src/test/js/widgets/config/freestyle-config-tabbed_bg.html
+++ b/war/src/test/js/widgets/config/freestyle-config-tabbed_bg.html
@@ -35,7 +35,7 @@
 
         <tr>
             <td colspan="4">
-                <div class="jenkins-section__header"><a id="section0" class="section-anchor">#</a>Допълнителни настройки на проекта</div>
+                <div class="jenkins-section__title"><a id="section0" class="section-anchor">#</a>Допълнителни настройки на проекта</div>
             </td>
         </tr>
         <tr>
@@ -123,7 +123,7 @@
         <tr style="display:none" class="row-set-end radio-block-end row-group-end"></tr>
         <tr>
             <td colspan="4">
-                <div class="jenkins-section__header"><a id="section2" class="section-anchor">#</a>Автоматично изпълнявани действия при изграждане</div>
+                <div class="jenkins-section__title"><a id="section2" class="section-anchor">#</a>Автоматично изпълнявани действия при изграждане</div>
             </td>
         </tr>
         <tr class="optional-block-start row-group-start row-set-start" hashelp="true" ref="cb19">
@@ -135,7 +135,7 @@
         </tr>
         <tr>
             <td colspan="4">
-                <div class="jenkins-section__header"><a id="section3" class="section-anchor">#</a>Изграждане</div>
+                <div class="jenkins-section__title"><a id="section3" class="section-anchor">#</a>Изграждане</div>
             </td>
         </tr>
         <tr>