diff --git a/README.md b/README.md
index 158b9187..467d0c63 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Activate the Role-Based Strategy by using the standard _Manage Jenkins > Configu
 
 ![Configure Security](/docs/images/configureSecurity.png)
 
-After the installation, the plugin can be configured using the _Manage and Assign Roles_ screen accessible from _Manage Jenkins_ .
+After the installation, the plugin can be configured using the _Role Management_ screen accessible from _Manage Jenkins_ .
 
 ### Configuring roles
 
diff --git a/docs/delegating-role-management/README.md b/docs/delegating-role-management/README.md
index fd3f9962..be1917eb 100644
--- a/docs/delegating-role-management/README.md
+++ b/docs/delegating-role-management/README.md
@@ -21,14 +21,14 @@ The `Jenkins.SYSTEM_READ` permission can be enabled either via a system property
 
 Users who have `ITEM_ROLES_ADMIN` or `AGENT_ROLES_ADMIN` **and** `SYSTEM_READ` (or `ADMINISTER`) can access role management through the standard "Manage Jenkins" menu. They will see:
 
-- **Manage Jenkins -> Manage and Assign Roles**: Standard access path
+- **Manage Jenkins -> Role Management**: Standard access path
 - They can view all role sections in read-only mode, but can only edit the sections they have permission for
 
 ### Without SYSTEM_READ Permission
 
 Users who have `ITEM_ROLES_ADMIN` or `AGENT_ROLES_ADMIN` **without** `SYSTEM_READ` cannot access "Manage Jenkins". For these users, a special root-level link is provided:
 
-- **Root Dashboard -> Manage and Assign Roles**: Direct link at the Jenkins root level
+- **Root Dashboard -> Role Management**: Direct link at the Jenkins root level
 - This link is only visible to users with role admin permissions but without `SYSTEM_READ`
 - It provides the same functionality as the management link, but accessible without needing to access "Manage Jenkins"
 
@@ -86,37 +86,37 @@ mvn hpi:run
 ### Test Each User
 
 1. **admin / admin**
-   - Go to "Manage Jenkins" � "Manage and Assign Roles"
+   - Go to "Manage Jenkins" � "Role Management"
    - Can edit all three sections (Global, Item, Agent)
    - Has full control
 
 2. **item-admin / item-admin**
-   - **Note the root-level link** "Manage and Assign Roles" (not under "Manage Jenkins")
+   - **Note the root-level link** "Role Management" (not under "Manage Jenkins")
    - Click it to go to role management
    - Can edit Item roles (editable checkboxes, add/delete buttons visible)
    - Can **view** Global and Agent roles in read-only mode (checkboxes disabled, no add/delete buttons)
 
 3. **item-admin-sysread / item-admin-sysread**
-   - Go to "Manage Jenkins" � "Manage and Assign Roles"
+   - Go to "Manage Jenkins" � "Role Management"
    - Same editing capabilities as `item-admin`, but accessed via Manage Jenkins
    - No root-level link visible
 
 4. **agent-admin / agent-admin**
-   - **Note the root-level link** "Manage and Assign Roles"
+   - **Note the root-level link** "Role Management"
    - Can edit Agent roles
    - Can **view** Global and Item roles in read-only mode
 
 5. **agent-admin-sysread / agent-admin-sysread**
-   - Go to "Manage Jenkins" � "Manage and Assign Roles"
+   - Go to "Manage Jenkins" � "Role Management"
    - Same editing capabilities as `agent-admin`, but accessed via Manage Jenkins
 
 6. **both-admin / both-admin**
-   - **Note the root-level link** "Manage and Assign Roles"
+   - **Note the root-level link** "Role Management"
    - Can edit both Item and Agent roles
    - Can **view** Global roles in read-only mode
 
 7. **both-admin-sysread / both-admin-sysread**
-   - Go to "Manage Jenkins" � "Manage and Assign Roles"
+   - Go to "Manage Jenkins" � "Role Management"
    - Same editing capabilities as `both-admin`, but accessed via Manage Jenkins
 
 ## Expected Behavior
diff --git a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/Messages.properties b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/Messages.properties
index 612036d5..2f3f9e97 100644
--- a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/Messages.properties
+++ b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/Messages.properties
@@ -24,7 +24,7 @@
 RoleBasedAuthorizationStrategy.DisplayName=Role-Based Strategy
 RoleBasedAuthorizationStrategy.Description=Handle permissions by creating roles and assigning them to users/groups
 RoleBasedAuthorizationStrategy.Manage=Manage Roles
-RoleBasedAuthorizationStrategy.ManageAndAssign=Manage and Assign Roles
+RoleBasedAuthorizationStrategy.ManageAndAssign=Role Management
 RoleBasedAuthorizationStrategy.Assign=Assign Roles
 RoleBasedAuthorizationStrategy.ListAvalMacro=List Available Macros
 RoleBasedAuthorizationStrategy.PermissionGroupTitle=Role Based Strategy
