diff --git a/Jenkinsfile b/Jenkinsfile
index 033a4bab2..81318cdfb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,4 @@
 buildPlugin(configurations: [
-                [platform: 'linux', jdk: '8'],
-                [platform: 'linux', jdk: '11'],
-                [platform: 'windows', jdk: '11'],
-            ])
+    [platform: 'linux', jdk: '11'],
+    [platform: 'windows', jdk: '11'],
+])
diff --git a/pom.xml b/pom.xml
index 258fe3bb8..f510d9524 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
-    <jenkins.version>2.346.1</jenkins.version>
+    <jenkins.version>2.361.1</jenkins.version>
     <antlr4.version>4.9.3</antlr4.version>
   </properties>
 
@@ -88,8 +88,8 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.346.x</artifactId>
-        <version>1382.v7d694476f340</version>
+        <artifactId>bom-2.361.x</artifactId>
+        <version>1607.va_c1576527071</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/src/main/java/com/cloudbees/plugins/credentials/CredentialsStore.java b/src/main/java/com/cloudbees/plugins/credentials/CredentialsStore.java
index a1c1d8646..fd3626c55 100644
--- a/src/main/java/com/cloudbees/plugins/credentials/CredentialsStore.java
+++ b/src/main/java/com/cloudbees/plugins/credentials/CredentialsStore.java
@@ -452,7 +452,8 @@ public String getRelativeLinkToContext() {
             return null;
         }
         if (context instanceof Jenkins) {
-            return URI.create(request.getContextPath() + "/").normalize().toString();
+            String suffix = Jenkins.get().hasPermission(Jenkins.ADMINISTER) ? "/manage/" : "/";
+            return URI.create(request.getContextPath() + suffix).normalize().toString();
         }
         if (context instanceof User) {
             return URI.create(request.getContextPath() + "/" + ((User) context).getUrl()+"/")
@@ -537,6 +538,22 @@ public final String getContextDisplayName() {
         }
     }
 
