diff --git a/pom.xml b/pom.xml
index db8a341..0bc2396 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.55</version>
+        <version>4.56</version>
         <relativePath/>
     </parent>
 
@@ -13,11 +13,11 @@
     <version>${changelist}</version>
     <name>View Job Filters</name>
     <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
-    <scm>
-        <connection>scm:git:git://github.com/${gitHubRepo}.git</connection>
-        <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
-        <url>https://github.com/${gitHubRepo}</url>
+    <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
+        <connection>scm:git:https://github.com/${gitHubRepo}</connection>
+        <developerConnection>scm:git:https://github.com/${gitHubRepo}</developerConnection>
         <tag>${scmTag}</tag>
+        <url>https://github.com/${gitHubRepo}</url>
     </scm>
     <licenses>
         <license>
@@ -40,9 +40,9 @@
                 <type>pom</type>
             </dependency>
             <dependency>
-                <groupId>org.jenkins-ci.main</groupId>
-                <artifactId>maven-plugin</artifactId>
-                <version>3.5</version>
+                <groupId>commons-net</groupId>
+                <artifactId>commons-net</artifactId>
+                <version>3.9.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -72,30 +72,14 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.jenkins-ci.plugins</groupId>
-            <artifactId>m2-extra-steps</artifactId>
-            <version>1.1.8</version>
+            <groupId>org.jenkins-ci.main</groupId>
+            <artifactId>maven-plugin</artifactId>
+            <version>3.21</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
-                    <groupId>org.apache.maven.wagon</groupId>
-                    <artifactId>wagon-ssh</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.maven.wagon</groupId>
-                    <artifactId>wagon-http</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-lang3</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.maven.wagon</groupId>
-                    <artifactId>wagon-webdav-jackrabbit</artifactId>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -187,7 +171,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-invoker-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <id>integration-test-install</id>
diff --git a/src/main/java/hudson/views/MavenExtraStepsValuesHelper.java b/src/main/java/hudson/views/MavenExtraStepsValuesHelper.java
deleted file mode 100644
index 531dcea..0000000
--- a/src/main/java/hudson/views/MavenExtraStepsValuesHelper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package hudson.views;
-
-import hudson.maven.MavenModuleSet;
-import hudson.model.TopLevelItem;
-import hudson.plugins.m2extrasteps.M2ExtraStepsWrapper;
-import hudson.tasks.BuildWrapper;
-import hudson.views.PluginHelperUtils.PluginHelperTestable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Looks for maven extra steps plugin.
- * 
- * @author jacob.robertson
- */
-public class MavenExtraStepsValuesHelper implements PluginHelperTestable {
-
-	public List<String> getValues(TopLevelItem item) {
-		List<String> values = new ArrayList<String>();
-		if (item instanceof MavenModuleSet) {
-			MavenModuleSet set = (MavenModuleSet) item;
-
-			for (BuildWrapper wrapper : set.getBuildWrappers()) {
-				if (wrapper instanceof M2ExtraStepsWrapper) {
-					M2ExtraStepsWrapper mwrap = (M2ExtraStepsWrapper) wrapper;
-					MavenValuesHelper.addValues(values, mwrap
-							.getPreBuildSteps());
-					MavenValuesHelper.addValues(values, mwrap
-							.getPostBuildSteps());
-				}
-			}
-		}
-		return values;
-	}
-	@SuppressWarnings("unchecked")
-	public Class getPluginTesterClass() {
-		return M2ExtraStepsWrapper.class;
-	}
-}
diff --git a/src/main/java/hudson/views/MavenValuesHelper.java b/src/main/java/hudson/views/MavenValuesHelper.java
index 825963a..8275431 100644
--- a/src/main/java/hudson/views/MavenValuesHelper.java
+++ b/src/main/java/hudson/views/MavenValuesHelper.java
@@ -15,7 +15,6 @@ public class MavenValuesHelper {
 	 * If I add any more helpers, switch to a better design first.
 	 */
 	public static final MavenProjectValuesHelper MODULESET_HELPER = buildMavenProjectValuesHelper();
-	public static final MavenExtraStepsValuesHelper EXTRASTEPS_HELPER = buildMavenExtraStepsValuesHelper();
 	public static final MatrixProjectBuildersHelper MATRIX_PROJECT_HELPER = buildMatrixProjectBuildersHelper();
 
 	@SuppressWarnings({ "unchecked" })
@@ -33,10 +32,6 @@ public static List<String> getValues(TopLevelItem item) {
 			List<String> more = MODULESET_HELPER.getValues(item);
 			values.addAll(more);
 		}
-		if (EXTRASTEPS_HELPER != null) {
-			List<String> more = EXTRASTEPS_HELPER.getValues(item);
-			values.addAll(more);
-		}
 		return values;
 	}
 
@@ -81,15 +76,6 @@ private static MavenProjectValuesHelper buildMavenProjectValuesHelper() {
 		}
 	}
 
