diff --git a/pom.xml b/pom.xml
index 795f312bb..b9ea7ec8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,8 +68,8 @@
     <changelist>999999-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.version>${jenkins.baseline}.3</jenkins.version>
+    <jenkins.baseline>2.528</jenkins.baseline>
+    <jenkins.version>2.544</jenkins.version>
     <ban-junit4-imports.skip>false</ban-junit4-imports.skip>
     <hpi.compatibleSinceVersion>1372</hpi.compatibleSinceVersion>
   </properties>
diff --git a/src/main/java/com/cloudbees/plugins/credentials/CredentialsStoreAction.java b/src/main/java/com/cloudbees/plugins/credentials/CredentialsStoreAction.java
index 36322e573..a3f839216 100644
--- a/src/main/java/com/cloudbees/plugins/credentials/CredentialsStoreAction.java
+++ b/src/main/java/com/cloudbees/plugins/credentials/CredentialsStoreAction.java
@@ -28,6 +28,11 @@
 import com.cloudbees.plugins.credentials.domains.Domain;
 import com.cloudbees.plugins.credentials.domains.DomainSpecification;
 import com.cloudbees.plugins.credentials.impl.BaseStandardCredentials;
+import com.cloudbees.plugins.credentials.links.MoveCredentialsLink;
+import com.cloudbees.plugins.credentials.links.NewCredentialsLink;
+import com.cloudbees.plugins.credentials.links.NewDomainLink;
+import com.cloudbees.plugins.credentials.links.UpdateCredentialsLink;
+import com.cloudbees.plugins.credentials.links.UpdateDomainLink;
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
@@ -84,6 +89,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.jenkins.ui.icon.IconSpec;
 import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.HttpResponse;
@@ -509,6 +515,11 @@ public void checkPermission(@NonNull Permission permission) throws AccessDeniedE
         getACL().checkPermission(permission);
     }
 
