diff --git a/pom.xml b/pom.xml
index 13d9e67bb..81c8dd498 100755
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
         <changelist>-SNAPSHOT</changelist>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
         <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-        <jenkins.baseline>2.504</jenkins.baseline>
+        <jenkins.baseline>2.541</jenkins.baseline>
         <jenkins.version>${jenkins.baseline}.3</jenkins.version>
         <release.skipTests>false</release.skipTests>
         <ban-junit4-imports.skip>false</ban-junit4-imports.skip>
@@ -191,16 +191,10 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-${jenkins.baseline}.x</artifactId>
-                <version>5804.v80587a_38d937</version>
+                <version>6486.v7c7b_3635dc42</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <!-- TODO until in BOM -->
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>credentials</artifactId>
-                <version>1480.v2246fd131e83</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/src/main/resources/org/jenkinsci/plugins/github/admin/GitHubHookRegisterProblemMonitor/index.groovy b/src/main/resources/org/jenkinsci/plugins/github/admin/GitHubHookRegisterProblemMonitor/index.groovy
index 9c059da5e..91e6f4f5d 100644
--- a/src/main/resources/org/jenkinsci/plugins/github/admin/GitHubHookRegisterProblemMonitor/index.groovy
+++ b/src/main/resources/org/jenkinsci/plugins/github/admin/GitHubHookRegisterProblemMonitor/index.groovy
@@ -5,20 +5,11 @@ import org.jenkinsci.plugins.github.admin.GitHubHookRegisterProblemMonitor
 import org.jenkinsci.plugins.github.webhook.WebhookManager
 
 def f = namespace(lib.FormTagLib);
-def st = namespace('jelly:stapler')
 def l = namespace(lib.LayoutTagLib)
 
-l.layout(title: _('page.title'), permission: app.ADMINISTER) {
-    l.header() {
-        link(rel: 'stylesheet', type: 'text/css', href: "${rootURL}${h.getResourcePath()}/plugin/github/css/monitor.css")
-    }
-    st.include(page: 'sidepanel.jelly', it: app)
-    l.main_panel {
-        div(class: 'gh-page') {
-
-            h1 {
-                text(_('page.title'))
-            }
+l.settings_subpage(title: _('page.title'), permission: app.ADMINISTER) {
+    link(rel: 'stylesheet', type: 'text/css', href: "${rootURL}${h.getResourcePath()}/plugin/github/css/monitor.css")
+    div(class: 'gh-page') {
 
             div {
                 p {
@@ -129,5 +120,4 @@ l.layout(title: _('page.title'), permission: app.ADMINISTER) {
                 }
             }
         }
-    }
 }