-	private static MavenExtraStepsValuesHelper buildMavenExtraStepsValuesHelper() {
-		try {
-			return PluginHelperUtils.validateAndThrow(new MavenExtraStepsValuesHelper());
-		} catch (Throwable t) {
-			// necessary maven plugins not installed
-			return null;
-		}
-	}
-
 	private static MatrixProjectBuildersHelper buildMatrixProjectBuildersHelper() {
 		try {
 			return PluginHelperUtils.validateAndThrow(new MatrixProjectBuildersHelper());
diff --git a/src/main/resources/hudson/views/AbstractBuildTrendFilter/config.jelly b/src/main/resources/hudson/views/AbstractBuildTrendFilter/config.jelly
index d40467b..93d0857 100644
--- a/src/main/resources/hudson/views/AbstractBuildTrendFilter/config.jelly
+++ b/src/main/resources/hudson/views/AbstractBuildTrendFilter/config.jelly
@@ -3,14 +3,14 @@
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
   <f:entry title="${%How far back to check}:">
-    <st:nbsp />
-  	<input type="text" name="amount" value="${instance.amount}" size="10" maxlength="10" />
-  	<st:nbsp />
-    <select name="amountTypeString" class="amountType">
-      <f:option value="Hours" selected="${instance.amountTypeString == 'Hours'}">${%Hours}</f:option>
-      <f:option value="Days" selected="${instance.amountTypeString == 'Days'}">${%Days}</f:option>
-      <f:option value="Builds" selected="${instance.amountTypeString == 'Builds'}">${%Builds}</f:option>
-    </select>
+    <input class="jenkins-input jenkins-!-margin-bottom-1" type="text" name="amount" value="${instance.amount}" size="10" maxlength="10" />
+    <div class="jenkins-select">
+      <select name="amountTypeString" class="jenkins-select__input amountType">
+        <f:option value="Hours" selected="${instance.amountTypeString == 'Hours'}">${%Hours}</f:option>
+        <f:option value="Days" selected="${instance.amountTypeString == 'Days'}">${%Days}</f:option>
+        <f:option value="Builds" selected="${instance.amountTypeString == 'Builds'}">${%Builds}</f:option>
+      </select>
+    </div>
   </f:entry>
   <st:include page="config.jelly" class="hudson.views.AbstractIncludeExcludeJobFilter" optional="false"/>
 </j:jelly>
diff --git a/src/main/resources/hudson/views/AbstractIncludeExcludeJobFilter/config.jelly b/src/main/resources/hudson/views/AbstractIncludeExcludeJobFilter/config.jelly
index a915854..f737b62 100644
--- a/src/main/resources/hudson/views/AbstractIncludeExcludeJobFilter/config.jelly
+++ b/src/main/resources/hudson/views/AbstractIncludeExcludeJobFilter/config.jelly
@@ -3,11 +3,13 @@
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
   <f:entry title="${%Match Type}:">
-    <select name="includeExcludeTypeString" class="setting-input">
-      <f:option value="includeMatched" selected="${instance.includeMatched}">${%Include Matched - Add jobs that match this filter}</f:option>
-      <f:option value="includeUnmatched" selected="${instance.includeUnmatched}">${%Include Unmatched - Add jobs that don't match this filter}</f:option>
-      <f:option value="excludeMatched" selected="${instance.excludeMatched}">${%Exclude Matched - Filter out jobs that match this filter}</f:option>
-      <f:option value="excludeUnmatched" selected="${instance.excludeUnmatched}">${%Exclude Unmatched - Filter out jobs that don't match this filter}</f:option>
-    </select>
+    <div class="jenkins-select">
+      <select name="includeExcludeTypeString" class="jenkins-select__input">
+        <f:option value="includeMatched" selected="${instance.includeMatched}">${%Include Matched - Add jobs that match this filter}</f:option>
+        <f:option value="includeUnmatched" selected="${instance.includeUnmatched}">${%Include Unmatched - Add jobs that don't match this filter}</f:option>
+        <f:option value="excludeMatched" selected="${instance.excludeMatched}">${%Exclude Matched - Filter out jobs that match this filter}</f:option>
+        <f:option value="excludeUnmatched" selected="${instance.excludeUnmatched}">${%Exclude Unmatched - Filter out jobs that don't match this filter}</f:option>
+      </select>
+    </div>
   </f:entry>
 </j:jelly>
\ No newline at end of file
diff --git a/src/main/resources/hudson/views/BuildStatusFilter/config.jelly b/src/main/resources/hudson/views/BuildStatusFilter/config.jelly
index 7e59404..42839a1 100644
--- a/src/main/resources/hudson/views/BuildStatusFilter/config.jelly
+++ b/src/main/resources/hudson/views/BuildStatusFilter/config.jelly
@@ -3,9 +3,15 @@
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
   <f:entry title="${%Build Statuses}:">
-    <f:checkbox name="building" field="building"/> ${%Currently Building}
-    <f:checkbox name="neverBuilt" field="neverBuilt"/> ${%Never Built}
-    <f:checkbox name="inBuildQueue" field="inBuildQueue"/> ${%In Build Queue}
+    <div>
+      <f:checkbox title="${%Currently Building}" field="building"/>
+    </div>
+    <div>
+      <f:checkbox title="${%Never Built}" name="neverBuilt" field="neverBuilt"/>
+    </div>
+    <div>
+      <f:checkbox title="${%In Build Queue}" field="inBuildQueue"/>
+    </div>
   </f:entry>
   <st:include page="config.jelly" class="hudson.views.AbstractIncludeExcludeJobFilter" optional="false"/>
 </j:jelly>
\ No newline at end of file
diff --git a/src/main/resources/hudson/views/JobStatusFilter/config.jelly b/src/main/resources/hudson/views/JobStatusFilter/config.jelly
index 24e6cec..c666912 100644
--- a/src/main/resources/hudson/views/JobStatusFilter/config.jelly
+++ b/src/main/resources/hudson/views/JobStatusFilter/config.jelly
@@ -3,11 +3,21 @@
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
   <f:entry title="${%Job Statuses}:">
-    <f:checkbox name="stable" field="stable"/> ${%Stable}
-    <f:checkbox name="failed" field="failed"/> ${%Failed}
-    <f:checkbox name="unstable" field="unstable"/> ${%Unstable}
-    <f:checkbox name="aborted" field="aborted"/> ${%Aborted}
-    <f:checkbox name="disabled" field="disabled"/> ${%Disabled}
+    <div>
+      <f:checkbox title="${%Stable}" field="stable"/>
+    </div>
+    <div>
+      <f:checkbox title="${%Failed}" field="failed"/>
+    </div>
+    <div>
+      <f:checkbox title="${%Unstable}" field="unstable"/>
+    </div>
+    <div>
+      <f:checkbox title="${%Aborted}" field="aborted"/>
+    </div>
+    <div>
+      <f:checkbox title="${%Disabled}" field="disabled"/>
+    </div>
   </f:entry>
   <st:include page="config.jelly" class="hudson.views.AbstractIncludeExcludeJobFilter" optional="false"/>
 </j:jelly>
\ No newline at end of file
diff --git a/src/main/resources/hudson/views/MostRecentJobsFilter/config.jelly b/src/main/resources/hudson/views/MostRecentJobsFilter/config.jelly
index 34b50b3..8c1e057 100644
--- a/src/main/resources/hudson/views/MostRecentJobsFilter/config.jelly
+++ b/src/main/resources/hudson/views/MostRecentJobsFilter/config.jelly
@@ -5,7 +5,7 @@
   <f:entry title="${%Number of jobs to include}:">
       <f:textbox name="maxToInclude" field="maxToInclude" />
   </f:entry>
-  <f:entry title="${%Use job start time instead of completion time}:">
+  <f:entry title="${%Use job start time instead of completion time}">
       <f:checkbox name="checkStartTime" field="checkStartTime"/>
   </f:entry>
 </j:jelly>
\ No newline at end of file
diff --git a/src/main/resources/hudson/views/ParameterFilter/config.jelly b/src/main/resources/hudson/views/ParameterFilter/config.jelly
index 6b7e2b1..94d55fe 100644
--- a/src/main/resources/hudson/views/ParameterFilter/config.jelly
+++ b/src/main/resources/hudson/views/ParameterFilter/config.jelly
@@ -9,15 +9,16 @@
       <f:textbox name="valueRegex" field="valueRegex" />
   </f:entry>
   <f:entry help="/plugin/view-job-filters/parameter-default-help.html">
-      <f:checkbox name="useDefaultValue" field="useDefaultValue"/> ${%Match the configured default values instead of the actual value from last successful build}
+      <f:checkbox title="${%Match the configured default values instead of the actual value from last successful build}" field="useDefaultValue"/>
   </f:entry>
   <f:entry>
-      <f:checkbox name="matchAllBuilds" field="matchAllBuilds"/> ${%Match against this many previous builds} (${%blank or 0 for all}):
-      <st:nbsp />
-      <input type="text" name="maxBuildsToMatch" value="${instance.maxBuildsToMatch}" size="10" maxlength="10" />
+      <f:checkbox title="${%Match against this many previous builds} (${%blank or 0 for all})" field="matchAllBuilds"/>
+    <div>
+      <input class="jenkins-input" name="maxBuildsToMatch" value="${instance.maxBuildsToMatch}" size="10" maxlength="10" />
+    </div>
   </f:entry>
   <f:entry>
-      <f:checkbox name="matchBuildsInProgress" field="matchBuildsInProgress"/> ${%Match against builds in progress}
+      <f:checkbox title="${%Match against builds in progress}" field="matchBuildsInProgress"/>
   </f:entry>
   <f:entry title="${%Description}:">
       <f:textbox name="descriptionRegex" field="descriptionRegex" />
diff --git a/src/main/resources/hudson/views/RegExJobFilter/config.jelly b/src/main/resources/hudson/views/RegExJobFilter/config.jelly
index 2e149b0..0a0c723 100644
--- a/src/main/resources/hudson/views/RegExJobFilter/config.jelly
+++ b/src/main/resources/hudson/views/RegExJobFilter/config.jelly
@@ -7,21 +7,31 @@
   </f:entry>
   <f:entry title="${%Match Value}:">
     <div class="valueType">
-      <select name="valueTypeString" class="setting-input" onchange="this.parentElement.querySelector('.nameOptions').style.display = ((this.options[this.selectedIndex].value.match(/NAME/)) ? 'block' : 'none')">
-        <f:option value="NAME" selected="${instance.valueTypeString == 'NAME'}">${%Job name}</f:option>
-        <f:option value="FOLDER_NAME" selected="${instance.valueTypeString == 'FOLDER_NAME'}">${%Job folder name}</f:option>
-        <f:option value="DESCRIPTION" selected="${instance.valueTypeString == 'DESCRIPTION'}">${%Job description}</f:option>
-        <f:option value="SCM" selected="${instance.valueTypeString == 'SCM'}">${%Job SCM configuration}</f:option>
-        <f:option value="EMAIL" selected="${instance.valueTypeString == 'EMAIL'}">${%Email recipients}</f:option>
-        <f:option value="MAVEN" selected="${instance.valueTypeString == 'MAVEN'}">${%Maven configuration}</f:option>
-        <f:option value="SCHEDULE" selected="${instance.valueTypeString == 'SCHEDULE'}">${%Job schedule}</f:option>
-        <f:option value="NODE" selected="${instance.valueTypeString == 'NODE'}">${%Node label expression}</f:option>
-      </select>
+      <div class="jenkins-select jenkins-!-margin-bottom-2">
+        <select name="valueTypeString" class="jenkins-select__input" onchange="this.parentElement.querySelector('.nameOptions').style.display = ((this.options[this.selectedIndex].value.match(/NAME/)) ? 'block' : 'none')">
+          <f:option value="NAME" selected="${instance.valueTypeString == 'NAME'}">${%Job name}</f:option>
+          <f:option value="FOLDER_NAME" selected="${instance.valueTypeString == 'FOLDER_NAME'}">${%Job folder name}</f:option>
+          <f:option value="DESCRIPTION" selected="${instance.valueTypeString == 'DESCRIPTION'}">${%Job description}</f:option>
+          <f:option value="SCM" selected="${instance.valueTypeString == 'SCM'}">${%Job SCM configuration}</f:option>
+          <f:option value="EMAIL" selected="${instance.valueTypeString == 'EMAIL'}">${%Email recipients}</f:option>
+          <f:option value="MAVEN" selected="${instance.valueTypeString == 'MAVEN'}">${%Maven configuration}</f:option>
+          <f:option value="SCHEDULE" selected="${instance.valueTypeString == 'SCHEDULE'}">${%Job schedule}</f:option>
+          <f:option value="NODE" selected="${instance.valueTypeString == 'NODE'}">${%Node label expression}</f:option>
+        </select>
+      </div>
       <div class="nameOptions" style="display: ${(empty instance.valueTypeString || instance.valueTypeString.contains('NAME')) ? 'block' : 'none'}">
-        <f:checkbox name="matchName" field="matchName" default="true" /> ${%Name}
-        <f:checkbox name="matchFullName" field="matchFullName" default="false" /> ${%Full name}
-        <f:checkbox name="matchDisplayName" field="matchDisplayName" default="false" /> ${%Display name}
-        <f:checkbox name="matchFullDisplayName" field="matchFullDisplayName" default="false" /> ${%Full display name}
+        <div>
+          <f:checkbox title="${%Name}" field="matchName" default="true"/>
+        </div>
+        <div>
+          <f:checkbox title="${%Full name}" field="matchFullName" default="false"/>
+        </div>
+        <div>
+          <f:checkbox title="${%Display name}" field="matchDisplayName" default="false"/>
+        </div>
+        <div>
+          <f:checkbox title="${%Full display name}" field="matchFullDisplayName" default="false"/>
+        </div>
       </div>
     </div>
   </f:entry>
diff --git a/src/main/resources/hudson/views/SecurityFilter/config.jelly b/src/main/resources/hudson/views/SecurityFilter/config.jelly
index e85b55c..6534853 100644
--- a/src/main/resources/hudson/views/SecurityFilter/config.jelly
+++ b/src/main/resources/hudson/views/SecurityFilter/config.jelly
@@ -3,14 +3,21 @@
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
   <f:entry title="${%Permissions}">
-  	<select name="permissionCheckType">
-      <f:option value="MustMatchAll" selected="${instance.permissionCheckType == 'MustMatchAll'}">${%Must Match All - Match jobs for which the current user has all of these permissions}</f:option>
-      <f:option value="AtLeastOne" selected="${instance.permissionCheckType == 'AtLeastOne'}">${%Match At Least One - Match jobs for which current user has at least one of these permissions}</f:option>
-    </select>
-    <br/>
-    <f:checkbox name="configure" field="configure"/> ${%Configure} <br/>
-    <f:checkbox name="build" field="build"/> ${%Build} <br/>
-    <f:checkbox name="workspace" field="workspace"/> ${%Workspace}
+    <div class="jenkins-select jenkins-!-margin-bottom-2">
+      <select class="jenkins-select__input" name="permissionCheckType">
+        <f:option value="MustMatchAll" selected="${instance.permissionCheckType == 'MustMatchAll'}">${%Must Match All - Match jobs for which the current user has all of these permissions}</f:option>
+        <f:option value="AtLeastOne" selected="${instance.permissionCheckType == 'AtLeastOne'}">${%Match At Least One - Match jobs for which current user has at least one of these permissions}</f:option>
+      </select>
+    </div>
+    <div>
+      <f:checkbox title="${%Configure}" field="configure"/>
+    </div>
+    <div>
+      <f:checkbox title="${%Build}" field="build"/>
+    </div>
+    <div>
+      <f:checkbox title="${%Workspace}" field="workspace"/>
+    </div>
   </f:entry>
   <st:include page="config.jelly" class="hudson.views.AbstractIncludeExcludeJobFilter" optional="false"/>
 </j:jelly>
\ No newline at end of file
diff --git a/src/main/resources/hudson/views/UpstreamDownstreamJobsFilter/config.jelly b/src/main/resources/hudson/views/UpstreamDownstreamJobsFilter/config.jelly
index ffd0632..512374e 100644
--- a/src/main/resources/hudson/views/UpstreamDownstreamJobsFilter/config.jelly
+++ b/src/main/resources/hudson/views/UpstreamDownstreamJobsFilter/config.jelly
@@ -4,10 +4,18 @@
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
 	
 	<f:entry>
-		<f:checkbox name="includeDownstream" field="includeDownstream" /> ${%Include downstream jobs} <br/>
-		<f:checkbox name="includeUpstream" field="includeUpstream" /> ${%Include upstream jobs} <br/>
-		<f:checkbox name="recursive" field="recursive" /> ${%Include upstream/downstream jobs recursively} <br/>
-		<f:checkbox name="excludeOriginals" field="excludeOriginals" /> ${%Do not show source jobs}
+		<div>
+			<f:checkbox title="${%Include downstream jobs}" field="includeDownstream"/>
+		</div>
+		<div>
+			<f:checkbox title="${%Include upstream jobs}" field="includeUpstream"/>
+		</div>
+		<div>
+			<f:checkbox title="${%Include upstream/downstream jobs recursively}" field="recursive"/>
+		</div>
+		<div>
+			<f:checkbox title="${%Do not show source jobs}" field="excludeOriginals"/>
+		</div>
 	</f:entry>
 	
 </j:jelly>
\ No newline at end of file
diff --git a/src/main/resources/hudson/views/UserRelevanceFilter/config.jelly b/src/main/resources/hudson/views/UserRelevanceFilter/config.jelly
index f323d99..907eeff 100644
--- a/src/main/resources/hudson/views/UserRelevanceFilter/config.jelly
+++ b/src/main/resources/hudson/views/UserRelevanceFilter/config.jelly
@@ -4,46 +4,66 @@
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
   <f:entry title="${%Search name}:">
     <div>
-    <f:checkbox name="matchUserId" field="matchUserId" default="true" /> ${"%Search for current user's id"}<br/>
-    <f:checkbox name="matchUserFullName" field="matchUserFullName" default="true" /> ${"%Search for current user's full name"} <br/>
+      <div>
+        <f:checkbox title="${%Search for current user's id}" field="matchUserId" default="true"/>
+      </div>
+      <div>
+        <f:checkbox title="${%Search for current user's full name}" field="matchUserFullName" default="true"/>
+      </div>
     </div>
-    <div style="margin-top:10px">
-    <f:checkbox name="ignoreCase" field="ignoreCase" default="true" /> ${%Ignore case} <br/>
-    <f:checkbox name="ignoreWhitespace" field="ignoreWhitespace" default="true" /> ${%Ignore whitespace} <br/>
-    <f:checkbox name="ignoreNonAlphaNumeric" field="ignoreNonAlphaNumeric" default="true" /> ${%Ignore non-alphanumeric} <br/>
+    <div class="jenkins-!-margin-top-2">
+      <div>
+        <f:checkbox title="${%Ignore case}" field="ignoreCase" default="true"/>
+      </div>
+      <div>
+        <f:checkbox title="${%Ignore whitespace}" field="ignoreWhitespace" default="true"/>
+      </div>
+      <div>
+        <f:checkbox title="${%Ignore non-alphanumeric}" field="ignoreNonAlphaNumeric" default="true"/>
+      </div>
     </div>
   </f:entry>
   <f:entry title="${%Match jobs}:">
-    <f:checkbox name="matchEmail" field="matchEmail" default="true" /> ${%Match jobs where user is email recipient} <br/>
-    <f:checkbox name="matchBuilder" field="matchBuilder" default="true" onclick="showOrHideBuildOptions(this)"/> ${%Match jobs with builds "started by" user} <br/>
-    <f:checkbox name="matchScmChanges" field="matchScmChanges" default="true" onclick="showOrHideBuildOptions(this)"/> ${%Match jobs with builds where user is source code committer}<br/>
+    <div>
+      <f:checkbox title="${%Match jobs where user is email recipient}" field="matchEmail" default="true"/>
+    </div>
+    <div>
+      <f:checkbox title="${%Match jobs with builds 'started by' user}" name="matchBuilder" field="matchBuilder" default="true"
+                  onclick="showOrHideBuildOptions(this)"/>
+    </div>
+    <div>
+      <f:checkbox title="${%Match jobs with builds where user is source code committer}" name="matchScmChanges" field="matchScmChanges"
+                  default="true" onclick="showOrHideBuildOptions(this)"/>
+    </div>
     <div class="showOrHideBuildOptions">
     <script>
       function showOrHideBuildOptions(elem) {
-        var tr1 = elem.parentElement.parentElement;
-        var matchBuilder = tr1.querySelector('[name="matchBuilder"]');
-        var matchScmChanges = tr1.querySelector('[name="matchScmChanges"]');
+        var jobFilter = elem.closest('[name="jobFilters"]');
+        var matchBuilder = jobFilter.querySelector('[name="matchBuilder"]');
+        var matchScmChanges = jobFilter.querySelector('[name="matchScmChanges"]');
 
-        var tr2 = tr1.parentElement.querySelector('[name="buildCountTypeString"]').parentElement.parentElement;
-        var tr3 = tr1.parentElement.querySelector('[name="amountTypeString"]').parentElement.parentElement;
+        var tr2 = jobFilter.querySelector('[name="buildCountTypeString"]').parentElement.parentElement.parentElement;
+        var tr3 = jobFilter.querySelector('[name="amountTypeString"]').parentElement.parentElement.parentElement;
 
         if (matchBuilder.checked || matchScmChanges.checked) {
-          tr2.style.display = 'table-row';
-          tr3.style.display = 'table-row';
+          tr2.classList.remove('jenkins-hidden');
+          tr3.classList.remove('jenkins-hidden');
         } else {
-          tr2.style.display = 'none';
-          tr3.style.display = 'none';
+          tr2.classList.add('jenkins-hidden');
+          tr3.classList.add('jenkins-hidden');
         }
       }
     </script>
     </div>
   </f:entry>
   <f:entry title="${%Build trend type}:">
-    <select name="buildCountTypeString" class="buildCountType ">
-      <f:option value="Latest" selected="${instance.buildCountTypeString == 'Latest'}">${%Require latest build to match}</f:option>
-      <f:option value="AtLeastOne" selected="${instance.buildCountTypeString == 'AtLeastOne'}">${%Require at least one build to match}</f:option>
-      <f:option value="All" selected="${instance.buildCountTypeString == 'All'}">${%Require all builds to match}</f:option>
-    </select>
+    <div class="jenkins-select">
+      <select name="buildCountTypeString" class="jenkins-select__input buildCountType">
+        <f:option value="Latest" selected="${instance.buildCountTypeString == 'Latest'}">${%Require latest build to match}</f:option>
+        <f:option value="AtLeastOne" selected="${instance.buildCountTypeString == 'AtLeastOne'}">${%Require at least one build to match}</f:option>
+        <f:option value="All" selected="${instance.buildCountTypeString == 'All'}">${%Require all builds to match}</f:option>
+      </select>
+    </div>
   </f:entry>
   <st:include page="config.jelly" class="hudson.views.AbstractBuildTrendFilter" optional="false"/>
   <script>
diff --git a/src/test/it/git-1.1.11/pom.xml b/src/test/it/git-1.1.11/pom.xml
index 35ec4c3..d5bbff7 100644
--- a/src/test/it/git-1.1.11/pom.xml
+++ b/src/test/it/git-1.1.11/pom.xml
@@ -28,14 +28,14 @@
 	<repositories>
 		<repository>
 			<id>repo.jenkins-ci.org</id>
-			<url>http://repo.jenkins-ci.org/public/</url>
+			<url>https://repo.jenkins-ci.org/public/</url>
 		</repository>
 	</repositories>
 
 	<pluginRepositories>
 		<pluginRepository>
 			<id>repo.jenkins-ci.org</id>
-			<url>http://repo.jenkins-ci.org/public/</url>
+			<url>https://repo.jenkins-ci.org/public/</url>
 		</pluginRepository>
 	</pluginRepositories>
 
diff --git a/src/test/it/git-none/pom.xml b/src/test/it/git-none/pom.xml
index 1a2165c..a24bb1e 100644
--- a/src/test/it/git-none/pom.xml
+++ b/src/test/it/git-none/pom.xml
@@ -23,14 +23,14 @@
 	<repositories>
 		<repository>
 			<id>repo.jenkins-ci.org</id>
-			<url>http://repo.jenkins-ci.org/public/</url>
+			<url>https://repo.jenkins-ci.org/public/</url>
 		</repository>
 	</repositories>
 
 	<pluginRepositories>
 		<pluginRepository>
 			<id>repo.jenkins-ci.org</id>
-			<url>http://repo.jenkins-ci.org/public/</url>
+			<url>https://repo.jenkins-ci.org/public/</url>
 		</pluginRepository>
 	</pluginRepositories>
 
diff --git a/src/test/it/maven-ext/pom.xml b/src/test/it/maven-ext/pom.xml
deleted file mode 100644
index 5cf871f..0000000
--- a/src/test/it/maven-ext/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.jenkins-ci.plugins</groupId>
-		<artifactId>view-job-filters-it</artifactId>
-		<version>1.23-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>view-job-filters-it-maven-ext</artifactId>
-	<version>1.23-SNAPSHOT</version>
-	
-	<dependencies>
-		<dependency>
-			<groupId>org.jenkins-ci.plugins</groupId>
-			<artifactId>view-job-filters</artifactId>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../../../../target/view-job-filters.jar</systemPath>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jvnet.hudson.plugins</groupId>
-			<artifactId>m2-extra-steps</artifactId>
-			<version>1.1.3</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-	
-	<repositories>
-		<repository>
-			<id>repo.jenkins-ci.org</id>
-			<url>http://repo.jenkins-ci.org/public/</url>
-		</repository>
-	</repositories>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>repo.jenkins-ci.org</id>
-			<url>http://repo.jenkins-ci.org/public/</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-</project>
diff --git a/src/test/it/maven-ext/src/test/java/hudson/views/MavenTest.java b/src/test/it/maven-ext/src/test/java/hudson/views/MavenTest.java
deleted file mode 100644
index 035c05f..0000000
--- a/src/test/it/maven-ext/src/test/java/hudson/views/MavenTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package hudson.views;
-
-import java.util.List;
-
-import hudson.views.MavenExtraStepsValuesHelper;
-import hudson.views.MavenValuesHelper;
-import hudson.views.ScmFilterHelper;
-import hudson.views.ScmValuesProvider;
-import junit.framework.TestCase;
-import org.junit.Test;
-
-import static junit.framework.TestCase.*;
-
-public class MavenTest {
-
-	@Test
-	public void testMavenExtMatcher() {
-		assertTrue(MavenValuesHelper.EXTRASTEPS_HELPER != null);
-	}
-}
diff --git a/src/test/it/maven-none/pom.xml b/src/test/it/maven-none/pom.xml
deleted file mode 100644
index c00ddcf..0000000
--- a/src/test/it/maven-none/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.jenkins-ci.plugins</groupId>
-		<artifactId>view-job-filters-it</artifactId>
-		<version>1.23-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>view-job-filters-it-maven-none</artifactId>
-	<version>1.23-SNAPSHOT</version>
-	
-	<dependencies>
-		<dependency>
-			<groupId>org.jenkins-ci.plugins</groupId>
-			<artifactId>view-job-filters</artifactId>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../../../../target/view-job-filters.jar</systemPath>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-	
-	<repositories>
-		<repository>
-			<id>repo.jenkins-ci.org</id>
-			<url>http://repo.jenkins-ci.org/public/</url>
-		</repository>
-	</repositories>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>repo.jenkins-ci.org</id>
-			<url>http://repo.jenkins-ci.org/public/</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-</project>
diff --git a/src/test/it/maven-none/src/test/java/hudson/views/MavenTest.java b/src/test/it/maven-none/src/test/java/hudson/views/MavenTest.java
deleted file mode 100644
index efb91b6..0000000
--- a/src/test/it/maven-none/src/test/java/hudson/views/MavenTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package hudson.views;
-
-import java.util.List;
-
-import hudson.views.MavenExtraStepsValuesHelper;
-import hudson.views.MavenValuesHelper;
-import hudson.views.ScmFilterHelper;
-import hudson.views.ScmValuesProvider;
-import junit.framework.TestCase;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class MavenTest {
-
-	@Test
-	public void testNoMavenExtMatchers() {
-		assertNull(MavenValuesHelper.EXTRASTEPS_HELPER);
-	}
-}
diff --git a/src/test/it/pom.xml b/src/test/it/pom.xml
index 7b7cdaa..502f389 100644
--- a/src/test/it/pom.xml
+++ b/src/test/it/pom.xml
@@ -4,16 +4,13 @@
 	<parent>
 		<groupId>org.jenkins-ci.plugins</groupId>
 		<artifactId>plugin</artifactId>
-		<version>2.29</version>
+		<version>4.56</version>
 	</parent>
 
 	<artifactId>view-job-filters-it</artifactId>
 	<version>1.23-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-        <properties>
-            <java.level>8</java.level>
-        </properties>
 	
 	<modules>
 		<module>git-none</module>
@@ -26,14 +23,14 @@
 	<repositories>
 		<repository>
 			<id>repo.jenkins-ci.org</id>
-			<url>http://repo.jenkins-ci.org/public/</url>
+			<url>https://repo.jenkins-ci.org/public/</url>
 		</repository>
 	</repositories>
 
 	<pluginRepositories>
 		<pluginRepository>
 			<id>repo.jenkins-ci.org</id>
-			<url>http://repo.jenkins-ci.org/public/</url>
+			<url>https://repo.jenkins-ci.org/public/</url>
 		</pluginRepository>
 	</pluginRepositories>
 
diff --git a/src/test/java/hudson/views/PluginHelperUtilsTest.java b/src/test/java/hudson/views/PluginHelperUtilsTest.java
index 9794722..374b8a5 100644
--- a/src/test/java/hudson/views/PluginHelperUtilsTest.java
+++ b/src/test/java/hudson/views/PluginHelperUtilsTest.java
@@ -17,7 +17,6 @@ public void testHelpers() {
         PluginHelperUtils.validateAndThrow(new CvsValuesProvider());
         PluginHelperUtils.validateAndThrow(new EmailExtValuesProvider());
         PluginHelperUtils.validateAndThrow(new GitValuesProvider());
-        PluginHelperUtils.validateAndThrow(new MavenExtraStepsValuesHelper());
         PluginHelperUtils.validateAndThrow(new MavenProjectValuesHelper());
         PluginHelperUtils.validateAndThrow(new SvnValuesProvider());
     }
diff --git a/src/test/java/hudson/views/RegExJobFilterTest.java b/src/test/java/hudson/views/RegExJobFilterTest.java
index e1ade9c..edb2ee0 100644
--- a/src/test/java/hudson/views/RegExJobFilterTest.java
+++ b/src/test/java/hudson/views/RegExJobFilterTest.java
@@ -8,7 +8,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import hudson.views.test.JobMocker;
 import hudson.views.test.JobType;
 import jenkins.model.Jenkins;
 import org.junit.Test;
@@ -301,44 +300,6 @@ public void testMaven() {
 			assertFalse(mavenRegex("bar").matches(jobOfType(type).mavenBuilder("", "", "", "Foobar").asItem()));
 			assertTrue(mavenRegex(".*bar").matches(jobOfType(type).mavenBuilder("", "", "", "Foobar").asItem()));
 		}
-
-		for (JobType<? extends Job> type: availableJobTypes(MAVEN_MODULE_SET)) {
-			for (JobMocker.MavenBuildStep step : JobMocker.MavenBuildStep.values()) {
-				assertTrue(mavenRegex(".*").matches(jobOfType(type).mavenBuildStep(step, "", "", "", "").asItem()));
-				assertTrue(mavenRegex("Foo").matches(jobOfType(type).mavenBuildStep(step, "Foo", "", "", "").asItem()));
-				assertFalse(mavenRegex("bar").matches(jobOfType(type).mavenBuildStep(step, "Foo", "", "", "").asItem()));
-				assertTrue(mavenRegex("Foo.*").matches(jobOfType(type).mavenBuildStep(step, "Foobar", "", "", "").asItem()));
-				assertFalse(mavenRegex("bar").matches(jobOfType(type).mavenBuildStep(step, "Foobar", "", "", "").asItem()));
-				assertTrue(mavenRegex(".*bar").matches(jobOfType(type).mavenBuildStep(step, "Foobar", "", "", "").asItem()));
-
-				assertTrue(mavenRegex("Foo bar").matches(jobOfType(type).mavenBuildStep(step, "Foo\nbar", "", "", "").asItem()));
-				assertFalse(mavenRegex("Foo").matches(jobOfType(type).mavenBuildStep(step, "Foo\nbar", "", "", "").asItem()));
-				assertFalse(mavenRegex("bar").matches(jobOfType(type).mavenBuildStep(step, "Foo\nbar", "", "", "").asItem()));
-				assertTrue(mavenRegex("Foo.*").matches(jobOfType(type).mavenBuildStep(step, "Foo\nbar", "", "", "").asItem()));
-				assertTrue(mavenRegex(".*bar").matches(jobOfType(type).mavenBuildStep(step, "Foo\nbar", "", "", "").asItem()));
-
-				assertTrue(mavenRegex(".*").matches(jobOfType(type).mavenBuildStep(step, "", "", "", "").asItem()));
-				assertTrue(mavenRegex("Foo").matches(jobOfType(type).mavenBuildStep(step, "", "Foo", "", "").asItem()));
-				assertFalse(mavenRegex("bar").matches(jobOfType(type).mavenBuildStep(step, "", "Foo", "", "").asItem()));
-				assertTrue(mavenRegex("Foo.*").matches(jobOfType(type).mavenBuildStep(step, "", "Foobar", "", "").asItem()));
-				assertFalse(mavenRegex("bar").matches(jobOfType(type).mavenBuildStep(step, "", "Foobar", "", "").asItem()));
-				assertTrue(mavenRegex(".*bar").matches(jobOfType(type).mavenBuildStep(step, "", "Foobar", "", "").asItem()));
-
-				assertTrue(mavenRegex(".*").matches(jobOfType(type).mavenBuildStep(step, "", "", "", "").asItem()));
-				assertTrue(mavenRegex("Foo").matches(jobOfType(type).mavenBuildStep(step, "", "", "Foo", "").asItem()));
-				assertFalse(mavenRegex("bar").matches(jobOfType(type).mavenBuildStep(step, "", "", "Foo", "").asItem()));
-				assertTrue(mavenRegex("Foo.*").matches(jobOfType(type).mavenBuildStep(step, "", "", "Foobar", "").asItem()));
-				assertFalse(mavenRegex("bar").matches(jobOfType(type).mavenBuildStep(step, "", "", "Foobar", "").asItem()));
-				assertTrue(mavenRegex(".*bar").matches(jobOfType(type).mavenBuildStep(step, "", "", "Foobar", "").asItem()));
-
-				assertTrue(mavenRegex(".*").matches(jobOfType(type).mavenBuildStep(step, "", "", "", "").asItem()));
-				assertTrue(mavenRegex("Foo").matches(jobOfType(type).mavenBuildStep(step, "", "", "", "Foo").asItem()));
-				assertFalse(mavenRegex("bar").matches(jobOfType(type).mavenBuildStep(step, "", "", "", "Foo").asItem()));
-				assertTrue(mavenRegex("Foo.*").matches(jobOfType(type).mavenBuildStep(step, "", "", "", "Foobar").asItem()));
-				assertFalse(mavenRegex("bar").matches(jobOfType(type).mavenBuildStep(step, "", "", "", "Foobar").asItem()));
-				assertTrue(mavenRegex(".*bar").matches(jobOfType(type).mavenBuildStep(step, "", "", "", "Foobar").asItem()));
-			}
-		}
 	}
 
 	@Test
diff --git a/src/test/java/hudson/views/test/JobMocker.java b/src/test/java/hudson/views/test/JobMocker.java
index 3a869c5..1c07d56 100644
--- a/src/test/java/hudson/views/test/JobMocker.java
+++ b/src/test/java/hudson/views/test/JobMocker.java
@@ -7,7 +7,6 @@
 import hudson.plugins.emailext.ExtendedEmailPublisher;
 import hudson.plugins.git.BranchSpec;
 import hudson.plugins.git.GitSCM;
-import hudson.plugins.m2extrasteps.M2ExtraStepsWrapper;
 import hudson.scm.*;
 import hudson.security.ACL;
 import hudson.security.Permission;
@@ -297,29 +296,6 @@ public JobMocker<T> mavenBuilder(String targets, final String name, String prope
         return this;
     }
 
-    public JobMocker<T> mavenBuildStep(MavenBuildStep step, String targets, final String name, String properties, String opts) {
-        if (instanceOf(job, MAVEN_MODULE_SET)) {
-            Maven maven = mockMaven(targets, name, properties, opts);
-            M2ExtraStepsWrapper wrapper = new M2ExtraStepsWrapper(null);
-            wrapper.setPreBuildSteps((step == MavenBuildStep.PRE) ? asList((Builder) maven) : new ArrayList<Builder>());
-            wrapper.setPostBuildSteps((step == MavenBuildStep.POST) ? asList((Builder) maven) : new ArrayList<Builder>());
-            DescribableList wrappers = new DescribableList(mock(Saveable.class), asList(wrapper));
-            when(((MavenModuleSet)job).getBuildWrappers()).thenReturn(wrappers);
-        }
-        return this;
-    }
-
-    public JobMocker<T> mavenPostBuildStep(String targets, final String name, String properties, String opts) {
-        if (instanceOf(job, MAVEN_MODULE_SET)) {
-            Maven maven = mockMaven(targets, name, properties, opts);
-            M2ExtraStepsWrapper wrapper = new M2ExtraStepsWrapper(null);
-            wrapper.setPostBuildSteps(asList((Builder)maven));
-            DescribableList wrappers = new DescribableList(mock(Saveable.class), asList(wrapper));
-            when(((MavenModuleSet)job).getBuildWrappers()).thenReturn(wrappers);
-        }
-        return this;
-    }
-
     private Maven mockMaven(final String targets, final String name, final String properties, final String opts) {
         final Maven.MavenInstallation mavenInstallation = mock(Maven.MavenInstallation.class);
         when(mavenInstallation.getName()).thenReturn(name);