+    @Restricted(DoNotUse.class) // jelly
+    public NewDomainLink getNewDomainLink() {
+        return new NewDomainLink();
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -580,6 +591,16 @@ public CredentialsStoreAction getParent() {
             return parent;
         }
 
+        @Restricted(DoNotUse.class) // jelly
+        public UpdateDomainLink getUpdateDomainLink() {
+            return new UpdateDomainLink();
+        }
+
+        @Restricted(DoNotUse.class) // jelly
+        public NewCredentialsLink getNewCredentialsLink() {
+            return new NewCredentialsLink();
+        }
+
         /**
          * Return the URL name.
          *
@@ -1026,6 +1047,17 @@ public Api getApi() {
             return new Api(this);
         }
 
+        @Restricted(DoNotUse.class) // jelly
+        public UpdateCredentialsLink getUpdateLink() {
+            return new UpdateCredentialsLink();
+        }
+
+        @Restricted(DoNotUse.class) // jelly
+        public MoveCredentialsLink getMoveLink() {
+            return new MoveCredentialsLink();
+        }
+
+
         /**
          * Gets the display name of the {@link Credentials}.
          *
diff --git a/src/main/java/com/cloudbees/plugins/credentials/ManageCredentialsConfiguration.java b/src/main/java/com/cloudbees/plugins/credentials/ManageCredentialsConfiguration.java
index 1b59455de..ff32261ac 100644
--- a/src/main/java/com/cloudbees/plugins/credentials/ManageCredentialsConfiguration.java
+++ b/src/main/java/com/cloudbees/plugins/credentials/ManageCredentialsConfiguration.java
@@ -16,8 +16,10 @@
 @Restricted(NoExternalUse.class)
 public class ManageCredentialsConfiguration extends ManagementLink {
 
-    public String getCategoryName() {
-        return "SECURITY";
+    @NonNull
+    @Override
+    public Category getCategory() {
+        return Category.SECURITY;
     }
 
     @Override
diff --git a/src/main/java/com/cloudbees/plugins/credentials/ViewCredentialsAction.java b/src/main/java/com/cloudbees/plugins/credentials/ViewCredentialsAction.java
index 8cb848c5f..5c373d61d 100644
--- a/src/main/java/com/cloudbees/plugins/credentials/ViewCredentialsAction.java
+++ b/src/main/java/com/cloudbees/plugins/credentials/ViewCredentialsAction.java
@@ -29,10 +29,12 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
+import hudson.ExtensionList;
 import hudson.model.Action;
 import hudson.model.Api;
 import hudson.model.Item;
 import hudson.model.ItemGroup;
+import hudson.model.ManagementLink;
 import hudson.model.ModelObject;
 import hudson.model.RootAction;
 import hudson.model.TopLevelItem;
@@ -58,6 +60,7 @@
 import jenkins.model.TransientActionFactory;
 import org.jenkins.ui.icon.IconSpec;
 import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
@@ -236,6 +239,11 @@ public boolean isVisible() {
         return false;
     }
 
+    @Restricted(DoNotUse.class) // for jelly
+    public ManagementLink getManagementLink() {
+        return ExtensionList.lookupSingleton(ManageCredentialsConfiguration.class);
+    }
+
     /**
      * Administrator's view credentials from 'Manage Jenkins'.
      * @param accessControlled an access controlled object.
diff --git a/src/main/java/com/cloudbees/plugins/credentials/links/MoveCredentialsLink.java b/src/main/java/com/cloudbees/plugins/credentials/links/MoveCredentialsLink.java
new file mode 100644
index 000000000..3864444ff
--- /dev/null
+++ b/src/main/java/com/cloudbees/plugins/credentials/links/MoveCredentialsLink.java
@@ -0,0 +1,7 @@
+package com.cloudbees.plugins.credentials.links;
+
+public class MoveCredentialsLink {
+    public String getDisplayName() {
+        return Messages.MoveCredentialsLink_displayName();
+    }
+}
diff --git a/src/main/java/com/cloudbees/plugins/credentials/links/NewCredentialsLink.java b/src/main/java/com/cloudbees/plugins/credentials/links/NewCredentialsLink.java
new file mode 100644
index 000000000..aeee60861
--- /dev/null
+++ b/src/main/java/com/cloudbees/plugins/credentials/links/NewCredentialsLink.java
@@ -0,0 +1,7 @@
+package com.cloudbees.plugins.credentials.links;
+
+public class NewCredentialsLink {
+    public String getDisplayName() {
+        return Messages.NewCredentialsLink_displayName();
+    }
+}
diff --git a/src/main/java/com/cloudbees/plugins/credentials/links/NewDomainLink.java b/src/main/java/com/cloudbees/plugins/credentials/links/NewDomainLink.java
new file mode 100644
index 000000000..ed03e2aab
--- /dev/null
+++ b/src/main/java/com/cloudbees/plugins/credentials/links/NewDomainLink.java
@@ -0,0 +1,7 @@
+package com.cloudbees.plugins.credentials.links;
+
+public class NewDomainLink {
+    public String getDisplayName() {
+        return Messages.NewDomainLink_displayName();
+    }
+}
diff --git a/src/main/java/com/cloudbees/plugins/credentials/links/UpdateCredentialsLink.java b/src/main/java/com/cloudbees/plugins/credentials/links/UpdateCredentialsLink.java
new file mode 100644
index 000000000..7ef1e6ebf
--- /dev/null
+++ b/src/main/java/com/cloudbees/plugins/credentials/links/UpdateCredentialsLink.java
@@ -0,0 +1,7 @@
+package com.cloudbees.plugins.credentials.links;
+
+public class UpdateCredentialsLink {
+    public String getDisplayName() {
+        return Messages.UpdateCredentialsLink_displayName();
+    }
+}
diff --git a/src/main/java/com/cloudbees/plugins/credentials/links/UpdateDomainLink.java b/src/main/java/com/cloudbees/plugins/credentials/links/UpdateDomainLink.java
new file mode 100644
index 000000000..641858b1f
--- /dev/null
+++ b/src/main/java/com/cloudbees/plugins/credentials/links/UpdateDomainLink.java
@@ -0,0 +1,7 @@
+package com.cloudbees.plugins.credentials.links;
+
+public class UpdateDomainLink {
+    public String getDisplayName() {
+        return Messages.UpdateDomainLink_displayName();
+    }
+}
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete.jelly b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete.jelly
deleted file mode 100644
index 186246216..000000000
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete.jelly
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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:i="jelly:fmt">
-  <l:layout title="${%Delete credentials}" permission="${it.domain.parent.DELETE}">
-		<st:include page="sidepanel.jelly" />
-		<l:main-panel>
-      <h1>${%Delete credentials}</h1>
-          <form method="post" action="doDelete">
-            <p>${%confirm(it.displayName,it.typeName)}</p>
-            <div>
-              <f:submit value="${%Yes}"/>
-            </div>
-          </form>
-    </l:main-panel>
-	</l:layout>
-</j:jelly>
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete.properties
deleted file mode 100644
index c2411f20f..000000000
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# The MIT License
-#
-# Copyright (c) 2013, CloudBees, Inc..
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-confirm=Are you sure you want to delete the {0} {1} credentials?
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete_de.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete_de.properties
deleted file mode 100644
index dfb99752c..000000000
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete_de.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# The MIT License
-#
-# Copyright (c) 2013, CloudBees, Inc., Harald Albers.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-confirm=Sind Sie sicher, dass Sie die "{1}"-Zugangsdaten "{0}" l\u00F6schen m\u00F6chten?
-Yes=Ja
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete_fr.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete_fr.properties
deleted file mode 100644
index d8fdb8e11..000000000
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete_fr.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2014, Damien Finck
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-confirm=\u00cates-vous s\u00fbr de supprimer l''identifiant {0} {1} ?
-Yes=Oui
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete_it.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete_it.properties
deleted file mode 100644
index ec32ffb9a..000000000
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete_it.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright © 2020 Alessandro Menti
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-confirm=Eliminare le credenziali {0} {1}?
-Yes=Sì
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete_ja.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete_ja.properties
deleted file mode 100644
index e22a91bac..000000000
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete_ja.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# The MIT License
-#
-# Copyright (c) 2013, Seiji Sogabe
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-confirm=\u8a8d\u8a3c\u60c5\u5831 \u7a2e\u985e\uff1a{1} \u540d\u79f0\uff1a{0} \u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
-Yes=\u306f\u3044
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/index.jelly b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/index.jelly
index 742b91c58..6bedad32a 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/index.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/index.jelly
@@ -27,64 +27,120 @@
   Index page
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
-  <l:layout title="${it.fullDisplayName}" permission="${it.domain.parent.VIEW}">
-    <st:include page="sidepanel.jelly"/>
-    <l:main-panel>
-      <h1>${it.displayName}</h1>
-      <div>
-        <j:out value="${it.description!=null ? app.markupFormatter.translate(it.description) : ''}" />
-      </div>
-      <h2 id="usage">${%Usage}</h2>
-      <j:choose>
-        <j:when test="${it.isFingerprintEnabled()}">
-          <j:set var="fingerprint" value="${it.fingerprint}"/>
-          <j:set var="jobs" value="${fingerprint.jobs}"/>
-          <j:choose>
-            <j:when test="${empty(jobs)}">
-              <p id="usage-missing">
-                ${%This credential has not been recorded as used anywhere.}
-                <br/>
-                <small><em>${%usageTrackingImperfect}</em></small>
-              </p>
-            </j:when>
-            <j:otherwise>
-              <p id="usage-present">
-                ${%This credential has been recorded as used in the following places}:
-                <br/>
-                <small><em>${%usageTrackingImperfect}</em></small>
-              </p>
-              <table class="fingerprint-summary">
-                <j:forEach var="j" items="${jobs}">
-                  <j:set var="job" value="${app.getItemByFullName(j)}"/>
-                  <j:set var="range" value="${fingerprint.usages[j]}"/>
-                  <tr>
-                    <td class="fingerprint-summary-header">
-                      <j:choose>
-                        <j:when test="${job!=null}">
-                          <a href="${rootURL}/${job.url}" class="model-link inside">${j}</a>
-                        </j:when>
-                        <j:otherwise>
-                          ${j}
-                        </j:otherwise>
-                      </j:choose>
-                    </td>
-                    <td>
-                      <t:buildRangeLink job="${job}" range="${range}"/>
-                    </td>
-                  </tr>
-                </j:forEach>
-              </table>
-            </j:otherwise>
-          </j:choose>
-          <j:forEach var="ff" items="${fingerprint.sortedFacets}">
-            <st:include page="main.jelly" optional="true" it="${ff}"/>
-          </j:forEach>
-        </j:when>
-        <j:otherwise>
-          <p class="warning">${%fingerprintDisabledWarning(app.rootUrl)}</p>
-        </j:otherwise>
-      </j:choose>
-    </l:main-panel>
-  </l:layout>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson"
+         xmlns:d="jelly:define" xmlns:local="local" xmlns:f="/lib/form" xmlns:dd="/lib/layout/dropdowns">
+
+  <d:taglib uri="local">
+    <d:tag name="contents">
+      <j:if test="${it.description != null}">
+        <div class="jenkins-page-description">
+          <j:out value="${app.markupFormatter.translate(it.description)}"/>
+        </div>
+      </j:if>
+
+      <f:section title="${%Usage}">
+        <j:choose>
+          <j:when test="${it.isFingerprintEnabled()}">
+            <j:set var="fingerprint" value="${it.fingerprint}"/>
+            <j:set var="jobs" value="${fingerprint.jobs}"/>
+            <j:choose>
+              <j:when test="${empty(jobs)}">
+                <p id="usage-missing">
+                  ${%This credential has not been recorded as used anywhere.}
+                  <br/>
+                  <small>
+                    <em>${%usageTrackingImperfect}</em>
+                  </small>
+                </p>
+              </j:when>
+              <j:otherwise>
+                <p id="usage-present">
+                  ${%This credential has been recorded as used in the following places}:
+                  <br/>
+                  <small>
+                    <em>${%usageTrackingImperfect}</em>
+                  </small>
+                </p>
+                <table class="fingerprint-summary">
+                  <j:forEach var="j" items="${jobs}">
+                    <j:set var="job" value="${app.getItemByFullName(j)}"/>
+                    <j:set var="range" value="${fingerprint.usages[j]}"/>
+                    <tr>
+                      <td class="fingerprint-summary-header">
+                        <j:choose>
+                          <j:when test="${job!=null}">
+                            <a href="${rootURL}/${job.url}" class="model-link inside">${j}</a>
+                          </j:when>
+                          <j:otherwise>
+                            ${j}
+                          </j:otherwise>
+                        </j:choose>
+                      </td>
+                      <td>
+                        <t:buildRangeLink job="${job}" range="${range}"/>
+                      </td>
+                    </tr>
+                  </j:forEach>
+                </table>
+              </j:otherwise>
+            </j:choose>
+            <j:forEach var="ff" items="${fingerprint.sortedFacets}">
+              <st:include page="main.jelly" optional="true" it="${ff}"/>
+            </j:forEach>
+          </j:when>
+          <j:otherwise>
+            <p class="warning">${%fingerprintDisabledWarning(app.rootUrl)}</p>
+          </j:otherwise>
+        </j:choose>
+      </f:section>
+    </d:tag>
+  </d:taglib>
+
+  <j:set var="header">
+    <l:view>
+      <l:app-bar title="${it.displayName}">
+        <l:hasPermission permission="${it.domain.parent.UPDATE}">
+          <a class="jenkins-button" href="update">${%Configure}</a>
+        </l:hasPermission>
+        <l:hasPermission permission="${it.domain.parent.DELETE}">
+          <a class="jenkins-button" href="move">${%Move}</a>
+        </l:hasPermission>
+
+        <l:hasPermission permission="${it.domain.parent.DELETE}">
+          <l:overflowButton>
+            <dd:custom>
+              <l:confirmationLink class="jenkins-dropdown__item jenkins-!-destructive-color"
+                                  href="doDelete"
+                                  title="${%delete.credential(it.displayName)}"
+                                  post="true"
+                                  destructive="true">
+                <div class="jenkins-dropdown__item__icon">
+                  <l:icon src="symbol-trash" />
+                </div>
+                ${%Delete credential}
+              </l:confirmationLink>
+            </dd:custom>
+          </l:overflowButton>
+        </l:hasPermission>
+      </l:app-bar>
+    </l:view>
+  </j:set>
+
+  <j:choose>
+    <j:when test="${it.store.context == app}">
+      <l:settings-subpage header="${header}"
+                          noDefer="true" permission="${it.domain.parent.VIEW}">
+
+        <local:contents/>
+      </l:settings-subpage>
+    </j:when>
+    <j:otherwise>
+      <l:layout type="one-column" title="${it.fullDisplayName}" permission="${it.domain.parent.VIEW}">
+        <l:main-panel>
+          <j:out value="${header}"/>
+          <local:contents/>
+        </l:main-panel>
+      </l:layout>
+    </j:otherwise>
+  </j:choose>
 </j:jelly>
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/index.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/index.properties
index 7a25e5873..0e5a1f827 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/index.properties
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/index.properties
@@ -23,3 +23,4 @@
 #
 usageTrackingImperfect=Note: usage tracking requires the cooperation of plugins and consequently may not track every use.
 fingerprintDisabledWarning=Credential fingerprints are disabled.
+delete.credential=Are you sure you want to delete {0}?
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/move.jelly b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/move.jelly
index f863801af..21d3e0197 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/move.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/move.jelly
@@ -1,9 +1,8 @@
 <?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:i="jelly:fmt">
-  <l:layout title="${%Move credentials}" permission="${it.domain.parent.DELETE}">
-		<st:include page="sidepanel.jelly" />
-		<l:main-panel>
-      <h1>${%Move credentials}</h1>
+<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:local="local"
+         xmlns:f="/lib/form">
+  <d:taglib uri="local">
+    <d:tag name="contents">
       <form method="post" action="doMove">
         <p>${%blurb(it.displayName,it.typeName)}</p>
         <div class="jenkins-select form-group">
@@ -26,6 +25,24 @@
         </div>
         <f:submit value="${%Move}"/>
       </form>
-    </l:main-panel>
-	</l:layout>
+
+    </d:tag>
+  </d:taglib>
+
+  <j:choose>
+    <j:when test="${it.store.context == app}">
+      <l:settings-subpage managementLink="${it.moveLink}" includeBreadcrumb="true"
+                          noDefer="true" permission="${it.domain.parent.DELETE}">
+        <local:contents/>
+      </l:settings-subpage>
+    </j:when>
+    <j:otherwise>
+      <l:layout type="one-column" title="${it.moveLink.displayName}" permission="${it.domain.parent.DELETE}">
+        <l:main-panel>
+          <l:app-bar title="${it.moveLink.displayName}" />
+          <local:contents/>
+        </l:main-panel>
+      </l:layout>
+    </j:otherwise>
+  </j:choose>
 </j:jelly>
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel.jelly b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel.jelly
deleted file mode 100644
index 5f0b75a1c..000000000
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel.jelly
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ The MIT License
- ~
- ~ Copyright (c) 2013, CloudBees, Inc..
- ~
- ~ Permission is hereby granted, free of charge, to any person obtaining a copy
- ~ of this software and associated documentation files (the "Software"), to deal
- ~ in the Software without restriction, including without limitation the rights
- ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- ~ copies of the Software, and to permit persons to whom the Software is
- ~ furnished to do so, subject to the following conditions:
- ~
- ~ The above copyright notice and this permission notice shall be included in
- ~ all copies or substantial portions of the Software.
- ~
- ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- ~ THE SOFTWARE.
- -->
-<?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:s="/lib/form">
-  <l:side-panel>
-    <l:tasks>
-    <j:set var="url" value="${h.getNearestAncestorUrl(request2,it)}"/>
-      <l:task icon="icon-setting icon-md" href="${url}/update" title="${%Update}" permission="${it.domain.parent.UPDATE}"/>
-      <l:task icon="icon-edit-delete icon-md" href="${url}/delete" title="${%Delete}" permission="${it.domain.parent.DELETE}"/>
-      <l:task icon="symbol-swap" href="${url}/move" title="${%Move}" permission="${it.domain.parent.DELETE}"/>
-    </l:tasks>
-  </l:side-panel>
-</j:jelly>
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/update.jelly b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/update.jelly
index e02b4cc8a..07b285899 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/update.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/update.jelly
@@ -28,27 +28,52 @@
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout"
-         xmlns:f="/lib/form" xmlns:c="/lib/credentials" xmlns:t="/lib/hudson">
-  <l:layout title="${%Update credentials}" permission="${it.domain.parent.UPDATE}">
-    <st:include page="sidepanel.jelly"/>
-    <l:main-panel>
-      <h1>${%Update credentials}</h1>
+         xmlns:f="/lib/form" xmlns:d="jelly:define" xmlns:local="local">
+  <d:taglib uri="local">
+    <d:tag name="contents">
       <j:set var="descriptor" value="${it.descriptor}"/>
       <j:set var="instance" value="${it}"/>
       <j:scope>
         <j:set var="it" value="${it.store}"/>
         <f:form action="updateSubmit" method="POST" name="update">
-          <j:set var="instance" value="${instance.credentials}" />
+          <j:set var="instance" value="${instance.credentials}"/>
           <j:set var="descriptor" value="${instance.descriptor}"/>
           <f:invisibleEntry>
-            <input type="hidden" name="stapler-class" value="${descriptor.clazz.name}" />
+            <input type="hidden" name="stapler-class" value="${descriptor.clazz.name}"/>
           </f:invisibleEntry>
-          <st:include from="${descriptor}" page="${descriptor.configPage}" />
+          <st:include from="${descriptor}" page="${descriptor.configPage}"/>
           <f:bottomButtonBar>
             <f:submit value="${%Save}"/>
           </f:bottomButtonBar>
         </f:form>
       </j:scope>
-    </l:main-panel>
-  </l:layout>
+    </d:tag>
+  </d:taglib>
+
+  <j:set var="header">
+    <l:view>
+      <l:app-bar title="${it.updateLink.displayName}" />
+    </l:view>
+  </j:set>
+
+  <j:choose>
+    <j:when test="${it.store.context == app}">
+      <l:settings-subpage header="${header}"
+                          managementLink="${it.updateLink}"
+                          includeBreadcrumb="true"
+                          noDefer="true" permission="${it.domain.parent.UPDATE}">
+
+        <local:contents/>
+      </l:settings-subpage>
+    </j:when>
+    <j:otherwise>
+      <l:layout type="one-column" title="${%Update credentials}" permission="${it.domain.parent.UPDATE}">
+        <l:main-panel>
+          <j:out value="${header}"/>
+          <local:contents/>
+        </l:main-panel>
+      </l:layout>
+    </j:otherwise>
+  </j:choose>
+
 </j:jelly>
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/configure.jelly b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/configure.jelly
index 36e491d41..38b9e6e58 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/configure.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/configure.jelly
@@ -28,10 +28,10 @@
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout"
-         xmlns:f="/lib/form" xmlns:c="/lib/credentials" xmlns:t="/lib/hudson">
-  <l:layout title="${%Update domain}" permission="${it.parent.MANAGE_DOMAINS}" type="one-column">
-    <l:main-panel>
-      <h1>${%Update domain}</h1>
+         xmlns:f="/lib/form"
+         xmlns:d="jelly:define" xmlns:local="local">
+  <d:taglib uri="local">
+    <d:tag name="contents">
       <j:set var="descriptor" value="${it.descriptor}"/>
       <j:set var="instance" value="${it.domain}"/>
       <j:choose>
@@ -54,7 +54,8 @@
                              items="${instance.specifications}"/>
             </f:entry>
             <f:bottomButtonBar>
-              <button formnovalidate="formNoValidate" id="save" name="Submit" class="jenkins-button jenkins-button--primary">
+              <button formnovalidate="formNoValidate" id="save" name="Submit"
+                      class="jenkins-button jenkins-button--primary">
                 ${%Save}
               </button>
             </f:bottomButtonBar>
@@ -62,6 +63,25 @@
         </j:otherwise>
       </j:choose>
       <st:adjunct includes="com.cloudbees.plugins.credentials.common.formBehaviour"/>
-    </l:main-panel>
-  </l:layout>
+    </d:tag>
+  </d:taglib>
+
+
+  <j:choose>
+    <j:when test="${it.store.context == app}">
+      <l:settings-subpage managementLink="${it.updateDomainLink}" noDefer="true" includeBreadcrumb="true">
+        <local:contents/>
+      </l:settings-subpage>
+    </j:when>
+    <j:otherwise>
+      <l:layout title="${it.updateDomainLink.displayName}" permission="${it.parent.MANAGE_DOMAINS}" type="one-column">
+        <l:breadcrumb title="${it.updateDomainLink.displayName}" />
+        <l:main-panel>
+          <l:app-bar title="${it.updateDomainLink.displayName}" />
+          <local:contents />
+
+        </l:main-panel>
+      </l:layout>
+    </j:otherwise>
+  </j:choose>
 </j:jelly>
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete.jelly b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete.jelly
deleted file mode 100644
index 5c1ad7d78..000000000
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete.jelly
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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:i="jelly:fmt">
-  <l:layout title="${%Delete domain}" permission="${it.parent.MANAGE_DOMAINS}" type="one-column">
-		<l:main-panel>
-      <h1>${%Delete domain}</h1>
-      <j:choose>
-        <j:when test="${it.global}">
-          ${%The global domain cannot be deleted}
-        </j:when>
-        <j:when test="${!it.parent.domainsModifiable}">
-          ${%This credentials provider does not support deleting credential domains}
-        </j:when>
-        <j:otherwise>
-          <form method="post" action="doDelete">
-            <p>${%Are you sure about deleting this domain and all credentials in this domain?}</p>
-            <div>
-              <f:submit value="${%Yes}"/>
-            </div>
-          </form>
-        </j:otherwise>
-      </j:choose>
-    </l:main-panel>
-	</l:layout>
-</j:jelly>
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete_de.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete_de.properties
deleted file mode 100644
index 20128b1f8..000000000
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete_de.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# The MIT License
-#
-# Copyright (c) 2013, CloudBees, Inc., Harald Albers.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-The\ global\ domain\ cannot\ be\ deleted=Die Dom\u00E4ne "Globale Zugangsdaten" kann nicht gel\u00F6scht werden
-This\ credentials\ provider\ does\ not\ support\ deleting\ credential\ domains=Dieser Zugangsdaten-Provider unterst\u00FCtzt das L\u00F6schen von Zugangsdaten-Domains nicht
-Are\ you\ sure\ about\ deleting\ this\ domain\ and\ all\ credentials\ in\ this\ domain?=Sind Sie sicher, dass Sie diese Dom\u00E4ne und alle darin enthaltenen Zugangsdaten l\u00F6schen m\u00F6chten?
-Yes=Ja
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete_fr.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete_fr.properties
deleted file mode 100644
index 2b61116e5..000000000
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete_fr.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2014, Damien Finck
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-The\ global\ domain\ cannot\ be\ deleted=Le domaine global ne peut pas \u00eatre supprim\u00e9
-This\ credentials\ provider\ does\ not\ support\ deleting\ credential\ domains=Ce gestionnaire d''identifiant ne supporte pas la configuration des domaines d''identifiants
-Are\ you\ sure\ about\ deleting\ this\ domain\ and\ all\ credentials\ in\ this\ domain?=\u00cates-vous s\u00fbr de vouloir supprimer ce domaine ainsi que tous les identifiants de ce domaine ?
-Yes=Oui
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete_it.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete_it.properties
deleted file mode 100644
index ee0be2991..000000000
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete_it.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-# The MIT License
-#
-# Copyright © 2020 Alessandro Menti
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Are\ you\ sure\ about\ deleting\ this\ domain\ and\ all\ credentials\ in\ this\ domain?=\
-  Eliminare questo dominio e tutte le credenziali in esso contenute?
-The\ global\ domain\ cannot\ be\ deleted=Non è possibile eliminare il dominio \
-  globale
-This\ credentials\ provider\ does\ not\ support\ deleting\ credential\ domains=\
-  Questo provider credenziali non supporta l''eliminazione dei domini \
-  credenziali.
-Yes=Sì
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete_ja.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete_ja.properties
deleted file mode 100644
index 8f2d082b6..000000000
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete_ja.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2013 Seiji SOgabe
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-The\ global\ domain\ cannot\ be\ deleted=\u30b0\u30ed\u30fc\u30d0\u30eb\u30c9\u30e1\u30a4\u30f3\u306f\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002
-This\ credentials\ provider\ does\ not\ support\ deleting\ credential\ domains=\
- \u3053\u306e\u8a8d\u8a3c\u60c5\u5831\u306e\u30d7\u30ed\u30d0\u30a4\u30c0\u30fc\u306f\u3001\u30c9\u30e1\u30a4\u30f3\u306e\u524a\u9664\u306f\u30b5\u30dd\u30fc\u30c8\u3057\u3066\u3044\u307e\u305b\u3093\u3002
-Are\ you\ sure\ about\ deleting\ this\ domain\ and\ all\ credentials\ in\ this\ domain?=\
- \u3053\u306e\u30c9\u30e1\u30a4\u30f3\u3068\u542b\u307e\u308c\u308b\u3059\u3079\u3066\u306e\u8a8d\u8a3c\u60c5\u5831\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
-Yes=\u306f\u3044
-
-
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/index.jelly b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/index.jelly
index cb2d6f832..a41f196e6 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/index.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/index.jelly
@@ -24,43 +24,12 @@
  ~ THE SOFTWARE.
  -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:dd="/lib/layout/dropdowns"
-         xmlns:f="/lib/form" xmlns:c="/lib/credentials" xmlns:t="/lib/hudson">
-  <l:layout title="${it.fullDisplayName}" permission="${it.parent.VIEW}" type="one-column">
-    <st:adjunct includes="com.cloudbees.plugins.credentials.common.card"/>
+         xmlns:d="jelly:define" xmlns:local="local">
+  <j:set var="creds" value="${it.credentials.values()}"/>
 
-    <j:set var="creds" value="${it.credentials.values()}"/>
-    <l:main-panel>
-      <l:app-bar title="${it.displayName}">
-        <j:if test="${!creds.isEmpty()}">
-          <l:hasPermission permission="${it.parent.CREATE}">
-            <a href="newCredentials" class="jenkins-button jenkins-button--primary">
-              <l:icon src="symbol-add"/>
-              ${%Add Credentials}
-            </a>
-          </l:hasPermission>
-        </j:if>
-        <j:if test="${!it.global and it.parent.domainsModifiable}">
-          <l:hasPermission permission="${it.parent.CREATE}">
-            <a href="configure" class="jenkins-button">
-              ${%Configure}
-            </a>
-            <l:overflowButton>
-              <dd:custom>
-                <l:confirmationLink class="jenkins-dropdown__item jenkins-!-destructive-color"
-                                    href="doDelete"
-                                    title="${%delete.domain(it.displayName)}"
-                                    post="true"
-                                    destructive="true">
-                  <div class="jenkins-dropdown__item__icon">
-                    <l:icon src="symbol-trash" />
-                  </div>
-                  ${%Delete domain}
-                </l:confirmationLink>
-              </dd:custom>
-            </l:overflowButton>
-          </l:hasPermission>
-        </j:if>
-      </l:app-bar>
+  <d:taglib uri="local">
+    <d:tag name="contents">
+      <st:adjunct includes="com.cloudbees.plugins.credentials.common.card"/>
 
       <j:if test="${it.description!=null}">
         <div class="jenkins-page-description">
@@ -135,6 +104,59 @@
           </div>
         </j:otherwise>
       </j:choose>
-    </l:main-panel>
-  </l:layout>
+    </d:tag>
+  </d:taglib>
+
+  <j:set var="header">
+    <l:view>
+      <l:app-bar title="${it.displayName}">
+        <j:if test="${!creds.isEmpty()}">
+          <l:hasPermission permission="${it.parent.CREATE}">
+            <a href="newCredentials" class="jenkins-button jenkins-button--primary">
+              <l:icon src="symbol-add"/>
+              ${%Add Credentials}
+            </a>
+          </l:hasPermission>
+        </j:if>
+        <j:if test="${!it.global and it.parent.domainsModifiable}">
+          <l:hasPermission permission="${it.parent.CREATE}">
+            <a href="configure" class="jenkins-button">
+              ${%Configure}
+            </a>
+            <l:overflowButton>
+              <dd:custom>
+                <l:confirmationLink class="jenkins-dropdown__item jenkins-!-destructive-color"
+                                    href="doDelete"
+                                    title="${%delete.domain(it.displayName)}"
+                                    message="${!creds.isEmpty() ? '%delete.domain.description' : null}"
+                                    post="true"
+                                    destructive="true">
+                  <div class="jenkins-dropdown__item__icon">
+                    <l:icon src="symbol-trash" />
+                  </div>
+                  ${%Delete domain}
+                </l:confirmationLink>
+              </dd:custom>
+            </l:overflowButton>
+          </l:hasPermission>
+        </j:if>
+      </l:app-bar>
+    </l:view>
+  </j:set>
+
+  <j:choose>
+    <j:when test="${it.store.context == app}">
+      <l:settings-subpage header="${header}" noDefer="true">
+        <local:contents/>
+      </l:settings-subpage>
+    </j:when>
+    <j:otherwise>
+      <l:layout title="${it.fullDisplayName}" permission="${it.parent.VIEW}" type="one-column">
+        <l:main-panel>
+          <j:out value="${header}"/>
+          <local:contents/>
+        </l:main-panel>
+      </l:layout>
+    </j:otherwise>
+  </j:choose>
 </j:jelly>
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/index.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/index.properties
index 1c76ae072..75c2b29ae 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/index.properties
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/index.properties
@@ -24,4 +24,5 @@
 noCredentials=This credentials domain is empty
 noCredentialsCallToAction=How about <a href="newCredentials">adding some credentials</a>?
 delete.domain=Are you sure you want to delete {0}?
+delete.domain.description=This will delete all credentials in this domain.
 delete.credential=Are you sure you want to delete {0}?
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/newCredentials.jelly b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/newCredentials.jelly
index 254c7dbee..9a8743030 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/newCredentials.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/newCredentials.jelly
@@ -24,14 +24,13 @@
  ~ THE SOFTWARE.
  -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout"
-         xmlns:f="/lib/form" xmlns:c="/lib/credentials" xmlns:t="/lib/hudson">
-  <l:layout title="${%New credentials}" permission="${it.parent.CREATE}" type="one-column">
-    <l:main-panel>
-      <h1>${%New credentials}</h1>
+         xmlns:f="/lib/form" xmlns:d="jelly:define" xmlns:local="local">
+  <d:taglib uri="local">
+    <d:tag name="contents">
       <j:set var="descriptor" value="${it.credentialDescriptor}"/>
       <j:set var="instance" value="${null}"/>
       <f:form action="createCredentials" method="POST" name="newCredentials">
-        <j:set var="descriptors" value="${it.store.credentialsDescriptors}" />
+        <j:set var="descriptors" value="${it.store.credentialsDescriptors}"/>
         <j:choose>
           <j:when test="${descriptors.size()==1}">
             <f:entry title="${%Kind}" help="${descriptor.getHelpFile('credentials')}">
@@ -72,6 +71,24 @@
           <f:submit value="${%Create}"/>
         </f:bottomButtonBar>
       </f:form>
-    </l:main-panel>
-  </l:layout>
+    </d:tag>
+  </d:taglib>
+
+  <j:choose>
+    <j:when test="${it.store.context == app}">
+      <l:settings-subpage managementLink="${it.newCredentialsLink}" includeBreadcrumb="true"
+                          noDefer="true" permission="${it.parent.CREATE}">
+        <local:contents/>
+      </l:settings-subpage>
+    </j:when>
+    <j:otherwise>
+      <l:layout title="${it.newCredentialsLink.displayName}" permission="${it.parent.CREATE}" type="one-column">
+        <l:breadcrumb title="${it.newCredentialsLink.displayName}" />
+        <l:main-panel>
+          <l:app-bar title="${it.newCredentialsLink.displayName}" />
+          <local:contents/>
+        </l:main-panel>
+      </l:layout>
+    </j:otherwise>
+  </j:choose>
 </j:jelly>
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/index.jelly b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/index.jelly
index 66652fc79..6e6dfe9b9 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/index.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/index.jelly
@@ -24,7 +24,74 @@
  -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:dd="/lib/layout/dropdowns"
-         xmlns:f="/lib/form" xmlns:c="/lib/credentials" xmlns:t="/lib/hudson">
+         xmlns:d="jelly:define" xmlns:local="local">
+  <d:taglib uri="local">
+    <d:tag name="contents">
+      <st:adjunct includes="com.cloudbees.plugins.credentials.common.card"/>
+
+      <div class="credentials-wrapper">
+        <j:forEach var="d" items="${it.domains.values()}">
+          <j:set var="safeDescription"
+                 value="${d.description==null?'':app.markupFormatter.translate(d.description)}"/>
+          <div class="credentials-card">
+            <div class="credentials-card__inner">
+              <div class="credentials-card__title">
+                <l:icon src="${d.iconClassName}" />
+                <a href="domain/${d.urlName}">${d.displayName}</a>
+              </div>
+              <div class="credentials-card__details">
+                ${%credentialsCount(size(d.credentials))}
+                <j:if test="${!empty(safeDescription)}">
+                  <span>-</span>
+                  ${safeDescription}
+                </j:if>
+              </div>
+            </div>
+            <div class="credentials-card__controls">
+              <j:if test="${!d.global and d.parent.domainsModifiable}">
+                <a href="domain/${d.urlName}/configure"
+                   tooltip="${%Configure}"
+                   class="jenkins-button jenkins-button--tertiary">
+                  <l:icon src="symbol-settings"/>
+                </a>
+                <l:overflowButton clazz="jenkins-button--tertiary">
+                  <dd:custom>
+                    <l:confirmationLink class="jenkins-dropdown__item jenkins-!-destructive-color"
+                                        href="domain/${d.urlName}/doDelete"
+                                        title="${%delete.domain(d.displayName)}"
+                                        message="${!d.credentials.isEmpty() ? '%delete.domain.description' : null}"
+                                        post="true"
+                                        destructive="true">
+                      <div class="jenkins-dropdown__item__icon">
+                        <l:icon src="symbol-trash" />
+                      </div>
+                      ${%Delete domain}
+                    </l:confirmationLink>
+                  </dd:custom>
+                </l:overflowButton>
+              </j:if>
+            </div>
+          </div>
+        </j:forEach>
+      </div>
+    </d:tag>
+  </d:taglib>
+
+  <j:set var="header">
+    <l:view>
+      <l:app-bar title="${it.displayName}">
+        <j:if test="${it.domainsModifiable}">
+          <l:hasPermission permission="${it.parent.CREATE}">
+            <a href="newDomain" class="jenkins-button jenkins-button--primary">
+              <l:icon src="symbol-add"/>
+              ${%Add domain}
+            </a>
+          </l:hasPermission>
+        </j:if>
+      </l:app-bar>
+    </l:view>
+  </j:set>
+
   <j:choose>
     <j:when test="${it.hasPermission(it.VIEW) and !it.visible}">
       <l:layout title="${it.fullDisplayName}" type="one-column">
@@ -34,66 +101,21 @@
       </l:layout>
     </j:when>
     <j:otherwise>
-      <l:layout title="${it.fullDisplayName}" permission="${it.VIEW}" type="one-column">
-        <st:adjunct includes="com.cloudbees.plugins.credentials.common.card"/>
-
-        <l:main-panel>
-          <l:app-bar title="${it.displayName}">
-            <j:if test="${it.domainsModifiable}">
-              <l:hasPermission permission="${it.parent.CREATE}">
-                <a href="newDomain" class="jenkins-button jenkins-button--primary">
-                  <l:icon src="symbol-add"/>
-                  ${%Add domain}
-                </a>
-              </l:hasPermission>
-            </j:if>
-          </l:app-bar>
-          <div class="credentials-wrapper">
-            <j:forEach var="d" items="${it.domains.values()}">
-              <j:set var="safeDescription"
-                     value="${d.description==null?'':app.markupFormatter.translate(d.description)}"/>
-              <div class="credentials-card">
-                <div class="credentials-card__inner">
-                  <div class="credentials-card__title">
-                    <l:icon src="${d.iconClassName}" />
-                    <a href="domain/${d.urlName}">${d.displayName}</a>
-                  </div>
-                  <div class="credentials-card__details">
-                    ${%credentialsCount(size(d.credentials))}
-                    <j:if test="${!empty(safeDescription)}">
-                      <span>-</span>
-                      ${safeDescription}
-                    </j:if>
-                  </div>
-                </div>
-                <div class="credentials-card__controls">
-                  <j:if test="${!d.global and d.parent.domainsModifiable}">
-                    <a href="domain/${d.urlName}/configure"
-                       tooltip="${%Configure}"
-                       class="jenkins-button jenkins-button--tertiary">
-                      <l:icon src="symbol-settings"/>
-                    </a>
-                    <l:overflowButton clazz="jenkins-button--tertiary">
-                      <dd:custom>
-                        <l:confirmationLink class="jenkins-dropdown__item jenkins-!-destructive-color"
-                                            href="domain/${d.urlName}/doDelete"
-                                            title="${%delete.domain(d.displayName)}"
-                                            post="true"
-                                            destructive="true">
-                          <div class="jenkins-dropdown__item__icon">
-                            <l:icon src="symbol-trash" />
-                          </div>
-                          ${%Delete domain}
-                        </l:confirmationLink>
-                      </dd:custom>
-                    </l:overflowButton>
-                  </j:if>
-                </div>
-              </div>
-            </j:forEach>
-          </div>
-        </l:main-panel>
-      </l:layout>
+      <j:choose>
+        <j:when test="${it.store.context == app}">
+          <l:settings-subpage header="${header}" noDefer="true">
+            <local:contents/>
+          </l:settings-subpage>
+        </j:when>
+        <j:otherwise>
+          <l:layout title="${it.fullDisplayName}" permission="${it.VIEW}" type="one-column">
+            <l:main-panel>
+              <j:out value="${header}"/>
+              <local:contents/>
+            </l:main-panel>
+          </l:layout>
+        </j:otherwise>
+      </j:choose>
     </j:otherwise>
   </j:choose>
 </j:jelly>
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/index.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/index.properties
index 46474787c..841ca2330 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/index.properties
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/index.properties
@@ -1,2 +1,3 @@
 credentialsCount={0} {0,choice,0#credentials|1#credential|1<credentials}
 delete.domain=Are you sure you want to delete {0}?
+delete.domain.description=This will delete all credentials in this domain.
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/newDomain.jelly b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/newDomain.jelly
index a15eebd0c..fa09fa15e 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/newDomain.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/newDomain.jelly
@@ -24,10 +24,10 @@
  -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout"
-         xmlns:f="/lib/form" xmlns:c="/lib/credentials" xmlns:t="/lib/hudson">
-  <l:layout title="${%New domain}" permission="${it.MANAGE_DOMAINS}" type="one-column">
-    <l:main-panel>
-      <h1>${%New domain}</h1>
+         xmlns:f="/lib/form" xmlns:d="jelly:define" xmlns:local="local">
+
+  <d:taglib uri="local">
+    <d:tag name="contents">
       <j:set var="descriptor" value="${it.domainDescriptor}"/>
       <j:set var="instance" value="${null}"/>
       <f:form action="createDomain" method="POST" name="newDomain">
@@ -43,11 +43,32 @@
         </f:entry>
         <f:bottomButtonBar>
           <button type="submit" name="Submit" id="ok" class="jenkins-button jenkins-button--primary">
-          ${%Create}
+            ${%Create}
           </button>
         </f:bottomButtonBar>
       </f:form>
       <st:adjunct includes="com.cloudbees.plugins.credentials.common.formBehaviour"/>
-    </l:main-panel>
-  </l:layout>
+    </d:tag>
+  </d:taglib>
+
+  <j:set var="header">
+    <l:app-bar title="${it.newDomainLink.displayName}" />
+  </j:set>
+
+  <j:choose>
+    <j:when test="${it.store.context == app}">
+      <l:settings-subpage managementLink="${it.newDomainLink}" noDefer="true" includeBreadcrumb="true" permission="${it.MANAGE_DOMAINS}">
+        <local:contents/>
+      </l:settings-subpage>
+    </j:when>
+    <j:otherwise>
+      <l:layout title="${it.newDomainLink.displayName}" permission="${it.MANAGE_DOMAINS}" type="one-column">
+        <l:breadcrumb title="${it.newDomainLink.displayName}" />
+        <l:main-panel>
+          <j:out value="${header}" />
+          <local:contents />
+        </l:main-panel>
+      </l:layout>
+    </j:otherwise>
+  </j:choose>
 </j:jelly>
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/GlobalCredentialsConfiguration/index.jelly b/src/main/resources/com/cloudbees/plugins/credentials/GlobalCredentialsConfiguration/index.jelly
index 3dc57020c..55570c671 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/GlobalCredentialsConfiguration/index.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/GlobalCredentialsConfiguration/index.jelly
@@ -25,26 +25,21 @@
  -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout"
          xmlns:f="/lib/form" xmlns:t="/lib/hudson">
-  <l:layout title="${it.displayName}" permission="${app.ADMINISTER}">
-    <st:include it="${app}" page="sidepanel"/>
-    <l:main-panel>
-      <h1>${it.displayName}</h1>
-      <p />
-      <div class="behavior-loading">${%LOADING}</div>
-      <f:form action="configure" method="post" name="config">
-        <j:set var="instance" value="${it}"/>
-        <j:set var="descriptor" value="${it.descriptor}"/>
-        <j:forEach var="descriptor" items="${h.getSortedDescriptorsForGlobalConfigByDescriptor(it.FILTER)}">
-          <j:set var="instance" value="${descriptor}"/>
-          <f:rowSet name="${descriptor.jsonSafeClassName}">
-            <st:include from="${descriptor}" page="${descriptor.globalConfigPage}"/>
-          </f:rowSet>
-        </j:forEach>
-        <f:bottomButtonBar>
-          <f:submit value="${%Save}"/>
-          <f:apply/>
-        </f:bottomButtonBar>
-      </f:form>
-    </l:main-panel>
-  </l:layout>
+  <l:settings-subpage permission="${app.ADMINISTER}">
+    <f:form action="configure" method="post" name="config">
+      <j:set var="instance" value="${it}"/>
+      <j:set var="descriptor" value="${it.descriptor}"/>
+      <j:forEach var="descriptor" items="${h.getSortedDescriptorsForGlobalConfigByDescriptor(it.FILTER)}">
+        <j:set var="instance" value="${descriptor}"/>
+        <f:rowSet name="${descriptor.jsonSafeClassName}">
+          <st:include from="${descriptor}" page="${descriptor.globalConfigPage}"/>
+        </f:rowSet>
+      </j:forEach>
+      <f:bottomButtonBar>
+        <f:submit value="${%Save}"/>
+        <f:apply/>
+      </f:bottomButtonBar>
+    </f:form>
+  </l:settings-subpage>
+
 </j:jelly>
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/ViewCredentialsAction/index.jelly b/src/main/resources/com/cloudbees/plugins/credentials/ViewCredentialsAction/index.jelly
index 481629d61..20572c4e5 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/ViewCredentialsAction/index.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/ViewCredentialsAction/index.jelly
@@ -24,20 +24,10 @@
  ~ THE SOFTWARE.
  -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout"
-         xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:c="/lib/credentials" xmlns:dd="/lib/layout/dropdowns">
-  <j:set var="isUserContext" value="${it.context.class.simpleName == 'User'}"/>
-  <l:layout title="${it.fullDisplayName}" permission="${it.VIEW}"
-            type="${!isUserContext ? 'one-column' : 'two-column'}">
-    <st:adjunct includes="com.cloudbees.plugins.credentials.common.card"/>
-
-    <j:if test="${isUserContext}">
-      <st:include page="sidepanel.jelly" it="${it.context}"/>
-    </j:if>
-
-    <l:main-panel>
-      <l:app-bar title="${%Credentials}">
-        <t:help href="https://www.jenkins.io/doc/book/security/credentials/"/>
-      </l:app-bar>
+         xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:c="/lib/credentials" xmlns:d="jelly:define" xmlns:local="local" xmlns:dd="/lib/layout/dropdowns">
+  <d:taglib uri="local">
+    <d:tag name="contents">
+      <st:adjunct includes="com.cloudbees.plugins.credentials.common.card"/>
 
       <j:set var="stores" value="${it.stores}"/>
       <j:set var="tableEntries" value="${it.tableEntries}"/>
@@ -149,6 +139,36 @@
           </div>
         </f:section>
       </j:if>
-    </l:main-panel>
-  </l:layout>
+    </d:tag>
+  </d:taglib>
+
+  <j:set var="header">
+    <l:view>
+      <l:app-bar title="${it.displayName}">
+        <t:help href="https://www.jenkins.io/doc/book/security/credentials/"/>
+      </l:app-bar>
+    </l:view>
+  </j:set>
+
+  <j:choose>
+    <j:when test="${it.context == app}">
+      <l:settings-subpage header="${header}" managementLink="${it.managementLink}" noDefer="true">
+        <local:contents/>
+      </l:settings-subpage>
+    </j:when>
+    <j:otherwise>
+      <j:set var="isUserContext" value="${it.context.class.simpleName == 'User'}"/>
+      <l:layout title="${it.fullDisplayName}" permission="${it.VIEW}"
+                type="${isUserContext ? 'two-column' : 'one-column'}">
+        <j:if test="${isUserContext}">
+          <st:include page="sidepanel.jelly" it="${it.context}"/>
+        </j:if>
+
+        <l:main-panel>
+          <j:out value="${header}"/>
+          <local:contents/>
+        </l:main-panel>
+      </l:layout>
+    </j:otherwise>
+  </j:choose>
 </j:jelly>
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/common/card.css b/src/main/resources/com/cloudbees/plugins/credentials/common/card.css
index 4fd9addc2..2ee8f8e7f 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/common/card.css
+++ b/src/main/resources/com/cloudbees/plugins/credentials/common/card.css
@@ -1,3 +1,8 @@
+/* Temporary workaround until core no longer clips dropdown menus */
+.app-settings-container__inner {
+    overflow-x: unset;
+}
+
 .masked-credential {
     opacity: 0.3;
 
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/links/Messages.properties b/src/main/resources/com/cloudbees/plugins/credentials/links/Messages.properties
new file mode 100644
index 000000000..879915b9a
--- /dev/null
+++ b/src/main/resources/com/cloudbees/plugins/credentials/links/Messages.properties
@@ -0,0 +1,5 @@
+NewDomainLink.displayName=New domain
+UpdateDomainLink.displayName=Update domain
+NewCredentialsLink.displayName=New credentials
+MoveCredentialsLink.displayName=Move credentials
+UpdateCredentialsLink.displayName=Update credentials
diff --git a/src/test/java/com/cloudbees/plugins/credentials/fingerpints/FingerprintTest.java b/src/test/java/com/cloudbees/plugins/credentials/fingerpints/FingerprintTest.java
index 88f4f3467..df98c76ec 100644
--- a/src/test/java/com/cloudbees/plugins/credentials/fingerpints/FingerprintTest.java
+++ b/src/test/java/com/cloudbees/plugins/credentials/fingerpints/FingerprintTest.java
@@ -88,7 +88,6 @@ void parameterizedBuildUsageTracked() throws Exception {
 
         JenkinsRule.WebClient wc = j.createWebClient();
         HtmlPage page = wc.goTo("credentials/store/system/domain/_/credentials/secret-id");
-        assertThat("Have usage tracking reported", page.getElementById("usage"), notNullValue());
         assertThat("No fingerprint created until first use", page.getElementById("usage-missing"), notNullValue());
         assertThat("No fingerprint created until first use", page.getElementById("usage-present"), nullValue());
 
@@ -110,7 +109,6 @@ void parameterizedBuildUsageTracked() throws Exception {
         assertThat("A job that does nothing does not use parameterized credentials", fingerprint, nullValue());
 
         page = wc.goTo("credentials/store/system/domain/_/credentials/secret-id");
-        assertThat("Have usage tracking reported", page.getElementById("usage"), notNullValue());
         assertThat("No fingerprint created until first use", page.getElementById("usage-missing"), notNullValue());
         assertThat("No fingerprint created until first use", page.getElementById("usage-present"), nullValue());