diff --git a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-roles.jelly b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-roles.jelly
deleted file mode 100644
index 31cb3b83..00000000
--- a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-roles.jelly
+++ /dev/null
@@ -1,241 +0,0 @@
-<!--
-  - The MIT License
-  -
-  - Copyright (c) 2010-2011, Manufacture Française des Pneumatiques Michelin,
-  - Thomas Maurel, Romain Seguy
-  -
-  - Parts:
-  -   Node ownership: Oleg Nenashev <nenashev@synopsys.com>, Synopsys 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:f="/lib/form" xmlns:local="local">
-    <l:layout permissions="${it.strategy.SYSTEM_READ_AND_SOME_ROLES_ADMIN}" title="${%Assign Roles}" norefresh="true">
-      <l:breadcrumb title="Assign Roles"/>
-        <st:include page="sidepanel.jelly"/>
-        <l:main-panel>
-          <link rel="stylesheet" href="${rootURL}/plugin/role-strategy/css/role-strategy.css" type="text/css" />
-          <script type="text/javascript" src="${rootURL}/plugin/role-strategy/js/table.js" />
-          <script type="text/javascript" src="${rootURL}/plugin/role-strategy/js/tableAssign.js" />
-          <j:if test="${empty(descriptorPath)}">
-            <j:set var="descriptorPath" value="${rootURL}/descriptor/${it.strategy.descriptor.clazz.name}"/>
-          </j:if>
-
-          <d:taglib uri="local">
-            <d:tag name="table">
-              <div id="${attrs.id}-container" class="rsp-roles-container" data-highlighter="${attrs.highlighter}" data-template="${attrs.template}">
-                <j:set var="rspMode" value="rsp-filters"/>
-                <d:invokeBody/>
-                <table id="${attrs.id}" class="jenkins-table jenkins-table--small jenkins-table--auto-width role-strategy-table ${readOnlyMode ? 'read-only' : ''}" name="data"
-                       data-template-id="${attrs.template}">
-
-                  <!-- The first row will show grouping -->
-                  <local:thead roles="${attrs.roles}" showPattern="true" neededPermission="${attrs.neededPermission}"/>
-                  <tbody>
-                    <tr>
-                      <td colspan="100%"><l:spinner text="${%Loading Data}"/></td>
-                    </tr>
-                  </tbody>
-                  <local:tfoot roles="${attrs.roles}" showPattern="${attrs.showPattern}" neededPermission="${attrs.neededPermission}"/>
-                </table>
-                <j:set var="rspMode" value="rsp-navigation"/>
-                <d:invokeBody/>
-              </div>
-            </d:tag>
-            <d:tag name="thead">
-              <thead>
-                <tr class="group-row highlight-row">
-                  <l:hasPermission permission="${attrs.neededPermission}"><td class="start" /></l:hasPermission>
-                  <th class="rsp-table__header-column">
-                    ${%User/Group}
-                  </th>
-                  <j:forEach var="role" items="${attrs.roles}" varStatus="s">
-                    <j:set var="permissionList" value="&lt;b&gt;Permissions&lt;/b&gt;:"/>
-                    <j:forEach var="p" items="${role.key.permissions}">
-                      <j:set var="permissionList" value="${permissionList}&lt;br/&gt;${p.group.title}/${p.name}"/>
-                    </j:forEach>
-                    <j:set var="patternTooltip" value=""/>
-                    <j:if test="${attrs.showPattern == 'true'}">
-                      <j:set var="patternTooltip" value="  &lt;br/&gt; &lt;b&gt;Pattern&lt;/b&gt;: ${h.escape(role.key.pattern.toString())}"/>
-                    </j:if>
-                    <j:set var="permissionList" value="${permissionList} ${patternTooltip}"/>
-                    <th class="rsp-table--vertical rsp-table__header-column rsp-table--header-th ${s.first ? 'first' : ''} ${s.last ? 'last' : ''}">
-                      <span data-html-tooltip="${permissionList}">${role.key.name}</span>
-                    </th>
-                  </j:forEach>
-                  <l:hasPermission permission="${attrs.neededPermission}"><td class="stop" /></l:hasPermission>
-                </tr>
-              </thead>
-            </d:tag>
-            <d:tag name="tfoot">
-              <tfoot class="jenkins-hidden">
-                <tr class="group-row highlight-row">
-                  <l:hasPermission permission="${attrs.neededPermission}"><td class="start" /></l:hasPermission>
-                  <th class="rsp-table__footer-column">
-                    ${%User/Group}
-                  </th>
-                  <j:forEach var="role" items="${attrs.roles}" varStatus="s">
-                    <j:set var="permissionList" value="&lt;b&gt;Permissions&lt;/b&gt;:"/>
-                    <j:forEach var="p" items="${role.key.permissions}">
-                      <j:set var="permissionList" value="${permissionList}&lt;br/&gt;${p.group.title}/${p.name}"/>
-                    </j:forEach>
-                    <j:set var="patternTooltip" value=""/>
-                    <j:if test="${attrs.showPattern == 'true'}">
-                      <j:set var="patternTooltip" value="  &lt;br/&gt; &lt;b&gt;Pattern&lt;/b&gt;: ${h.escape(role.key.pattern.toString())}"/>
-                    </j:if>
-                    <j:set var="permissionList" value="${permissionList} ${patternTooltip}"/>
-                    <th class="rsp-table--vertical rsp-table__footer-column rsp-table--header-th ${s.first ? 'first' : ''} ${s.last ? 'last' : ''}">
-                      <span data-html-tooltip="${permissionList}">${role.key.name}</span>
-                    </th>
-                  </j:forEach>
-                  <l:hasPermission permission="${attrs.neededPermission}"><td class="stop" /></l:hasPermission>
-                </tr>
-              </tfoot>
-            </d:tag>
-            <d:tag name="navigationButtons">
-              <div class="rsp-navigation__entries jenkins-hidden jenkins-!-margin-bottom-3">
-                <button type="button" class="jenkins-button rsp-navigation__button-entry-up" tooltip="${%Previous page of Users/Groups}">
-                  <l:icon src="symbol-arrow-up-outline plugin-ionicons-api" class="icon-md"/>
-                </button>
-                <div class="jenkins-select">
-                  <select class="jenkins-select__input rsp-navigation__select">
-                  </select>
-                </div>
-                <button type="button" class="jenkins-button rsp-navigation__button-entry-down" tooltip="${%Next page of Users/Groups}">
-                  <l:icon src="symbol-arrow-down-outline plugin-ionicons-api" class="icon-md"/>
-                </button>
-              </div>
-            </d:tag>
-            <d:tag name="addButtons">
-              <div class="jenkins-buttons-row jenkins-buttons-row--equal-width">
-                <button type="button" class="jenkins-button role-strategy-add-button" data-template-id="${id}" data-table-id="${attrs.tableid}" data-highlighter="${attrs.highlighter}"
-                    data-type="USER"
-                    data-prompt="${%promptUser}"
-                    data-empty-message="${%emptyUser}"
-                    data-error-message="${%userExists}"
-                >${%Add User}</button>
-                <button type="button" class="jenkins-button role-strategy-add-button" data-template-id="${id}" data-table-id="${attrs.tableid}" data-highlighter="${attrs.highlighter}"
-                    data-type="GROUP"
-                    data-prompt="${%promptGroup}"
-                    data-empty-message="${%emptyGroup}"
-                    data-error-message="${%groupExists}"
-                >${%Add Group}</button>
-              </div>
-              <j:if test="${it.strategy.descriptor.hasAmbiguousEntries(attrs.roles)}">
-                <div class="jenkins-alert jenkins-alert-warning" data-table-id="${attrs.tableid}">
-                  ${%ambiguous}
-                </div>
-              </j:if>
-            </d:tag>
-            <d:tag name="userRow">
-              <j:set var="permissionEntry" value="${it.strategy.descriptor.entryFor(attrs.permissionType, attrs.sid)}"/>
-              <l:hasPermission permission="${attrs.neededPermission}">
-                <td class="start">
-                    <div class="rsp-remove">
-                      <l:icon src="symbol-trash-outline plugin-ionicons-api" class="icon-sm icon-red rsp-table__icon"/>
-                    </div>
-                </td>
-              </l:hasPermission>
-              <td class="left-most">${title}</td>
-              <j:set var="pattern" value="&lt;b&gt;Pattern&lt;/b&gt; : ${h.escape(r.key.pattern.toString())}"/>
-              <j:forEach var="r" items="${it.strategy.getGrantedRolesEntries(attrs.type)}">
-                <j:set var="pattern" value="&lt;b&gt;Pattern&lt;/b&gt; : ${h.escape(r.key.pattern.toString())}"/>
-                <j:if test="${attrs.type == it.strategy.GLOBAL}">
-                  <j:set var="pattern" value=""/>
-                </j:if>
-                <td class="rsp-highlight-input" data-role-name="${r.key.name}" data-html-tooltip="&lt;b&gt;Role&lt;/b&gt;: ${h.escape(r.key.name)} &lt;br/&gt; &lt;b&gt;${attrs.typedescription}&lt;/b&gt;: ${h.escape(attrs.title)} &lt;br/&gt; ${pattern}">
-                  <f:checkbox name="[${r.key.name}]" checked="${r.value.contains(permissionEntry)}" class="rsp-checkbox"/>
-                </td>
-              </j:forEach>
-              <l:hasPermission permission="${attrs.neededPermission}">
-                <td class="stop">
-                  <div class="rsp-table__cell">
-                    <div class="rsp-remove">
-                      <l:icon src="symbol-trash-outline plugin-ionicons-api" class="icon-sm icon-red rsp-table__icon" htmlTooltip="&lt;b&gt;${attrs.typedescription}&lt;/b&gt;: ${h.escape(attrs.title)}"/>
-                    </div>
-                    <!-- migration options -->
-                    <button class="migrate migrate_user jenkins-hidden" type="button">
-                      <l:icon alt="${%Migrate entry to user}" tooltip="${%migrate_user('{{USER}}')}" src="symbol-person-outline plugin-ionicons-api" class="icon-sm rsp-table__icon" />
-                    </button>
-                    <button class="migrate migrate_group jenkins-hidden" type="button">
-                      <l:icon alt="${%Migrate entry to group}" tooltip="${%migrate_group('{{USER}}')}" src="symbol-people-outline plugin-ionicons-api" class="icon-sm rsp-table__icon" />
-                    </button>
-                  </div>
-                </td>
-              </l:hasPermission>
-            </d:tag>
-          </d:taglib>
-
-          <div id="assign-roles" data-fetch-url="${rootURL}/role-strategy/strategy/getRoleAssignments"
-               data-save-url="${rootURL}/role-strategy/strategy/saveRoleAssignments" data-text-anonymous="${%Anonymous}"
-               data-text-authenticated="${%Authenticated Users}"
-               data-max-rows="${it.maxRows}"/>
-          <template id="assign-roles-icons">
-            <l:icon src="symbol-people-outline plugin-ionicons-api" class="icon-sm" id="rsp-people-icon"/>
-            <l:icon src="symbol-person-outline plugin-ionicons-api" class="icon-sm" id="rsp-person-icon"/>
-          </template>
-          <div>
-            <h1>
-              ${it.assignRolesName}
-            </h1>
-            <button class="default-hidden" id="rs-dirty-indicator"/>
-
-            <j:if test="${app.hasPermission(app.SYSTEM_READ)}">
-              <f:section title="${%Global roles}">
-                <j:set var="readOnlyMode" value="${!app.hasPermission(app.ADMINISTER)}" />
-                <f:rowSet name="globalRoles">
-                  <f:block><st:include page="assign-global-roles.jelly" optional="true" /></f:block>
-                </f:rowSet>
-              </f:section>
-            </j:if>
-            <j:if test="${app.hasAnyPermission(it.strategy.SYSTEM_READ_AND_ITEM_ROLES_ADMIN)}">
-              <br/>
-              <f:section title="${%Item roles}">
-                <j:set var="readOnlyMode" value="${!app.hasPermission(it.strategy.ITEM_ROLES_ADMIN)}" />
-                <f:rowSet name="projectRoles">
-                  <f:block><st:include page="assign-project-roles.jelly" optional="true" /></f:block>
-                </f:rowSet>
-              </f:section>
-            </j:if>
-            <j:if test="${app.hasPermission(it.strategy.AGENT_ROLES_ADMIN) or app.hasPermission(app.SYSTEM_READ)}">
-              <br/>
-              <f:section title="${%Agent roles}">
-                <j:set var="readOnlyMode" value="${!app.hasPermission(it.strategy.AGENT_ROLES_ADMIN)}" />
-                <f:rowSet name="slaveRoles">
-                  <f:block><st:include page="assign-agent-roles.jelly" optional="true" /></f:block>
-                </f:rowSet>
-              </f:section>
-            </j:if>
-          </div>
-          <f:form method="post" name="config" action="assignSubmit" id="rsp-roles-form">
-            <input type="hidden" name="rolesMapping"/>
-            <input type="hidden" name="submit" value="true"/>
-          </f:form>
-          <j:if test="${app.hasAnyPermission(it.strategy.ADMINISTER_AND_SOME_ROLES_ADMIN)}">
-            <f:bottomButtonBar>
-              <button id="rsp-roles-save" type="button" class="jenkins-button jenkins-button--primary">${%Save}</button>
-              <button id="rsp-roles-apply" type="button" class="jenkins-button" data-message="${%Saved}">${%Apply}</button>
-            </f:bottomButtonBar>
-          </j:if>
-          <st:adjunct includes="lib.form.confirm" />
-        </l:main-panel>
-    </l:layout>
-</j:jelly>
\ No newline at end of file
diff --git a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/index.jelly b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/index.jelly
index d106ff49..85e31161 100644
--- a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/index.jelly
+++ b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/index.jelly
@@ -2,7 +2,7 @@
   - The MIT License
   -
   - Copyright (c) 2010-2011, Manufacture Française des Pneumatiques Michelin,
