diff --git a/src/main/resources/hudson/plugins/throttleconcurrents/ThrottleJobProperty/config.jelly b/src/main/resources/hudson/plugins/throttleconcurrents/ThrottleJobProperty/config.jelly
index fb1a2f93..0bca6788 100644
--- a/src/main/resources/hudson/plugins/throttleconcurrents/ThrottleJobProperty/config.jelly
+++ b/src/main/resources/hudson/plugins/throttleconcurrents/ThrottleJobProperty/config.jelly
@@ -15,11 +15,11 @@
 
     <f:entry title="${%Maximum Total Concurrent Builds}"
              field="maxConcurrentTotal">
-      <f:textbox />
+      <f:number min="0"/>
     </f:entry>
     <f:entry title="${%Maximum Concurrent Builds Per Node}"
              field="maxConcurrentPerNode">
-      <f:textbox />
+      <f:number min="0"/>
     </f:entry>
   
   
@@ -34,11 +34,12 @@
 
     <j:if test="${!empty(descriptor.categories)}">
       <f:entry title="${%Multi-Project Throttle Category}">
-        <j:forEach var="cat" items="${descriptor.categories}">
-          <f:checkbox name="categories" json="${cat.categoryName}" title="${cat.categoryName}"
-                      checked="${instance.categories.contains(cat.categoryName)}" />
-          <st:nbsp/>
-        </j:forEach>
+        <div style="display: flex; gap: 1rem; flex-wrap: wrap;">
+          <j:forEach var="cat" items="${descriptor.categories}">
+            <f:checkbox name="categories" json="${cat.categoryName}" title="${cat.categoryName}"
+                        checked="${instance.categories.contains(cat.categoryName)}" />
+          </j:forEach>
+        </div>
       </f:entry>
     </j:if>
     <!--Specific options for Matrix projects-->
diff --git a/src/main/resources/hudson/plugins/throttleconcurrents/ThrottleJobProperty/global.jelly b/src/main/resources/hudson/plugins/throttleconcurrents/ThrottleJobProperty/global.jelly
index 8b8e5fdd..5dcafa0e 100644
--- a/src/main/resources/hudson/plugins/throttleconcurrents/ThrottleJobProperty/global.jelly
+++ b/src/main/resources/hudson/plugins/throttleconcurrents/ThrottleJobProperty/global.jelly
@@ -1,36 +1,28 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
-         xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:tc="/lib/throttleconcurrents">
+         xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:section title="Throttle Concurrent Builds">
     <f:entry title="Multi-Project Throttle Categories" field="categories">
       <f:repeatable field="categories" add="${%Add Category}" minimum="0">
-        <tc:blockWrapper>
-          <f:entry title="Category Name" field="categoryName">
-            <f:textbox />
-          </f:entry>
-          <f:entry title="${%Maximum Total Concurrent Builds}" field="maxConcurrentTotal">
+        <f:entry title="Category Name" field="categoryName">
+          <f:textbox clazz="required" checkMessage="${%Category Name is required}"/>
+        </f:entry>
+        <f:entry title="${%Maximum Total Concurrent Builds}" field="maxConcurrentTotal">
+          <f:number min="0"/>
+        </f:entry>
+        <f:entry title="${%Maximum Concurrent Builds Per Node}" field="maxConcurrentPerNode">
+          <f:number min="0"/>
+        </f:entry>
+        <f:repeatable field="nodeLabeledPairs" add="${%Add Maximum Per Labeled Node}" minimum="0" header="${%Maximum Per Labeled Node}">
+          <f:entry title="${%Throttled Node Label}" field="throttledNodeLabel">
             <f:textbox />
           </f:entry>
-          <f:entry title="${%Maximum Concurrent Builds Per Node}" field="maxConcurrentPerNode">
-            <f:textbox />
+          <f:entry title="${%Maximum Concurrent Builds Per Node Labeled As Above}" field="maxConcurrentPerNodeLabeled">
+            <f:number min="0"/>
           </f:entry>
-        </tc:blockWrapper>
-        <f:repeatable field="nodeLabeledPairs" add="${%Add Maximum Per Labeled Node}" minimum="0" header="${%Maximum Per Labeled Node}">
-          <tc:blockWrapper>
-            <f:entry title="${%Throttled Node Label}" field="throttledNodeLabel">
-              <f:textbox />
-            </f:entry>
-            <f:entry title="${%Maximum Concurrent Builds Per Node Labeled As Above}" field="maxConcurrentPerNodeLabeled">
-              <f:textbox />
-            </f:entry>
-          </tc:blockWrapper>
-          <div align="right">
-            <f:repeatableDeleteButton/>
-          </div>
-        </f:repeatable>
-        <div align="right">
           <f:repeatableDeleteButton/>
-        </div>
+        </f:repeatable>
+        <f:repeatableDeleteButton/>
       </f:repeatable>
     </f:entry>
   </f:section>
diff --git a/src/main/resources/hudson/plugins/throttleconcurrents/pipeline/ThrottleStep/config.jelly b/src/main/resources/hudson/plugins/throttleconcurrents/pipeline/ThrottleStep/config.jelly
index c452ea95..5a5871d7 100644
--- a/src/main/resources/hudson/plugins/throttleconcurrents/pipeline/ThrottleStep/config.jelly
+++ b/src/main/resources/hudson/plugins/throttleconcurrents/pipeline/ThrottleStep/config.jelly
@@ -4,11 +4,11 @@
     <j:choose>
         <j:when test="${!empty(descriptor.categories)}">
             <f:entry title="${%Categories}">
-                <j:forEach var="cat" items="${descriptor.categories}">
-                    <f:checkbox name="categories" json="${cat.categoryName}" checked="${instance.categories.contains(cat.categoryName)}" />
-                    <label class="attach-previous">${cat.categoryName}</label>
-                    <st:nbsp/>
-                </j:forEach>
+                <div style="display: flex; gap: 1rem; flex-wrap: wrap;">
+                    <j:forEach var="cat" items="${descriptor.categories}">
+                        <f:checkbox name="categories" json="${cat.categoryName}" checked="${instance.categories.contains(cat.categoryName)}" title="${cat.categoryName}" />
+                    </j:forEach>
+                </div>
             </f:entry>
         </j:when>
         <j:otherwise>
diff --git a/src/main/resources/lib/throttleconcurrents/blockWrapper.jelly b/src/main/resources/lib/throttleconcurrents/blockWrapper.jelly
deleted file mode 100644
index d43a2fe5..00000000
--- a/src/main/resources/lib/throttleconcurrents/blockWrapper.jelly
+++ /dev/null
@@ -1,16 +0,0 @@
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define">
-    <!-- TODO remove and switch to div after baseline is 2.264 or newer -->
-    <j:choose>
-        <j:when test="${divBasedFormLayout}">
-            <div>
-                <d:invokeBody/>
-            </div>
-        </j:when>
-        <j:otherwise>
-            <table style="width:100%">
-                <d:invokeBody/>
-            </table>
-        </j:otherwise>
-    </j:choose>
-</j:jelly>
diff --git a/src/main/resources/lib/throttleconcurrents/taglib b/src/main/resources/lib/throttleconcurrents/taglib
deleted file mode 100644
index e69de29b..00000000