+    /**
+     * Resolves a display name from the Store
+     * @return the display name
+     */
+    public String getDisplayName() {
+        Class<?> c = this.getClass();
+        while (c.getEnclosingClass() != null) {
+            c = c.getEnclosingClass();
+        }
+        String name = c.getSimpleName().replaceAll("(?i)(Impl|Credentials|Provider|Store)+", "");
+        if (StringUtils.isBlank(name)) {
+            name = c.getSimpleName();
+        }
+        return StringUtils.join(StringUtils.splitByCharacterTypeCamelCase(name), ' ');
+    }
+
     /**
      * Return the {@link CredentialsStoreAction} for this store. The action will be displayed as a sub-item of the
      * {@link ViewCredentialsAction}. Return {@code null} if this store will take control of displaying its action
diff --git a/src/main/java/com/cloudbees/plugins/credentials/CredentialsStoreAction.java b/src/main/java/com/cloudbees/plugins/credentials/CredentialsStoreAction.java
index f511c9284..0f523bc64 100644
--- a/src/main/java/com/cloudbees/plugins/credentials/CredentialsStoreAction.java
+++ b/src/main/java/com/cloudbees/plugins/credentials/CredentialsStoreAction.java
@@ -86,7 +86,6 @@
 import net.sf.json.JSONObject;
 import org.acegisecurity.AccessDeniedException;
 import org.apache.commons.lang.StringUtils;
-import org.jenkins.ui.icon.IconSet;
 import org.jenkins.ui.icon.IconSpec;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -240,15 +239,7 @@ public String getIconFileName() {
     public String getDisplayName() {
         CredentialsStore store = getStore();
         if (this == store.getStoreAction()) {
-            Class<?> c = store.getClass();
-            while (c.getEnclosingClass() != null) {
-                c = c.getEnclosingClass();
-            }
-            String name = c.getSimpleName().replaceAll("(?i)(Impl|Credentials|Provider|Store)+", "");
-            if (StringUtils.isBlank(name)) {
-                name = c.getSimpleName();
-            }
-            return StringUtils.join(StringUtils.splitByCharacterTypeCamelCase(name), ' ');
+            return store.getDisplayName();
         } else {
             return Messages.CredentialsStoreAction_DisplayName();
         }
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/concurrentModification.jelly b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/concurrentModification.jelly
index 71a28ceae..77c7c10d2 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/concurrentModification.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/concurrentModification.jelly
@@ -29,7 +29,7 @@
 <?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="${it.fullDisplayName}" norefresh="true" permission="${it.domain.parent.VIEW}">
+  <l:layout title="${it.fullDisplayName}" permission="${it.domain.parent.VIEW}">
     <st:include page="sidepanel.jelly"/>
     <l:main-panel>
       <h1>${%Concurrent Modification}</h1>
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
index b2e258977..186246216 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/delete.jelly
@@ -1,6 +1,6 @@
 <?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}" norefresh="true" permission="${it.domain.parent.DELETE}">
+  <l:layout title="${%Delete credentials}" permission="${it.domain.parent.DELETE}">
 		<st:include page="sidepanel.jelly" />
 		<l:main-panel>
       <h1>${%Delete credentials}</h1>
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 692da3a1e..742b91c58 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
@@ -28,7 +28,7 @@
 -->
 <?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}" norefresh="true" permission="${it.domain.parent.VIEW}">
+  <l:layout title="${it.fullDisplayName}" permission="${it.domain.parent.VIEW}">
     <st:include page="sidepanel.jelly"/>
     <l:main-panel>
       <h1>${it.displayName}</h1>
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 d4898446d..f863801af 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,6 +1,6 @@
 <?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}" norefresh="true" permission="${it.domain.parent.DELETE}">
+  <l:layout title="${%Move credentials}" permission="${it.domain.parent.DELETE}">
 		<st:include page="sidepanel.jelly" />
 		<l:main-panel>
       <h1>${%Move credentials}</h1>
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
index 968c00207..454136c7f 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel.jelly
@@ -27,7 +27,6 @@
   <l:side-panel>
     <l:tasks>
     <j:set var="url" value="${h.getNearestAncestorUrl(request,it)}"/>
-      <l:task icon="icon-up icon-md" href="../.." title="${%backto(it.domain.displayName)}" contextMenu="false"/>
       <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}"/>
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel.properties
deleted file mode 100644
index 17177d7ad..000000000
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel.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.
-#
-backto=Back to {0}
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel_de.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel_de.properties
index f0ad91ac1..4a6f7d2f9 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel_de.properties
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel_de.properties
@@ -21,6 +21,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-backto=Zur\u00FCck zu {0}
 Update=Bearbeiten
 Delete=L\u00F6schen
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel_fr.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel_fr.properties
index 5af4342ca..cda85f7e5 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel_fr.properties
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel_fr.properties
@@ -20,7 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-backto=Revenir \u00e0 {0}
 Update=Mettre \u00e0 jour
 Delete=Supprimer
 Move=D\u00e9placer
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel_it.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel_it.properties
index 3a84234a9..76756ce70 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel_it.properties
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel_it.properties
@@ -20,7 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-backto=Torna a {0}
 Delete=Elimina
 Move=Sposta
 Update=Aggiorna
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel_ja.properties b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel_ja.properties
index d7061892c..5f9981604 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel_ja.properties
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/CredentialsWrapper/sidepanel_ja.properties
@@ -21,7 +21,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-backto={0}\u3078\u623b\u308b
 Update=\u66f4\u65b0
 Delete=\u524a\u9664
 Move=\u79fb\u52d5
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 b75f51ef0..20d8405b4 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
@@ -29,7 +29,7 @@
 <?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}" norefresh="true" permission="${it.domain.parent.UPDATE}">
+  <l:layout title="${%Update credentials}" permission="${it.domain.parent.UPDATE}">
     <st:include page="sidepanel.jelly"/>
     <l:main-panel>
       <h1>${%Update credentials}</h1>
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 d9802f98a..b83347bdb 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
@@ -29,8 +29,7 @@
 <?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}" norefresh="true" permission="${it.parent.MANAGE_DOMAINS}">
-    <st:include page="sidepanel.jelly"/>
+  <l:layout title="${%Update domain}" permission="${it.parent.MANAGE_DOMAINS}" type="one-column">
     <l:main-panel>
       <h1>${%Update domain}</h1>
       <j:set var="descriptor" value="${it.descriptor}"/>
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
index 1ce2cf46d..5c1ad7d78 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/delete.jelly
@@ -1,7 +1,6 @@
 <?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}" norefresh="true" permission="${it.parent.MANAGE_DOMAINS}">
-		<st:include page="sidepanel.jelly" />
+  <l:layout title="${%Delete domain}" permission="${it.parent.MANAGE_DOMAINS}" type="one-column">
 		<l:main-panel>
       <h1>${%Delete domain}</h1>
       <j:choose>
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 7bc784e9a..121efe4db 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
@@ -25,9 +25,27 @@
  -->
 <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="${it.fullDisplayName}" norefresh="true" permission="${it.parent.VIEW}">
-    <st:include page="sidepanel.jelly"/>
-    <l:app-bar title="${it.displayName}" />
+  <l:layout title="${it.fullDisplayName}" permission="${it.parent.VIEW}" type="one-column">
+    <l:app-bar title="${it.displayName}">
+      <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 test="${!it.global and it.parent.domainsModifiable}">
+        <l:hasPermission permission="${it.parent.CREATE}">
+          <a href="configure" class="jenkins-button">
+            <l:icon class="icon-setting icon-md" />
+            ${%Configure domain}
+          </a>
+          <a href="delete" class="jenkins-button jenkins-button--destructive jenkins-!-destructive-color">
+            <l:icon class="icon-edit-delete icon-md" />
+            ${%Delete domain}
+          </a>
+        </l:hasPermission>
+      </j:if>
+    </l:app-bar>
     <l:main-panel>
       <div>
         <j:out value="${it.description!=null ? app.markupFormatter.translate(it.description) : ''}" />
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 534c03640..9dce2c2f2 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
@@ -25,8 +25,7 @@
  -->
 <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}">
-    <st:include page="sidepanel.jelly"/>
+  <l:layout title="${%New credentials}" permission="${it.parent.CREATE}" type="one-column">
     <l:main-panel>
       <h1>${%New credentials}</h1>
       <j:set var="descriptor" value="${it.credentialDescriptor}"/>
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/sidepanel.jelly b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/sidepanel.jelly
deleted file mode 100644
index d2194cedb..000000000
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/sidepanel.jelly
+++ /dev/null
@@ -1,38 +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(request,it)}"/>
-    <l:task icon="icon-up icon-md" href="../.." title="${%Back to credential domains}" contextMenu="false"/>
-      <l:task icon="symbol-add" href="newCredentials" title="${%Add Credentials}" permission="${it.parent.CREATE}" />
-      <j:if test="${!it.global and it.parent.domainsModifiable}">
-      <l:task icon="icon-setting icon-md" href="${url}/configure" title="${%Configure}" permission="${it.parent.MANAGE_DOMAINS}"/>
-      <l:task icon="icon-edit-delete icon-md" href="${url}/delete" title="${%Delete domain}" permission="${it.parent.MANAGE_DOMAINS}"/>
-      </j:if>
-    </l:tasks>
-  </l:side-panel>
-</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 1b218c299..e911be27f 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/index.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/index.jelly
@@ -27,16 +27,25 @@
          xmlns:f="/lib/form" xmlns:c="/lib/credentials" xmlns:t="/lib/hudson">
   <j:choose>
     <j:when test="${it.hasPermission(it.VIEW) and !it.visible}">
-      <l:layout title="${it.fullDisplayName}" norefresh="true">
+      <l:layout title="${it.fullDisplayName}" type="one-column">
         <l:main-panel>
           <h1>Not found</h1>
         </l:main-panel>
       </l:layout>
     </j:when>
     <j:otherwise>
-      <l:layout title="${it.fullDisplayName}" norefresh="true" permission="${it.VIEW}">
-        <st:include it="${it.store.context}" page="sidepanel.jelly"/>
-        <l:app-bar title="${it.displayName}" />
+      <l:layout title="${it.fullDisplayName}" permission="${it.VIEW}" type="one-column">
+        <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:main-panel>
           <t:setIconSize/>
           <table class="jenkins-table ${iconSize == '16x16' ? 'jenkins-table--small' : iconSize == '24x24' ? 'jenkins-table--medium' : ''} sortable">
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 b0fccbac2..c34c314dc 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/newDomain.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/newDomain.jelly
@@ -25,8 +25,7 @@
 <?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}" norefresh="true" permission="${it.MANAGE_DOMAINS}">
-    <st:include it="${it.store.context}" page="sidepanel.jelly"/>
+  <l:layout title="${%New domain}" permission="${it.MANAGE_DOMAINS}" type="one-column">
     <l:main-panel>
       <h1>${%New domain}</h1>
       <j:set var="descriptor" value="${it.domainDescriptor}"/>
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 bad6787cd..e9412e42f 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/GlobalCredentialsConfiguration/index.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/GlobalCredentialsConfiguration/index.jelly
@@ -25,7 +25,7 @@
  -->
 <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}" norefresh="true" permission="${app.ADMINISTER}">
+  <l:layout title="${it.displayName}" permission="${app.ADMINISTER}">
     <st:include it="${app}" page="sidepanel"/>
     <l:main-panel>
       <h1>${it.displayName}</h1>
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 cc9186060..8137dbf4b 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/ViewCredentialsAction/index.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/ViewCredentialsAction/index.jelly
@@ -25,8 +25,7 @@
  -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson">
-  <l:layout title="${it.fullDisplayName}" norefresh="true" permission="${it.VIEW}">
-    <st:include it="${it.context}" page="sidepanel.jelly"/>
+  <l:layout title="${it.fullDisplayName}" permission="${it.VIEW}" type="one-column">
     <l:app-bar title="${%Credentials}" />
     <l:main-panel>
       <style>
@@ -66,7 +65,7 @@
               <td data="${stores.indexOf(d.store)}">
                 <a href="${storeAction==null?d.store.relativeLinkToAction:d.store.relativeLinkToContext+'credentials/store/'+storeAction.urlName}"
                    class='model-link inside jenkins-table__link'>
-                  ${d.store.contextDisplayName}
+                  ${d.store.context == app ? d.store.displayName : d.store.contextDisplayName}
                 </a>
               </td>
               <td>
@@ -121,7 +120,7 @@
               <td data="${stores.indexOf(d.store)}">
                 <a href="${storeAction==null?store.relativeLinkToAction:store.relativeLinkToContext+'credentials/store/'+storeAction.urlName}"
                    class='model-link inside jenkins-table__link'>
-                  ${store.contextDisplayName}
+                  ${store.context == app ? store.displayName : store.contextDisplayName}
                 </a>
               </td>
               <td>
@@ -173,7 +172,7 @@
               <td data="${stores.indexOf(store)}">
                 <a href="${storeAction==null?store.relativeLinkToAction:store.relativeLinkToContext+'credentials/store/'+storeAction.urlName}"
                    class='model-link inside jenkins-table__link'>
-                  ${store.contextDisplayName}
+                  ${store.context == app ? store.displayName : store.contextDisplayName}
                 </a>
               </td>
               <td>
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/ViewCredentialsAction/index.properties b/src/main/resources/com/cloudbees/plugins/credentials/ViewCredentialsAction/index.properties
index 0ad53a14d..cdda9a2e5 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/ViewCredentialsAction/index.properties
+++ b/src/main/resources/com/cloudbees/plugins/credentials/ViewCredentialsAction/index.properties
@@ -1,2 +1,2 @@
 global=(global)
-storesScopedTo=Stores scoped to <a href=".." class='model-link inside'>{0}</a>
+storesScopedTo=Stores scoped to {0}
diff --git a/src/main/resources/com/cloudbees/plugins/credentials/impl/CertificateCredentialsImpl/UploadedKeyStoreSource/Upload/index.jelly b/src/main/resources/com/cloudbees/plugins/credentials/impl/CertificateCredentialsImpl/UploadedKeyStoreSource/Upload/index.jelly
index 2c3832479..c03fd9134 100644
--- a/src/main/resources/com/cloudbees/plugins/credentials/impl/CertificateCredentialsImpl/UploadedKeyStoreSource/Upload/index.jelly
+++ b/src/main/resources/com/cloudbees/plugins/credentials/impl/CertificateCredentialsImpl/UploadedKeyStoreSource/Upload/index.jelly
@@ -25,7 +25,7 @@
  -->
 
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" >
-  <l:layout norefresh="true">
+  <l:layout>
     <l:main-panel>
       View no longer required/supported due to the inlining of the file input.
       If you came to this page due to another plugin, you will have to update that plugin to be compatible
diff --git a/src/main/resources/lib/credentials/select.jelly b/src/main/resources/lib/credentials/select.jelly
index 41faaaf7b..c70e14dcf 100644
--- a/src/main/resources/lib/credentials/select.jelly
+++ b/src/main/resources/lib/credentials/select.jelly
@@ -114,7 +114,7 @@
       <j:set var="storeItems" value="${selectHelper.getStoreItems(context, includeUser)}"/>
       <j:choose>
         <j:when test="${selectHelper.hasCreatePermission(context, includeUser) and storeItems != null and !storeItems.isEmpty()}">
-          <button class="credentials-add-menu hetero-list-add jenkins-button jenkins-button--transparent jenkins-!-margin-top-2" menualign="${attrs.menuAlign}"
+          <button class="credentials-add-menu hetero-list-add jenkins-button jenkins-button--transparent jenkins-button--tertiary jenkins-!-margin-top-2" menualign="${attrs.menuAlign}"
                   suffix="${attrs.name}">
             <l:icon src="symbol-add"/>
             ${%Add}
@@ -147,7 +147,7 @@
           </div>
         </j:when>
         <j:otherwise>
-          <button class="credentials-add jenkins-button jenkins-button--transparent jenkins-!-margin-top-2">
+          <button class="credentials-add jenkins-button jenkins-button--transparent jenkins-button--tertiary jenkins-!-margin-top-2">
             <l:icon src="symbol-add"/>
             ${%Add}
           </button>