-  - Thomas Maurel, Romain Seguy, Timothy Bingaman
+  - Thomas Maurel, Romain Seguy
   -
   - Parts:
   -   Node ownership: Oleg Nenashev <nenashev@synopsys.com>, Synopsys Inc.
@@ -28,223 +28,214 @@
 <?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:local="local">
-    <l:layout permissions="${it.strategy.SYSTEM_READ_AND_SOME_ROLES_ADMIN}" norefresh="true" title="${%Manage Roles}">
-      <l:breadcrumb title="Manage Roles"/>
-        <st:include page="sidepanel.jelly"/>
+    <l:layout permissions="${it.strategy.SYSTEM_READ_AND_SOME_ROLES_ADMIN}" title="${it.displayName}" type="one-column">
         <l:main-panel>
           <link rel="stylesheet" href="${rootURL}/plugin/role-strategy/css/role-strategy.css" type="text/css" />
           <script type="text/javascript" src="${rootURL}/plugin/role-strategy/js/table.js" />
-          <script type="text/javascript" src="${rootURL}/plugin/role-strategy/js/tableManage.js" />
-
+          <script type="text/javascript" src="${rootURL}/plugin/role-strategy/js/tableAssign.js" />
           <j:if test="${empty(descriptorPath)}">
             <j:set var="descriptorPath" value="${rootURL}/descriptor/${it.strategy.descriptor.clazz.name}"/>
           </j:if>
 
           <d:taglib uri="local">
+            <d:tag name="table">
+              <div id="${attrs.id}-container" class="rsp-roles-container" data-highlighter="${attrs.highlighter}" data-template="${attrs.template}">
+                <j:set var="rspMode" value="rsp-filters"/>
+                <d:invokeBody/>
+                <table id="${attrs.id}" class="jenkins-table jenkins-table--small jenkins-table--auto-width role-strategy-table ${readOnlyMode ? 'read-only' : ''}" name="data"
+                       data-template-id="${attrs.template}">
+
+                  <!-- The first row will show grouping -->
+                  <local:thead roles="${attrs.roles}" showPattern="true" neededPermission="${attrs.neededPermission}"/>
+                  <tbody>
+                    <tr>
+                      <td colspan="100%"><l:spinner text="${%Loading Data}"/></td>
+                    </tr>
+                  </tbody>
+                  <local:tfoot roles="${attrs.roles}" showPattern="${attrs.showPattern}" neededPermission="${attrs.neededPermission}"/>
+                </table>
+                <j:set var="rspMode" value="rsp-navigation"/>
+                <d:invokeBody/>
+              </div>
+            </d:tag>
             <d:tag name="thead">
               <thead>
-                <tr class="group-row">
-                  <j:if test="${attrs.showRoleName}">
-                    <l:hasPermission permission="${attrs.neededPermission}"><td rowspan="2" class="start" /></l:hasPermission>
-                    <th rowspan="2" class="rsp-table__header-column">
-                      ${%Role}
-                    </th>
-                  </j:if>
-                  <j:if test="${attrs.showPattern}">
-                    <th rowspan="2" class="rsp-table__header-column">
-                      ${%Pattern}
-                    </th>
-                  </j:if>
-                  <j:if test="${attrs.showTemplate}">
-                    <th rowspan="2" class="rsp-table__header-column">
-                      ${%Template}
-                    </th>
-                  </j:if>
-                  <j:forEach var="g" items="${attrs.permissionGroups}" varStatus="s">
-                    <j:set var="cnt" value="${0}" />
-                    <j:forEach var="p" items="${g.permissions}">
-                      <j:if test="${it.strategy.descriptor.showPermission(attrs.strategy, p)}">
-                        <j:set var="cnt" value="${cnt+1}"/>
-                      </j:if>
+                <tr class="group-row highlight-row">
+                  <l:hasPermission permission="${attrs.neededPermission}"><td class="start" /></l:hasPermission>
+                  <th class="rsp-table__header-column">
+                    ${%User/Group}
+                  </th>
+                  <j:forEach var="role" items="${attrs.roles}" varStatus="s">
+                    <j:set var="permissionList" value="&lt;b&gt;Permissions&lt;/b&gt;:"/>
+                    <j:forEach var="p" items="${role.key.permissions}">
+                      <j:set var="permissionList" value="${permissionList}&lt;br/&gt;${p.group.title}/${p.name}"/>
                     </j:forEach>
-
-                    <th colspan="${cnt}" class="rsp-table--header-th ${s.first ? 'first' : ''} ${s.last ? 'last' : ''}">
-                      ${g.title}
+                    <j:set var="patternTooltip" value=""/>
+                    <j:if test="${attrs.showPattern == 'true'}">
+                      <j:set var="patternTooltip" value="  &lt;br/&gt; &lt;b&gt;Pattern&lt;/b&gt;: ${h.escape(role.key.pattern.toString())}"/>
+                    </j:if>
+                    <j:set var="permissionList" value="${permissionList} ${patternTooltip}"/>
+                    <th class="rsp-table--vertical rsp-table__header-column rsp-table--header-th ${s.first ? 'first' : ''} ${s.last ? 'last' : ''}">
+                      <span data-html-tooltip="${permissionList}">${role.key.name}</span>
                     </th>
                   </j:forEach>
-                  <j:if test="${attrs.showRoleName != 'false'}">
-                    <l:hasPermission permission="${attrs.neededPermission}"><td rowspan="2" class="stop" /></l:hasPermission>
-                  </j:if>
-                </tr>
-                <!-- The second row for individual permission -->
-                <tr class="caption-row highlight-row">
-                  <j:forEach var="g" items="${attrs.permissionGroups}">
-                    <j:forEach var="p" items="${g.permissions}">
-                      <j:if test="${it.strategy.descriptor.showPermission(attrs.strategy, p)}">
-                        <th tooltip="${p.description}" class="rsp-table__permission">
-                          <span>${p.name}</span>
-                        </th>
-                      </j:if>
-                    </j:forEach>
-                  </j:forEach>
+                  <l:hasPermission permission="${attrs.neededPermission}"><td class="stop" /></l:hasPermission>
                 </tr>
               </thead>
             </d:tag>
             <d:tag name="tfoot">
-              <j:set var="hidefooter" value=""/>
-              <j:if test="${attrs.roles.size() lt 20}">
-                <j:set var="hidefooter" value="default-hidden"/>
-              </j:if>
-              <tfoot class="${hidefooter}">
-                <tr class="caption-row highlight-row">
-                  <l:hasPermission permission="${attrs.neededPermission}"><td rowspan="2" class="start" /></l:hasPermission>
-                  <th rowspan="2" class="rsp-table__footer-column">
-                    ${%Role}
+              <tfoot class="jenkins-hidden">
+                <tr class="group-row highlight-row">
+                  <l:hasPermission permission="${attrs.neededPermission}"><td class="start" /></l:hasPermission>
+                  <th class="rsp-table__footer-column">
+                    ${%User/Group}
                   </th>
-                  <j:if test="${attrs.showPattern}">
-                    <th rowspan="2" class="rsp-table__footer-column">
-                      ${%Pattern}
-                    </th>
-                  </j:if>
-                  <j:if test="${attrs.showTemplate}">
-                    <th rowspan="2" class="rsp-table__footer-column">
-                      ${%Template}
-                    </th>
-                  </j:if>
-                  <j:forEach var="g" items="${attrs.permissionGroups}">
-                    <j:forEach var="p" items="${g.permissions}">
-                      <j:if test="${it.strategy.descriptor.showPermission(attrs.strategy, p)}">
-                        <th tooltip="${p.description}" class="rsp-table__permission rsp-table__permission-footer">
-                          <span>${p.name}</span>
-                        </th>
-                      </j:if>
-                    </j:forEach>
-                  </j:forEach>
-                </tr>
-                <tr class="group-row">
-                  <j:forEach var="g" items="${attrs.permissionGroups}" varStatus="s">
-                    <j:set var="cnt" value="${0}" />
-                    <j:forEach var="p" items="${g.permissions}">
-                      <j:if test="${it.strategy.descriptor.showPermission(attrs.strategy, p)}">
-                        <j:set var="cnt" value="${cnt+1}"/>
-                      </j:if>
+                  <j:forEach var="role" items="${attrs.roles}" varStatus="s">
+                    <j:set var="permissionList" value="&lt;b&gt;Permissions&lt;/b&gt;:"/>
+                    <j:forEach var="p" items="${role.key.permissions}">
+                      <j:set var="permissionList" value="${permissionList}&lt;br/&gt;${p.group.title}/${p.name}"/>
                     </j:forEach>
-
-                    <th colspan="${cnt}" class="rsp-table--header-th ${s.first ? 'first' : ''} ${s.last ? 'last' : ''}">
-                      ${g.title}
+                    <j:set var="patternTooltip" value=""/>
+                    <j:if test="${attrs.showPattern == 'true'}">
+                      <j:set var="patternTooltip" value="  &lt;br/&gt; &lt;b&gt;Pattern&lt;/b&gt;: ${h.escape(role.key.pattern.toString())}"/>
+                    </j:if>
+                    <j:set var="permissionList" value="${permissionList} ${patternTooltip}"/>
+                    <th class="rsp-table--vertical rsp-table__footer-column rsp-table--header-th ${s.first ? 'first' : ''} ${s.last ? 'last' : ''}">
+                      <span data-html-tooltip="${permissionList}">${role.key.name}</span>
                     </th>
                   </j:forEach>
+                  <l:hasPermission permission="${attrs.neededPermission}"><td class="stop" /></l:hasPermission>
                 </tr>
               </tfoot>
             </d:tag>
-            <d:tag name="addButton">
-              <button type="button" class="jenkins-button role-strategy-add-button" data-template-id="${id}" data-table-id="${attrs.tableid}" data-highlighter="${attrs.highlighter}">${%Add}</button>
+            <d:tag name="navigationButtons">
+              <div class="rsp-navigation__entries jenkins-hidden jenkins-!-margin-bottom-3">
+                <button type="button" class="jenkins-button rsp-navigation__button-entry-up" tooltip="${%Previous page of Users/Groups}">
+                  <l:icon src="symbol-arrow-up-outline plugin-ionicons-api" class="icon-md"/>
+                </button>
+                <div class="jenkins-select">
+                  <select class="jenkins-select__input rsp-navigation__select">
+                  </select>
+                </div>
+                <button type="button" class="jenkins-button rsp-navigation__button-entry-down" tooltip="${%Next page of Users/Groups}">
+                  <l:icon src="symbol-arrow-down-outline plugin-ionicons-api" class="icon-md"/>
+                </button>
+              </div>
+            </d:tag>
+            <d:tag name="addButtons">
+              <div class="jenkins-buttons-row jenkins-buttons-row--equal-width">
+                <button type="button" class="jenkins-button role-strategy-add-button" data-template-id="${id}" data-table-id="${attrs.tableid}" data-highlighter="${attrs.highlighter}"
+                    data-type="USER"
+                    data-prompt="${%promptUser}"
+                    data-empty-message="${%emptyUser}"
+                    data-error-message="${%userExists}"
+                >${%Add User}</button>
+                <button type="button" class="jenkins-button role-strategy-add-button" data-template-id="${id}" data-table-id="${attrs.tableid}" data-highlighter="${attrs.highlighter}"
+                    data-type="GROUP"
+                    data-prompt="${%promptGroup}"
+                    data-empty-message="${%emptyGroup}"
+                    data-error-message="${%groupExists}"
+                >${%Add Group}</button>
+              </div>
+              <j:if test="${it.strategy.descriptor.hasAmbiguousEntries(attrs.roles)}">
+                <div class="jenkins-alert jenkins-alert-warning" data-table-id="${attrs.tableid}">
+                  ${%ambiguous}
+                </div>
+              </j:if>
             </d:tag>
-            <d:tag name="roleRow">
-              <j:if test="${attrs.showRoleName}">
-                <l:hasPermission permission="${attrs.neededPermission}">
-                  <td class="start">
+            <d:tag name="userRow">
+              <j:set var="permissionEntry" value="${it.strategy.descriptor.entryFor(attrs.permissionType, attrs.sid)}"/>
+              <l:hasPermission permission="${attrs.neededPermission}">
+                <td class="start">
                     <div class="rsp-remove">
                       <l:icon src="symbol-trash-outline plugin-ionicons-api" class="icon-sm icon-red rsp-table__icon"/>
                     </div>
-                  </td>
-                </l:hasPermission>
-                <td class="left-most" style="white-space: nowrap;">${title}</td>
-              </j:if>
-              <j:set var="pattern" value=""/>
-              <j:set var="patternTemplate" value=""/>
-              <j:if test="${attrs.showPattern}">
-                <j:set var="pattern" value="&lt;br/&gt; &lt;b&gt;Pattern&lt;/b&gt;: ${attrs.pattern}"/>
-                <j:set var="patternTemplate" value="&lt;br/&gt; &lt;b&gt;Pattern&lt;/b&gt;: {{PATTERNTEMPLATE}}"/>
-                <j:if test="${attrs.pattern != '{{PATTERN}}'}">
-                  <j:set var="pattern" value="&lt;br/&gt; &lt;b&gt;Pattern&lt;/b&gt;: ${h.escape(attrs.role.pattern.toString())}"/>
-                </j:if>
-                <td>
-                  <div class="pattern-cell">
-                      <l:icon src="symbol-pencil plugin-ionicons-api" class="icon-pencil icon-sm" tooltip="Edit pattern"/>
-                      <span data-edit="false">
-                        <div class="patternAnchor" data-pattern="${attrs.role.pattern}" tooltip="Show matching">&quot;${attrs.role.pattern.toString()}&quot;</div>
-                        <input class="patternEdit" type="hidden" name="[pattern]" value="${attrs.role.pattern}" />
-                      </span>
-                  </div>
-
                 </td>
-                <j:if test="${attrs.showTemplate}">
-                  <td>
-                    <div class="pattern-cell">
-                      ${attrs.templateName}
-                      <input type="hidden" name="templateName" value="${attrs.templateName}" disabled="true"/>
-                    </div>
-                  </td>
+              </l:hasPermission>
+              <td class="left-most">${title}</td>
+              <j:set var="pattern" value="&lt;b&gt;Pattern&lt;/b&gt; : ${h.escape(r.key.pattern.toString())}"/>
+              <j:forEach var="r" items="${it.strategy.getGrantedRolesEntries(attrs.type)}">
+                <j:set var="pattern" value="&lt;b&gt;Pattern&lt;/b&gt; : ${h.escape(r.key.pattern.toString())}"/>
+                <j:if test="${attrs.type == it.strategy.GLOBAL}">
+                  <j:set var="pattern" value=""/>
                 </j:if>
-              </j:if>
-
-              <j:set var="tableItems" value="${it.strategy.descriptor.getGroups(attrs.type)}"/>
-              <j:forEach var="g" items="${tableItems}">
-                <j:forEach var="p" items="${g.permissions}">
-                  <j:if test="${it.strategy.descriptor.showPermission(attrs.type, p)}">
-                    <td
-                        class="rsp-highlight-input permissionInput"
-                        data-implied-by-list="${it.strategy.descriptor.impliedByList(p)}"
-                        data-permission-id="${p.id}"
-                        data-disable-checkboxes="${attrs.disable}"
-                        data-tooltip-template="&lt;b&gt;Permission&lt;/b&gt;: ${g.title}/${p.name}{{GRANTBYOTHER}} &lt;br/&gt; &lt;b&gt;Role&lt;/b&gt;: ${h.escape(attrs.title)} ${patternTemplate}">
-                      <f:checkbox name="[${p.id}]" checked="${attrs.role.hasPermission(p)}"/>
-                    </td>
-                  </j:if>
-                </j:forEach>
+                <td class="rsp-highlight-input" data-role-name="${r.key.name}" data-html-tooltip="&lt;b&gt;Role&lt;/b&gt;: ${h.escape(r.key.name)} &lt;br/&gt; &lt;b&gt;${attrs.typedescription}&lt;/b&gt;: ${h.escape(attrs.title)} &lt;br/&gt; ${pattern}">
+                  <f:checkbox name="[${r.key.name}]" checked="${r.value.contains(permissionEntry)}" class="rsp-checkbox"/>
+                </td>
               </j:forEach>
-              <j:if test="${attrs.showRoleName}">
-                <l:hasPermission permission="${attrs.neededPermission}">
-                  <td class="stop">
+              <l:hasPermission permission="${attrs.neededPermission}">
+                <td class="stop">
+                  <div class="rsp-table__cell">
                     <div class="rsp-remove">
-                      <l:icon src="symbol-trash-outline plugin-ionicons-api" class="icon-sm icon-red rsp-table__icon" htmlTooltip="&lt;b&gt;Role&lt;/b&gt;: ${h.escape(attrs.title)}"/>
+                      <l:icon src="symbol-trash-outline plugin-ionicons-api" class="icon-sm icon-red rsp-table__icon" htmlTooltip="&lt;b&gt;${attrs.typedescription}&lt;/b&gt;: ${h.escape(attrs.title)}"/>
                     </div>
-                  </td>
-                </l:hasPermission>
-              </j:if>
+                    <!-- migration options -->
+                    <button class="migrate migrate_user jenkins-hidden" type="button">
+                      <l:icon alt="${%Migrate entry to user}" tooltip="${%migrate_user('{{USER}}')}" src="symbol-person-outline plugin-ionicons-api" class="icon-sm rsp-table__icon" />
+                    </button>
+                    <button class="migrate migrate_group jenkins-hidden" type="button">
+                      <l:icon alt="${%Migrate entry to group}" tooltip="${%migrate_group('{{USER}}')}" src="symbol-people-outline plugin-ionicons-api" class="icon-sm rsp-table__icon" />
+                    </button>
+                  </div>
+                </td>
+              </l:hasPermission>
             </d:tag>
           </d:taglib>
 
-          <f:form method="post" name="config" action="rolesSubmit">
-            <h1>
-              ${it.manageRolesName}
-            </h1>
+          <l:app-bar title="${it.displayName}">
+            <a href="${rootURL}/manage/${it.urlName}/manage-roles" class="jenkins-button">
+              ${%Manage Roles}
+            </a>
+          </l:app-bar>
+          <div id="assign-roles" data-fetch-url="${rootURL}/role-strategy/strategy/getRoleAssignments"
+               data-save-url="${rootURL}/role-strategy/strategy/saveRoleAssignments" data-text-anonymous="${%Anonymous}"
+               data-text-authenticated="${%Authenticated Users}"
+               data-max-rows="${it.maxRows}"/>
+          <template id="assign-roles-icons">
+            <l:icon src="symbol-people-outline plugin-ionicons-api" class="icon-sm" id="rsp-people-icon"/>
+            <l:icon src="symbol-person-outline plugin-ionicons-api" class="icon-sm" id="rsp-person-icon"/>
+          </template>
+          <div>
             <button class="default-hidden" id="rs-dirty-indicator"/>
 
             <j:if test="${app.hasPermission(app.SYSTEM_READ)}">
               <f:section title="${%Global roles}">
                 <j:set var="readOnlyMode" value="${!app.hasPermission(app.ADMINISTER)}" />
                 <f:rowSet name="globalRoles">
-                  <f:block><st:include page="manage-global-roles.jelly" optional="true" /></f:block>
+                  <f:block><st:include page="assign-global-roles.jelly" optional="true" /></f:block>
                 </f:rowSet>
               </f:section>
             </j:if>
-            <j:if test="${app.hasPermission(it.strategy.ITEM_ROLES_ADMIN) or app.hasPermission(app.SYSTEM_READ)}">
+            <j:if test="${app.hasAnyPermission(it.strategy.SYSTEM_READ_AND_ITEM_ROLES_ADMIN)}">
+              <br/>
               <f:section title="${%Item roles}">
                 <j:set var="readOnlyMode" value="${!app.hasPermission(it.strategy.ITEM_ROLES_ADMIN)}" />
                 <f:rowSet name="projectRoles">
-                  <f:block><st:include page="manage-project-roles.jelly" optional="true" /></f:block>
+                  <f:block><st:include page="assign-project-roles.jelly" optional="true" /></f:block>
                 </f:rowSet>
               </f:section>
             </j:if>
             <j:if test="${app.hasPermission(it.strategy.AGENT_ROLES_ADMIN) or app.hasPermission(app.SYSTEM_READ)}">
+              <br/>
               <f:section title="${%Agent roles}">
                 <j:set var="readOnlyMode" value="${!app.hasPermission(it.strategy.AGENT_ROLES_ADMIN)}" />
                 <f:rowSet name="slaveRoles">
-                  <f:block><st:include page="manage-agent-roles.jelly" optional="true" /></f:block>
+                  <f:block><st:include page="assign-agent-roles.jelly" optional="true" /></f:block>
                 </f:rowSet>
               </f:section>
             </j:if>
-            <j:if test="${app.hasAnyPermission(it.strategy.ADMINISTER_AND_SOME_ROLES_ADMIN)}">
-              <f:bottomButtonBar>
-                <f:submit value="${%Save}" />
-                <f:apply />
-              </f:bottomButtonBar>
-            </j:if>
+          </div>
+          <f:form method="post" name="config" action="assignSubmit" id="rsp-roles-form">
+            <input type="hidden" name="rolesMapping"/>
+            <input type="hidden" name="submit" value="true"/>
           </f:form>
-          <div class="overlay default-hidden"/>
+          <j:if test="${app.hasAnyPermission(it.strategy.ADMINISTER_AND_SOME_ROLES_ADMIN)}">
+            <f:bottomButtonBar>
+              <button id="rsp-roles-save" type="button" class="jenkins-button jenkins-button--primary">${%Save}</button>
+              <button id="rsp-roles-apply" type="button" class="jenkins-button" data-message="${%Saved}">${%Apply}</button>
+            </f:bottomButtonBar>
+          </j:if>
           <st:adjunct includes="lib.form.confirm" />
         </l:main-panel>
     </l:layout>
-</j:jelly>
+</j:jelly>
\ No newline at end of file
diff --git a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-roles.properties b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/index.properties
similarity index 100%
rename from src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-roles.properties
rename to src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/index.properties
diff --git a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-agent-roles.jelly b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-agent-roles.jelly
index 27c6eb9a..693cce78 100644
--- a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-agent-roles.jelly
+++ b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-agent-roles.jelly
@@ -57,6 +57,7 @@
   <l:hasPermission permission="${neededPermission}">
     <br/>
     <f:entry title="${%Role to add}">
+      <a href="list-macros">${%View available macros}</a>
       <f:textbox id="${tableid}text" />
     </f:entry>
     <f:entry help="${rootURL}/plugin/role-strategy/help/help-pattern.html" title="${%Pattern}">
diff --git a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-project-roles.jelly b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-project-roles.jelly
index 9a8410cb..415860d5 100644
--- a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-project-roles.jelly
+++ b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-project-roles.jelly
@@ -67,6 +67,7 @@
   <l:hasPermission permission="${neededPermission}">
     <br />
     <f:entry title="${%Role to add}">
+      <a href="list-macros">${%View available macros}</a>
       <f:textbox id="${tableid}text" />
     </f:entry>
     <f:entry help="${rootURL}/plugin/role-strategy/help/help-pattern.html" title="${%Pattern}">
diff --git a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-roles.jelly b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-roles.jelly
new file mode 100644
index 00000000..abca6837
--- /dev/null
+++ b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-roles.jelly
@@ -0,0 +1,252 @@
+<!--
+  - The MIT License
+  -
+  - Copyright (c) 2010-2011, Manufacture Française des Pneumatiques Michelin,
+  - Thomas Maurel, Romain Seguy, Timothy Bingaman
+  -
+  - Parts:
+  -   Node ownership: Oleg Nenashev <nenashev@synopsys.com>, Synopsys 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:f="/lib/form" xmlns:local="local">
+    <l:layout permissions="${it.strategy.SYSTEM_READ_AND_SOME_ROLES_ADMIN}" type="one-column" title="${%Roles}">
+      <l:breadcrumb title="Manage Roles"/>
+        <l:main-panel>
+          <link rel="stylesheet" href="${rootURL}/plugin/role-strategy/css/role-strategy.css" type="text/css" />
+          <script type="text/javascript" src="${rootURL}/plugin/role-strategy/js/table.js" />
+          <script type="text/javascript" src="${rootURL}/plugin/role-strategy/js/tableManage.js" />
+
+          <j:if test="${empty(descriptorPath)}">
+            <j:set var="descriptorPath" value="${rootURL}/descriptor/${it.strategy.descriptor.clazz.name}"/>
+          </j:if>
+
+          <d:taglib uri="local">
+            <d:tag name="thead">
+              <thead>
+                <tr class="group-row">
+                  <j:if test="${attrs.showRoleName}">
+                    <l:hasPermission permission="${attrs.neededPermission}"><td rowspan="2" class="start" /></l:hasPermission>
+                    <th rowspan="2" class="rsp-table__header-column">
+                      ${%Role}
+                    </th>
+                  </j:if>
+                  <j:if test="${attrs.showPattern}">
+                    <th rowspan="2" class="rsp-table__header-column">
+                      ${%Pattern}
+                    </th>
+                  </j:if>
+                  <j:if test="${attrs.showTemplate}">
+                    <th rowspan="2" class="rsp-table__header-column">
+                      ${%Template}
+                    </th>
+                  </j:if>
+                  <j:forEach var="g" items="${attrs.permissionGroups}" varStatus="s">
+                    <j:set var="cnt" value="${0}" />
+                    <j:forEach var="p" items="${g.permissions}">
+                      <j:if test="${it.strategy.descriptor.showPermission(attrs.strategy, p)}">
+                        <j:set var="cnt" value="${cnt+1}"/>
+                      </j:if>
+                    </j:forEach>
+
+                    <th colspan="${cnt}" class="rsp-table--header-th ${s.first ? 'first' : ''} ${s.last ? 'last' : ''}">
+                      ${g.title}
+                    </th>
+                  </j:forEach>
+                  <j:if test="${attrs.showRoleName != 'false'}">
+                    <l:hasPermission permission="${attrs.neededPermission}"><td rowspan="2" class="stop" /></l:hasPermission>
+                  </j:if>
+                </tr>
+                <!-- The second row for individual permission -->
+                <tr class="caption-row highlight-row">
+                  <j:forEach var="g" items="${attrs.permissionGroups}">
+                    <j:forEach var="p" items="${g.permissions}">
+                      <j:if test="${it.strategy.descriptor.showPermission(attrs.strategy, p)}">
+                        <th tooltip="${p.description}" class="rsp-table__permission">
+                          <span>${p.name}</span>
+                        </th>
+                      </j:if>
+                    </j:forEach>
+                  </j:forEach>
+                </tr>
+              </thead>
+            </d:tag>
+            <d:tag name="tfoot">
+              <j:set var="hidefooter" value=""/>
+              <j:if test="${attrs.roles.size() lt 20}">
+                <j:set var="hidefooter" value="default-hidden"/>
+              </j:if>
+              <tfoot class="${hidefooter}">
+                <tr class="caption-row highlight-row">
+                  <l:hasPermission permission="${attrs.neededPermission}"><td rowspan="2" class="start" /></l:hasPermission>
+                  <th rowspan="2" class="rsp-table__footer-column">
+                    ${%Role}
+                  </th>
+                  <j:if test="${attrs.showPattern}">
+                    <th rowspan="2" class="rsp-table__footer-column">
+                      ${%Pattern}
+                    </th>
+                  </j:if>
+                  <j:if test="${attrs.showTemplate}">
+                    <th rowspan="2" class="rsp-table__footer-column">
+                      ${%Template}
+                    </th>
+                  </j:if>
+                  <j:forEach var="g" items="${attrs.permissionGroups}">
+                    <j:forEach var="p" items="${g.permissions}">
+                      <j:if test="${it.strategy.descriptor.showPermission(attrs.strategy, p)}">
+                        <th tooltip="${p.description}" class="rsp-table__permission rsp-table__permission-footer">
+                          <span>${p.name}</span>
+                        </th>
+                      </j:if>
+                    </j:forEach>
+                  </j:forEach>
+                </tr>
+                <tr class="group-row">
+                  <j:forEach var="g" items="${attrs.permissionGroups}" varStatus="s">
+                    <j:set var="cnt" value="${0}" />
+                    <j:forEach var="p" items="${g.permissions}">
+                      <j:if test="${it.strategy.descriptor.showPermission(attrs.strategy, p)}">
+                        <j:set var="cnt" value="${cnt+1}"/>
+                      </j:if>
+                    </j:forEach>
+
+                    <th colspan="${cnt}" class="rsp-table--header-th ${s.first ? 'first' : ''} ${s.last ? 'last' : ''}">
+                      ${g.title}
+                    </th>
+                  </j:forEach>
+                </tr>
+              </tfoot>
+            </d:tag>
+            <d:tag name="addButton">
+              <button type="button" class="jenkins-button role-strategy-add-button" data-template-id="${id}" data-table-id="${attrs.tableid}" data-highlighter="${attrs.highlighter}">${%Add}</button>
+            </d:tag>
+            <d:tag name="roleRow">
+              <j:if test="${attrs.showRoleName}">
+                <l:hasPermission permission="${attrs.neededPermission}">
+                  <td class="start">
+                    <div class="rsp-remove">
+                      <l:icon src="symbol-trash-outline plugin-ionicons-api" class="icon-sm icon-red rsp-table__icon"/>
+                    </div>
+                  </td>
+                </l:hasPermission>
+                <td class="left-most" style="white-space: nowrap;">${title}</td>
+              </j:if>
+              <j:set var="pattern" value=""/>
+              <j:set var="patternTemplate" value=""/>
+              <j:if test="${attrs.showPattern}">
+                <j:set var="pattern" value="&lt;br/&gt; &lt;b&gt;Pattern&lt;/b&gt;: ${attrs.pattern}"/>
+                <j:set var="patternTemplate" value="&lt;br/&gt; &lt;b&gt;Pattern&lt;/b&gt;: {{PATTERNTEMPLATE}}"/>
+                <j:if test="${attrs.pattern != '{{PATTERN}}'}">
+                  <j:set var="pattern" value="&lt;br/&gt; &lt;b&gt;Pattern&lt;/b&gt;: ${h.escape(attrs.role.pattern.toString())}"/>
+                </j:if>
+                <td>
+                  <div class="pattern-cell">
+                      <l:icon src="symbol-pencil plugin-ionicons-api" class="icon-pencil icon-sm" tooltip="Edit pattern"/>
+                      <span data-edit="false">
+                        <div class="patternAnchor" data-pattern="${attrs.role.pattern}" tooltip="Show matching">&quot;${attrs.role.pattern.toString()}&quot;</div>
+                        <input class="patternEdit" type="hidden" name="[pattern]" value="${attrs.role.pattern}" />
+                      </span>
+                  </div>
+
+                </td>
+                <j:if test="${attrs.showTemplate}">
+                  <td>
+                    <div class="pattern-cell">
+                      ${attrs.templateName}
+                      <input type="hidden" name="templateName" value="${attrs.templateName}" disabled="true"/>
+                    </div>
+                  </td>
+                </j:if>
+              </j:if>
+
+              <j:set var="tableItems" value="${it.strategy.descriptor.getGroups(attrs.type)}"/>
+              <j:forEach var="g" items="${tableItems}">
+                <j:forEach var="p" items="${g.permissions}">
+                  <j:if test="${it.strategy.descriptor.showPermission(attrs.type, p)}">
+                    <td
+                        class="rsp-highlight-input permissionInput"
+                        data-implied-by-list="${it.strategy.descriptor.impliedByList(p)}"
+                        data-permission-id="${p.id}"
+                        data-disable-checkboxes="${attrs.disable}"
+                        data-tooltip-template="&lt;b&gt;Permission&lt;/b&gt;: ${g.title}/${p.name}{{GRANTBYOTHER}} &lt;br/&gt; &lt;b&gt;Role&lt;/b&gt;: ${h.escape(attrs.title)} ${patternTemplate}">
+                      <f:checkbox name="[${p.id}]" checked="${attrs.role.hasPermission(p)}"/>
+                    </td>
+                  </j:if>
+                </j:forEach>
+              </j:forEach>
+              <j:if test="${attrs.showRoleName}">
+                <l:hasPermission permission="${attrs.neededPermission}">
+                  <td class="stop">
+                    <div class="rsp-remove">
+                      <l:icon src="symbol-trash-outline plugin-ionicons-api" class="icon-sm icon-red rsp-table__icon" htmlTooltip="&lt;b&gt;Role&lt;/b&gt;: ${h.escape(attrs.title)}"/>
+                    </div>
+                  </td>
+                </l:hasPermission>
+              </j:if>
+            </d:tag>
+          </d:taglib>
+
+          <l:app-bar title="${%Roles}">
+              <a href="permission-templates" class="jenkins-button">
+                ${%Permission Templates}
+              </a>
+          </l:app-bar>
+
+          <f:form method="post" name="config" action="rolesSubmit">
+            <button class="default-hidden" id="rs-dirty-indicator"/>
+
+            <j:if test="${app.hasPermission(app.SYSTEM_READ)}">
+              <f:section title="${%Global roles}">
+                <j:set var="readOnlyMode" value="${!app.hasPermission(app.ADMINISTER)}" />
+                <f:rowSet name="globalRoles">
+                  <f:block><st:include page="manage-global-roles.jelly" optional="true" /></f:block>
+                </f:rowSet>
+              </f:section>
+            </j:if>
+            <j:if test="${app.hasPermission(it.strategy.ITEM_ROLES_ADMIN) or app.hasPermission(app.SYSTEM_READ)}">
+              <f:section title="${%Item roles}">
+                <j:set var="readOnlyMode" value="${!app.hasPermission(it.strategy.ITEM_ROLES_ADMIN)}" />
+                <f:rowSet name="projectRoles">
+                  <f:block><st:include page="manage-project-roles.jelly" optional="true" /></f:block>
+                </f:rowSet>
+              </f:section>
+            </j:if>
+            <j:if test="${app.hasPermission(it.strategy.AGENT_ROLES_ADMIN) or app.hasPermission(app.SYSTEM_READ)}">
+              <f:section title="${%Agent roles}">
+                <j:set var="readOnlyMode" value="${!app.hasPermission(it.strategy.AGENT_ROLES_ADMIN)}" />
+                <f:rowSet name="slaveRoles">
+                  <f:block><st:include page="manage-agent-roles.jelly" optional="true" /></f:block>
+                </f:rowSet>
+              </f:section>
+            </j:if>
+            <j:if test="${app.hasAnyPermission(it.strategy.ADMINISTER_AND_SOME_ROLES_ADMIN)}">
+              <f:bottomButtonBar>
+                <f:submit value="${%Save}" />
+                <f:apply />
+              </f:bottomButtonBar>
+            </j:if>
+          </f:form>
+          <div class="overlay default-hidden"/>
+          <st:adjunct includes="lib.form.confirm" />
+        </l:main-panel>
+    </l:layout>
+</j:jelly>
diff --git a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-roles_fr.properties b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-roles_fr.properties
similarity index 100%
rename from src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/assign-roles_fr.properties
rename to src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/manage-roles_fr.properties
diff --git a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/permission-templates.jelly b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/permission-templates.jelly
index cbd0a72d..b337e974 100644
--- a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/permission-templates.jelly
+++ b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/permission-templates.jelly
@@ -25,11 +25,9 @@
 <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:local="local">
 
-  <l:layout permissions="${it.strategy.SYSTEM_READ_AND_ITEM_ROLES_ADMIN}" norefresh="true" title="${%Permission Templates}">
+  <l:layout permissions="${it.strategy.SYSTEM_READ_AND_ITEM_ROLES_ADMIN}" type="one-column" title="${%Permission Templates}">
     <l:breadcrumb title="Permission Templates"/>
 
-    <st:include page="sidepanel.jelly"/>
-
     <j:set var="itemPermissionGroups" value="${it.strategy.descriptor.getGroups(it.strategy.PROJECT)}"/>
     <j:set var="permissionTemplates" value="${it.strategy.getPermissionTemplates()}"/>
     <j:set var="tableid" value="permissionTemplates"/>
@@ -88,10 +86,8 @@
       <j:if test="${empty(descriptorPath)}">
         <j:set var="descriptorPath" value="${rootURL}/descriptor/${it.strategy.descriptor.clazz.name}"/>
       </j:if>
-      <h1>
-        ${%Permission Templates}
-      </h1>
-      ${%blurb}
+      <l:app-bar title="${%Permission Templates}" />
+      <span class="jenkins-page-description">${%blurb}</span>
       <f:form method="post" name="config" action="templatesSubmit" class="jenkins-!-margin-top-5">
         <div id="permissionInputFilter" data-table-id="${tableid}" data-initial-size="${permissionTemplates.size()}"
              class="row-filter">
diff --git a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/sidepanel.jelly b/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/sidepanel.jelly
deleted file mode 100644
index f94c0388..00000000
--- a/src/main/resources/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyConfig/sidepanel.jelly
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-  - The MIT License
-  -
-  - Copyright (c) 2023, Markus Winter
-  -
-  - 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:f="/lib/form" xmlns:i="jelly:fmt">
-    <l:side-panel sticky="true">
-        <l:tasks>
-            <l:task href="${rootURL}/manage/role-strategy/" icon="symbol-finger-print-outline plugin-ionicons-api" title="${%Manage Roles}"/>
-            <l:task href="${rootURL}/manage/role-strategy/assign-roles" icon="symbol-people-outline plugin-ionicons-api" title="${%Assign Roles}"/>
-            <l:task href="${rootURL}/manage/role-strategy/permission-templates" icon="symbol-braces plugin-role-strategy" title="${%Permission Templates}" permissions="${it.strategy.SYSTEM_READ_AND_ITEM_ROLES_ADMIN}"/>
-            <l:task href="${rootURL}/manage/role-strategy/list-macros" icon="symbol-extension-puzzle-outline plugin-ionicons-api" title="${%Role Strategy Macros}"/>
-        </l:tasks>
-    </l:side-panel>
-</j:jelly>
\ No newline at end of file
diff --git a/src/main/resources/org/jenkinsci/plugins/rolestrategy/AmbiguousSidsAdminMonitor/message.jelly b/src/main/resources/org/jenkinsci/plugins/rolestrategy/AmbiguousSidsAdminMonitor/message.jelly
index 91171441..25272d8c 100644
--- a/src/main/resources/org/jenkinsci/plugins/rolestrategy/AmbiguousSidsAdminMonitor/message.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/rolestrategy/AmbiguousSidsAdminMonitor/message.jelly
@@ -8,7 +8,7 @@
       </form>
     </div>
     <div/>
-    <form method="get" action="${rootURL}/role-strategy/assign-roles">
+    <form method="get" action="${rootURL}/manage/role-strategy/">
       <f:submit value="${%Examine}"/>
     </form>
     <div>There are several permissions declared in Role Based Strategy plugin configuration, that are ambiguous. Classify them correctly with 'USER:username' or 'GROUP:groupname'.</div>
diff --git a/src/test/java/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyRootActionTest.java b/src/test/java/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyRootActionTest.java
index 3cfb260e..56a0ef25 100644
--- a/src/test/java/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyRootActionTest.java
+++ b/src/test/java/com/michelin/cio/hudson/plugins/rolestrategy/RoleStrategyRootActionTest.java
@@ -200,19 +200,6 @@ void testRootActionForbiddenForDeveloper() throws Exception {
         "Developer without admin permissions should get 403 when accessing /role-strategy/");
   }
 
-  @Test
-  void testRootActionDelegatesToRoleStrategyConfig() throws Exception {
-    webClient.login("itemAdminUser", "itemAdminUser");
-
-    // Test that subpages work through the root action
-    URL url = new URL(jenkinsRule.jenkins.getRootUrl() + "role-strategy/assign-roles");
-    WebRequest request = new WebRequest(url, HttpMethod.GET);
-
-    Page page = webClient.getPage(request);
-    assertEquals(HttpURLConnection.HTTP_OK, page.getWebResponse().getStatusCode(),
-        "itemAdmin should be able to access /role-strategy/assign-roles through RootAction delegation");
-  }
-
   @Test
   void testManageRoleStrategyPageAccessibleForSystemReadUser() throws Exception {
     webClient.login("systemReadUser", "systemReadUser");