diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/content-sections/content-sections.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/content-sections/content-sections.xhtml
index 9f8002d56..82c97c886 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/content-sections/content-sections.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/content-sections/content-sections.xhtml
@@ -25,7 +25,7 @@
                 <h1>#{ContentSectionAdminMessages['application_title']}</h1>
 
                 <div class="mb-2">
-                    <bootstrap:modalForm actionTarget="#{mvc.uri('ContentSectionApplicationController#addContentSection')}"
+                    <bootstrap:modalForm actionTarget="#{mvc.basePath}/applications/content-sections/add"
                                          buttonIcon="plus-circle"
                                          buttonText="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.add']}"
                                          buttonTextClass="text-right"
@@ -66,7 +66,7 @@
                             <tr>
                                 <td>#{section.label}</td>
                                 <td class="text-center">
-                                    <bootstrap:modalForm actionTarget="#{mvc.uri('ContentSectionApplicationController#updateContentSection', { 'sectionId': section.sectionId })}"
+                                    <bootstrap:modalForm actionTarget="#{mvc.basePath}/applications/content-sections/#{section.sectionId}/update"
                                                          buttonIcon="plus-circle"
                                                          buttonText="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.edit']}"
                                                          buttonTextClass="text-right"
@@ -96,7 +96,7 @@
                                     </bootstrap:modalForm>
                                 </td>
                                 <td class="text-center">
-                                    <libreccm:deleteDialog actionTarget="#{mvc.uri('ContentSectionApplicationController#deleteContentSection', { 'sectionId': section.sectionId })}"
+                                    <libreccm:deleteDialog actionTarget="#{mvc.basePath}/applications/content-sections/#{section.sectionId}/delete"
                                                            buttonText="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.delete_dialog.button_text']}" 
                                                            cancelLabel="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.delete_dialog.cancel']}"
                                                            confirmLabel="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.delete_dialog.confirm']}"
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml
index aa3dafd87..4bccdef25 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml
@@ -49,14 +49,14 @@
                         <dt>#{AdminMessages['categories.details.path']}</dt>
                         <dd>
                             <c:if test="#{CategoryDetailsModel.categoryPath.domain != null}">
-                                <a href="#{mvc.uri('CategorySystemsController#getCategorySystemDetails', {'categorySystemIdentifier': CategoryDetailsModel.categoryPath.domain.identifier})}">
+                                <a href="#{mvc.basePath}/categorymanager/categorysystems/#{CategoryDetailsModel.categoryPath.domain.identifier}/details">
                                     #{CategoryDetailsModel.categoryPath.domain.domainKey}
                                 </a>
                             </c:if>
                             <c:forEach items="#{CategoryDetailsModel.categoryPath.categories}" 
                                        var="category" >
                                 <span>/</span>
-                                <a href="#{mvc.uri('CategoriesController#getCategory', {'categoryIdentifier': category.identifier})}">
+                                <a href="#{mvc.basePath}/categorymanager/categories/#{category.identifier}">
                                     #{category.name}
                                 </a>
                             </c:forEach>
@@ -105,7 +105,7 @@
 
                 <div class="mb-4">
                     <a class="btn btn-primary"
-                       href="#{mvc.uri('CategoriesController#editCategory', {'categoryIdentifier': CategoryDetailsModel.identifier } )}">
+                       href="#{mvc.basePath}/categorymanager/categories/#{CategoryDetailsModel.identifier}/edit">
                         <bootstrap:svgIcon icon="pen" />
                         <span>#{AdminMessages['categories.details.edit']}</span>
                     </a>
@@ -182,7 +182,7 @@
                 <div class="mb-2">
                     <div class="text-right">
                         <a class="btn btn-secondary"
-                           href="#{mvc.uri('CategoriesController#newSubCategory', {'categoryIdentifier': CategoryDetailsModel.identifier})}">
+                           href="#{mvc.basePath}/categorymanager/categories/#{CategoryDetailsModel.identifier}/subcategories/new">
                             <bootstrap:svgIcon icon="plus-circle" />
                             <span>#{AdminMessages['categories.details.subcategories.add']}</span>
                         </a>
@@ -218,7 +218,7 @@
                                            var="category">
                                     <tr>
                                         <td>
-                                            <a href="#{mvc.uri('CategoriesController#getCategory', { 'categoryIdentifier': category.identifier})}">
+                                            <a href="#{mvc.basePath}/categorymanager/categories/#{category.identifier}">
                                                 #{category.name}
                                             </a>
                                         </td>
@@ -254,7 +254,7 @@
                                         </td>
                                         <td>
                                             <c:if test="#{category.categoryOrder != 1}">
-                                                <form action="#{mvc.uri('CategoriesController#reorderSubCategory', {'categoryIdentifier': CategoryDetailsModel.identifier, 'subCategoryIdentifier': category.identifier})}"
+                                                <form action="#{mvc.basePath}/categorymanager/categories/#{CategoryDetailsModel.identifier}/subcategories/#{category.identifier}/reorder"
                                                       method="post">
                                                     <input name="direction" 
                                                            value="DECREASE"
@@ -269,7 +269,7 @@
                                         </td>
                                         <td>
                                             <c:if test="#{category.categoryOrder lt CategoryDetailsModel.subCategories.size()}">
-                                                <form action="#{mvc.uri('CategoriesController#reorderSubCategory', {'categoryIdentifier': CategoryDetailsModel.identifier, 'subCategoryIdentifier': category.identifier})}"
+                                                <form action="#{mvc.basePath}/categorymanager/categories/#{CategoryDetailsModel.identifier}/subcategories/#{category.identifier}/reorder"
                                                       method="post">
                                                     <input name="direction" 
                                                            value="INCREASE"
@@ -284,7 +284,7 @@
                                         </td>
                                         <td>
                                             <libreccm:deleteDialog 
-                                                actionTarget="#{mvc.uri('CategoriesController#removeSubCategory', {'categoryIdentifier': category.identifier})}"
+                                                actionTarget="#{mvc.basePath}/categorymanager/categories/#{category.identifier}/subcategories/remove"
                                                 buttonText="#{AdminMeesages['categories.details.subcategories.delete']}"
                                                 buttonTextClass="text-center"
                                                 cancelLabel="#{AdminMessages['categories.details.subcategories.delete.cancel']}"
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
index 66532865c..982eb6c73 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
@@ -44,7 +44,7 @@
                     #{AdminMessages['categories.label']}
                 </h1>
 
-                <form action="#{CategoryDetailsModel.new ? mvc.uri('CategoryFormController#createCategory', {'parentCategoryIdentifier': CategoryDetailsModel.parentCategory.identifier }) : mvc.uri('CategoryFormController#updateCategory', {'categoryIdentifier': CategoryDetailsModel.identifier })}" 
+                <form action="#{CategoryDetailsModel.new ? mvc.basePath += '/categorymanager/categories/' += CategoryDetailsModel.parentCategory.identifier += 'new' : mvc.basePath += '/catgorymanager/categories/' += CategoryDetailsModel.identifier += '/edit'}" 
                       method="post">
                     <bootstrap:formGroupText help="#{AdminMessages['categories.form.name.help']}" 
                                              inputId="name" 
@@ -72,7 +72,7 @@
                                          name="abstractCategory"
                                          value="#{CategoryDetailsModel.new ? false : CategoryDetailsModel.abstractCategory}" />
                     <a class="btn btn-warning" 
-                       href="#{mvc.uri('CategoriesController#getCategory', {'categoryIdentifier': CategoryDetailsModel.identifier })}">
+                       href="#{mvc.basePath}/categorymanager/categories/#{CategoryDetailsModel.identifier}">
                         #{AdminMessages['categories.form.buttons.cancel']}
                     </a>
                     <button class="btn btn-success" type="submit">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
index 6af02917b..ee54200c4 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -260,7 +260,7 @@
                                                  id="categorysystem-owner-#{owner.uuid}-remove"
                                                  tabindex="-1">
                                                 <div class="modal-dialog">
-                                                    <form action="#{mvc.uri('CategorySystemsController#removeOwner', { 'categorySystemIdentifier': CategorySystemDetailsModel.identifier, 'applicationUuid': owner.uuid })}"
+                                                    <form action="#{mvc.basePath}/categorymanager/categorysystems/#{CategorySystemDetailsModel.identifier}/owners/#{owner.uuid}/remove"
                                                           class="modal-content"
                                                           method="post">
                                                         <div class="modal-header">
@@ -308,7 +308,7 @@
                 <div class="mb-2">
                     <div class="text-right">
                         <a class="btn btn-secondary"
-                           href="#{mvc.basePath}/categorymanager/categories/#{CategorySystemsIdentifier.rootIdentifier}/subcategories/new">
+                           href="#{mvc.basePath}/categorymanager/categories/#{CategorySystemDetailsModel.rootIdentifier}/subcategories/new">
                             <bootstrap:svgIcon icon="plus-circle" />
                             <span>#{AdminMessages['categorysystems.details.categories.add']}</span>
                         </a>
@@ -382,7 +382,7 @@
                                         </td>
                                         <td>
                                             <c:if test="#{category.categoryOrder != 0}">
-                                                <form action="#{mvc.basePath}/categorymanager/#{CategorySystemDetailsModel.rootIdentifier}/subcategories/#{category.identifier}/reorder"
+                                                <form action="#{mvc.basePath}/categorymanager/categories/#{CategorySystemDetailsModel.rootIdentifier}/subcategories/#{category.identifier}/reorder"
                                                       method="post">
                                                     <input name="direction"
                                                            type="hidden"
@@ -397,7 +397,7 @@
                                         </td>
                                         <td>
                                             <c:if test="#{category.categoryOrder lt CategorySystemDetailsModel.categories.size()}">
-                                                <form action="#{mvc.basePath}/categorymanager/categories/#{CategorySystemDetailsModel.rootIdentifier}/subcategories/#{category.identifier/reorder}"
+                                                <form action="#{mvc.basePath}/categorymanager/categories/#{CategorySystemDetailsModel.rootIdentifier}/subcategories/#{category.identifier}/reorder"
                                                       method="post">
                                                     <input name="direction" 
                                                            value="INCREASE" 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
index ac09993f9..e2ffadd23 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
@@ -13,7 +13,7 @@
                 #{AdminMessages['categorymanager.label']}
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('CategorySystemsController#getCategorySystems')}">
+                <a href="#{mvc.basePath}/categorymanager/categorysystems">
                     #{AdminMessages['categorysystems.label']}
                 </a>
             </li>
@@ -41,7 +41,7 @@
                     </div>
                 </c:forEach>
 
-                <form action="#{CategorySystemDetailsModel.new ? mvc.uri('CategorySystemFormController#createCategorySystem') : mvc.uri('CategorySystemFormController#updateCategorySystem', {'categorySystemIdentifier': CategorySystemDetailsModel.domainKey })}"
+                <form action="#{CategorySystemDetailsModel.new ? mvc.basePath += '/categorymanager/categorysystems/new': mvc.basePath += '/categorymanager/categorysystems/' += CategorySystemDetailsModel.domainKey += '/edit'}"
                       method="post">
                     <div class="form-group">
                         <label for="domainKey">
@@ -104,7 +104,7 @@
                         </small>
                     </div>
                     <a class="btn btn-warning" 
-                       href="#{mvc.uri('CategorySystemsController#getCategorySystems')}">
+                       href="#{mvc.basePath}/categorymanager/categorysystems/">
                         #{AdminMessages['categorysystems.form.buttons.cancel']}
                     </a>
                     <button class="btn btn-success" type="submit">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
index 779cbfa94..43a01471e 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
@@ -27,7 +27,7 @@
 
                 <div class="text-right mb-2">
                     <a class="btn btn-secondary"
-                       href="#{mvc.uri('CategorySystemsController#newCategorySystem')}">
+                       href="#{mvc.basePath}/categorymanager/categorysystems/new">
                         <bootstrap:svgIcon icon="plus-circle" />
                         <span>#{AdminMessages['categorysystems.add']}</span>
                     </a>
@@ -54,7 +54,7 @@
                                 <td>#{categorySystem.released}</td>
                                 <td>
                                     <a class="btn btn-info"
-                                       href="#{mvc.uri('CategorySystemsController#getCategorySystemDetails', { 'categorySystemIdentifier': categorySystem.identifier })}">
+                                       href="#{mvc.basePath}/categorymanager/categorysystems/#{categorySystem.identifier}/details">
                                         <bootstrap:svgIcon icon="pen"/>
                                         #{AdminMessages['categorysystems.table.actions.edit']}
                                     </a>
@@ -71,7 +71,7 @@
                                          id="confirm-delete-#{categorySystem.identifier}"
                                          tabindex="-1">
                                         <div class="modal-dialog">
-                                            <form action="#{mvc.uri('CategorySystemsController#deleteCategorySystem', {'categorySystemIdentifier': categorySystem.identifier })}"
+                                            <form action="#{mvc.basePath}/categorymanager/categorysystems/#{categorySystem.identifier}/delete"
                                                   class="modal-content"
                                                   method="post">
                                                 <div class="modal-header">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml
index 7ad7097a8..9cf310669 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml
@@ -1,9 +1,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-      xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
       >
     <head>
         <title>#{title} - LibreCCM Admin</title>
@@ -31,12 +30,7 @@
                             <li class="nav-item">
                                 <a class="nav-link #{activePage == page.pageUri?'active':''}" 
                                    href="#{mvc.basePath}#{page.pageUri}">
-                                    <svg class="bi"
-                                         width="1em"
-                                         height="1em"
-                                         fill="currentColor">
-                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg##{page.icon}" />
-                                    </svg>
+                                    <bootstrap:svgIcon icon="${page.icon}"/>
                                     <span>#{page.label}</span>
                                 </a>
                             </li>
@@ -47,7 +41,7 @@
             <nav aria-label="breadcrumb">
                 <ol class="breadcrumb">
                     <li class="breadcrumb-item">
-                        <a href="#{mvc.uri('DashboardController#getDashboard')}">
+                        <a href="#{mvc.basePath}/">
                             #{AdminMessages['breadcrumbs.start']}
                         </a>
                     </li>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml
index 442d35f64..35055d075 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml
@@ -2,7 +2,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-      xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
       xmlns:xlink="http://www.w3.org/1999/xlink">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml
index b9c5d8f28..8c76a4b64 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml
@@ -1,38 +1,27 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
-      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-      xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
 
-        <!--        <ui:param name="activePage" value="usersgroupsroles" />
-                <ui:param name="title" value="#{AdminMessages['usersgroupsroles.label']}" />
-        
-                <ui:define name="breadcrumb">
-                    <li class="breadcrumb-item active">
-        #{AdminMessages['usersgroupsroles.label']}
-    </li>
-</ui:define>-->
-
         <ui:define name="main">
             <div class="container-fluid mx-1">
 
                 <div class="row">
                     <nav class="col-md-2 list-group">
                         <a class="list-group-item list-group-item-action #{activePanel == 'overview' ? 'active' : ''}" 
-                           href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                           href="#{mvc.basePath}/users-groups-roles">
                             #{AdminMessages['usersgroupsroles.overview.label']}
                         </a>
                         <a class="list-group-item list-group-item-action #{activePanel == 'users' ? 'active' : ''}" 
-                           href="#{mvc.uri('UsersController#getUsers')}">
+                           href="#{mvc.basePath}/users-groups-roles/users">
                             #{AdminMessages['usersgroupsroles.users.label']}
                         </a>
                         <a class="list-group-item list-group-item-action #{activePanel == 'groups' ? 'active' : ''}" 
-                           href="#{mvc.uri('GroupsController#getGroups')}">
+                           href="#{mvc.basePath}/users-groups-roles/groups">
                             #{AdminMessages['usersgroupsroles.groups.label']}
                         </a>
                         <a class="list-group-item list-group-item-action #{activePanel == 'roles' ? 'active' : ''}" 
-                           href="#{mvc.uri('RolesController#getRoles')}">
+                           href="#{mvc.basePath}/users-groups-roles/roles">
                             #{AdminMessages['usersgroupsroles.roles.label']}
                         </a>
                     </nav>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml
index a8a5d164b..2b590c7cb 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml
@@ -11,17 +11,17 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                <a href="#{mvc.basePath}/users-groups-roles">
                     #{AdminMessages['usersgroupsroles.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersController#getUsers')}">
+                <a href="#{mvc.basePath}/users-groups-roles/users">
                     #{AdminMessages['usersgroupsroles.users.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvn.uri('UsersController#getUserDetails', { 'userIdentfier': user.name })}">
+                <a href="#{mvc.basePath}/users-groups-roles/users/#{user.name}">
                     #{UserDetailsModel.name}
                 </a>
             </li>
@@ -41,7 +41,7 @@
                     #{AdminMessages[message]}
                 </div>
             </c:forEach>
-            <form action="#{EmailFormModel.new ? mvc.uri('EmailFormController#saveEmailAddress', {'userIdentifier': EmailFormModel.userIdentifier, 'emailIdentifier': 'new' }) : mvc.uri('EmailFormController#saveEmailAddress', { 'userIdentifier': EmailFormController.userIdentifier, 'emailIdentifier': EmailFormModel.emailId })}"
+            <form action="#{EmailFormModel.new ? mvc.basePath += '/users-groups-roles/users/' += EmailFormModel.userIdentifier += '/email-addresses/new/save' : mvc.basePath += '/users-groups-roles/users/' += EmailFormModel.userIdentifier += '/email-addresses/' += EmailFormModel.emailId += '/save'}"
                   method="post">
                 <div class="form-group">
                     <label for="address">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml
index 37aff6e5d..e40573934 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-      xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
         <ui:param name="activePage" value="usersgroupsroles" />
@@ -11,12 +10,12 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                <a href="#{mvc.basePath}/users-groups-roles">
                     #{AdminMessages['usersgroupsroles.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersController#getUsers')}">
+                <a href="#{mvc.basePath}/users-groups-roles/users">
                     #{AdminMessages['usersgroupsroles.users.label']}
                 </a>
             </li>
@@ -26,10 +25,10 @@
         </ui:define>
 
         <ui:define name="panel">
-            
-                <div class="alert alert-danger" role="alert">
-                    #{AdminMessages.getMessage('usersgroupsroles.users.email.not_found.message', [errorUserIdentifier, errorEmailId])}
-                </div>
+
+            <div class="alert alert-danger" role="alert">
+                #{AdminMessages.getMessage('usersgroupsroles.users.email.not_found.message', [errorUserIdentifier, errorEmailId])}
+            </div>
         </ui:define>
 
     </ui:composition>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml
index 232969eea..6bbb97b5c 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml
@@ -1,9 +1,9 @@
 <!DOCTYPE html [<!ENTITY times '&#215;'>]>
-<html xmlns="http://www.w3.org/1999/xhtml" 
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:h="http://xmlns.jcp.org/jsf/html"
-      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-      xmlns:xlink="http://www.w3.org/1999/xlink">
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
         <ui:param name="activePage" value="usersgroupsroles" />
         <ui:param name="activePanel" value="groups" />
@@ -12,12 +12,12 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                <a href="#{mvc.basePath}/users-groups-roles">
                     #{AdminMessages['usersgroupsroles.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('GroupsController#getGroups')}">
+                <a href="#{mvc.basePath}/users-groups-roles/groups">
                     #{AdminMessages['usersgroupsroles.groups.label']}
                 </a>
             </li>
@@ -42,13 +42,8 @@
                 </div>
             </dl>
             <a class="btn btn-primary" 
-               href="#{mvc.uri('GroupsController#editGroup', {'groupIdentifier': GroupDetailsModel.groupName })}">
-                <svg class="bi"
-                     width="1em"
-                     height="1em"
-                     fill="currentColor">
-                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
-                </svg>
+               href="#{mvc.basePath}/users-groups-roles/groups/#{GroupDetailsModel.groupName}/edit">
+                <bootstrap:svgIcon icon="pen" />
                 <span>
                     #{AdminMessages['usersgroupsroles.groups.group_details.edit_group']}
                 </span>
@@ -62,12 +57,7 @@
                         data-toggle="modal"
                         data-target="#group-members-dialog"
                         type="button">
-                    <svg class="bi"
-                         width="1em"
-                         height="1em"
-                         fill="currentColor">
-                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
-                    </svg>
+                    <bootstrap:svgIcon icon="pen" />
                     <span>#{AdminMessages['usersgroupsroles.groups.group_details.members.edit']}</span>
                 </button>
                 <div aria-labelledby="group-members-dialog-title"
@@ -77,7 +67,7 @@
                      id="group-members-dialog" 
                      tabindex="-1">
                     <div class="modal-dialog">
-                        <form action="#{mvc.uri('GroupMembersRolesController#updateGroupMemberships', {'groupIdentifier': GroupDetailsModel.groupName})}" 
+                        <form action="#{mvc.basePath}/users-groups-roles/groups/#{GroupDetailsModel.groupName}/members" 
                               class="modal-content" 
                               method="post">
                             <div class="modal-header">
@@ -129,7 +119,7 @@
                         <c:forEach items="#{GroupDetailsModel.members}" 
                                    var="member">
                             <li class="list-group-item">
-                                <a href="#{mvc.uri('UsersController#getUserDetails', { 'userIdentifier': member.userName })}">
+                                <a href="#{mvc.basePath}/users-groups-roles/users/#{member.userName}/details">
                                     #{member.userName}
                                 </a>
                             </li>
@@ -151,12 +141,7 @@
                         data-toggle="modal"
                         data-target="#group-roles-dialog"
                         type="button">
-                    <svg class="bi"
-                         width="1em"
-                         height="1em"
-                         fill="currentColor">
-                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
-                    </svg>
+                    <bootstrap:svgIcon icon="pen" />
                     <span>#{AdminMessages['usersgroupsroles.groups.group_details.roles.edit']}</span>
                 </button>
                 <div aria-labelledby="group-roles-dialog-title"
@@ -166,7 +151,7 @@
                      id="group-roles-dialog"
                      tabindex="-1">
                     <div class="modal-dialog">
-                        <form action="#{mvc.uri('GroupMembersRolesController#updateRoleMemberships', {'groupIdentifier': GroupDetailsModel.groupName })}"
+                        <form action="#{mvc.basePath}/users-groups-roles/groups/#{GroupDetailsModel.groupName}/members"
                               class="modal-content"
                               method="post">
                             <div class="modal-header">
@@ -218,7 +203,7 @@
                         <c:forEach items="#{GroupDetailsModel.roles}" 
                                    var="role">
                             <li class="list-group-item">
-                            <a href="#{mvc.uri('RolesController#getRoleDetails', {'roleIdentifier': role.roleName})}">
+                            <a href="#{mvc.basePath}/users-groups-roles/roles#{role.roleName}/details">
                                 #{role.roleName}
                             </a>
                             </li>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml
index 389b7ec73..fd7eba545 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-      xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
         <ui:param name="activePage" value="usersgroupsroles" />
@@ -11,17 +10,17 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                <a href="#{mvc.basePath}/users-groups-roles">
                     #{AdminMessages['usersgroupsroles.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('GroupsController#getGroups')}">
+                <a href="#{mvc.basePath}/users-groups-roles/groups">
                     #{AdminMessages['usersgroupsroles.groups.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvn.uri('GroupsController#getGroupDetails', { 'groupIdentfier': GroupDetailsModel.groupName })}">
+                <a href="#{mvc.basePath}/users-groups-roles/groups/#{GroupDetailsModel.groupName}/details">
                     #{GroupDetailsModel.groupName}
                 </a>
             </li>
@@ -37,7 +36,7 @@
                 </div>
             </c:forEach>
             
-            <form action="#{GroupDetailsModel.newGroup ? mvc.uri('GroupFormController#createGroup') : mvc.uri('GroupFormController#updateGroup', { 'groupIdentifier': GroupDetailsModel.groupName })}"
+            <form action="#{GroupDetailsModel.newGroup ? mvc.basePath += '/users-groups-roles/groups/new' : mvc.basePath += '/users-groups-roles/groups/' += GroupDetailsModel.groupName += '/edit'}"
                   method="post">
                 <div class="form-group">
                     <label for="groupname">
@@ -57,7 +56,7 @@
                     </small>
                 </div>
                 <a class="btn btn-warning" 
-                   href="#{mvc.uri('GroupsController#getGroups')}">
+                   href="#{mvc.basePath}/users-groups-roles/groups">
                     #{AdminMessages['usersgroupsroles.groups.form.buttons.cancel']}
                 </a>
                 <button class="btn btn-success" type="submit">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml
index 23cbab073..bbb1ace16 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml
@@ -11,12 +11,12 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                <a href="#{mvc.basePath}/users-groups-roles">
                     #{AdminMessages['usersgroupsroles.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersController#getGroups')}">
+                <a href="#{mvc.basePath}/users-groups-roles/groups">
                     #{AdminMessages['usersgroupsroles.groups.label']}
                 </a>
             </li>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
index de27f6318..8599e4ae9 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
@@ -1,9 +1,9 @@
 <!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:h="http://xmlns.jcp.org/jsf/html"
-      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-      xmlns:xlink="http://www.w3.org/1999/xlink">
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
         <ui:param name="activePage" value="usersgroupsroles" />
         <ui:param name="activePanel" value="groups" />
@@ -12,7 +12,7 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                <a href="#{mvc.basePath}/users-groups-roles">
                     #{AdminMessages['usersgroupsroles.label']}
                 </a>
             </li>
@@ -28,13 +28,8 @@
                 </div>
                 <div class="col-sm-3 text-right">
                     <a class="btn btn-secondary" 
-                       href="#{mvc.uri('GroupsController#newGroup')}">
-                        <svg class="bi"
-                             width="1em"
-                             height="1em"
-                             fill="currentColor">
-                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
-                        </svg>
+                       href="#{mvc.basePath}/users-groups-roles/groups/new">
+                        <bootstrap:svgIcon icon="plus-circle" />
                         <span>#{AdminMessages['usersgroupsroles.groups.add']}</span>
                     </a>
                 </div>
@@ -52,13 +47,8 @@
                                 <td>#{group.name}</td>
                                 <td class="text-center action-col">
                                     <a class="btn btn-info"
-                                       href="#{mvc.uri('GroupsController#getGroupDetails', { 'groupIdentifier': group.name })}">
-                                        <svg class="bi"
-                                             width="1em"
-                                             height="1em"
-                                             fill="currentColor">
-                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#eye" />
-                                        </svg>
+                                       href="#{mvc.basePath}/users-groups-roles/groups/#{group.name}/details">
+                                        <bootstrap:svgIcon icon="eye" />
                                         <span>
                                             #{AdminMessages['usersgroupsroles.groups.detailslink.label']}
                                         </span>
@@ -68,12 +58,7 @@
                                     <button class="btn btn-danger"
                                             data-toggle="modal"
                                             data-target="#confirm-delete-#{group.name}">
-                                        <svg class="bi"
-                                             width="1em"
-                                             height="1em"
-                                             fill="currentColor">
-                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
-                                        </svg>
+                                        <bootstrap:svgIcon icon="x-circle" />
                                         <span>
                                             #{AdminMessages['usersgroupsroles.groups.delete.button.label']}
                                         </span>
@@ -82,7 +67,7 @@
                                          id="confirm-delete-#{group.name}"
                                          tabindex="-1">
                                         <div class="modal-dialog">
-                                            <form action="#{mvc.uri('GroupsController#deleteGroup', {'groupIdentifier': group.name })}"
+                                            <form action="#{mvc.basePath}/users-groups-roles/groups/#{group.name}/delete"
                                                   class="modal-content"
                                                   method="post">
                                                 <div class="modal-header">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-details.xhtml
index b532cd5aa..d8995deee 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-details.xhtml
@@ -1,24 +1,22 @@
 <!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-      xmlns:h="http://xmlns.jcp.org/jsf/html"
-      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-      xmlns:xlink="http://www.w3.org/1999/xlink">
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
         <ui:param name="activePage" value="usersgroupsroles" />
         <ui:param name="activePanel" value="roles" />
         <ui:param name="title"
                   value="#{AdminMessages.getMessage('usersgroupsroles.roles.role_details.title', [RoleDetailsModel.roleName])}" />
-
-
+        
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                <a href="#{mvc.basePath}/users-groups-roles/">
                     #{AdminMessages['usersgroupsroles.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('RolesController#getRoles')}">
+                <a href="#{mvc.basePath}/roles">
                     #{AdminMessages['usersgroupsroles.roles.label']}
                 </a>
             </li>
@@ -43,13 +41,8 @@
                 </div>
             </dl>
             <a class="btn btn-primary"
-               href="#{mvc.uri('RolesController#editRole', {'roleIdentifier': RoleDetailsModel.roleName })}">
-                <svg class="bi"
-                     width="1em"
-                     height="1em"
-                     fill="currentColor">
-                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
-                </svg>
+               href="#{mvc.basePath}/users-groups-roles/roles/#{RoleDetailsModel.roleName}/edit">
+                <bootstrap:svgIcon icon="pen" />
                 <span>
                     #{AdminMessages['usersgroupsroles.roles.role_details.edit_role']}
                 </span>
@@ -63,12 +56,7 @@
                         data-toggle="modal"
                         data-target="#role-members-dialog"
                         type="button">
-                    <svg class="bi"
-                         width="1em"
-                         height="1em"
-                         fill="currentColor">
-                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
-                    </svg>
+                    <bootstrap:svgIcon icon="pen" />
                     <span>#{AdminMessages['usersgroupsroles.roles.role_details.members.edit']}</span>
                 </button>
                 <div aria-labelledby="role-members-dialog-title"
@@ -78,7 +66,7 @@
                      id="role-members-dialog"
                      tabindex="-1">
                     <div class="modal-dialog">
-                        <form action="#{mvc.uri('RoleMembersController#updateRoleMemberships', {'roleIdentifier': RoleDetailsModel.roleName } )}"
+                        <form action="#{mvc.basePath}/users-groups-roles/roles/#{RoleDetailsModel.roleName}/members"
                               class="modal-content"
                               method="post">
                             <div class="modal-header">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-form.xhtml
index 018da950f..6e8b9c2ad 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-form.xhtml
@@ -11,17 +11,17 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                <a href="#{mvc.basePath}/users-groups-roles">
                     #{AdminMessages['usersgroupsroles.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('GroupsController#getGroups')}">
+                <a href="#{mvc.basePath}/users-groups-roles/roles">
                     #{AdminMessages['usersgroupsroles.roles.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvn.uri('GroupsController#getGroupDetails', { 'roleIdentfier': RoleDetailsModel.roleName })}">
+                <a href="#{mvc.basePath}/users-groups-roles/roles/#{RoleDetailsModel.roleName}">
                     #{RoleDetailsModel.roleName}
                 </a>
             </li>
@@ -37,7 +37,7 @@
                 </div>
             </c:forEach>
             
-            <form action="#{RoleDetailsModel.newRole ? mvc.uri('RoleFormController#createRole') : mvc.uri('RoleFormController#updateRole', {'roleIdentifier' : RoleDetailsModel.roleName })}"
+            <form action="#{RoleDetailsModel.newRole ? mvc.basePath += '/users-groups-roles/roles/new' : mvc.basePath += '/users-groups-roles/roles/' += RoleDetailsModel.roleName += '/edit'}">
                   method="post">
                 <div class="form-group">
                     <label for="rolename">
@@ -57,7 +57,7 @@
                     </small>
                 </div>
                 <a class="btn btn-warning" 
-                   href="#{mvc.uri('RolesController#getRoles')}">
+                   href="#{mvc.basePath}/users-groups-roles/roles">
                     #{AdminMessages['usersgroupsroles.roles.form.buttons.cancel']}
                 </a>
                 <button class="btn btn-success" type="submit">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-not-found.xhtml
index 25f4f3a0d..ebffd06fe 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-not-found.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-not-found.xhtml
@@ -11,12 +11,12 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                <a href="#{mvc.basePath}/users-groups-roles">
                     #{AdminMessages['usersgroupsroles.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersController#getRoles')}">
+                <a href="#{mvc.basePath}/users-groups-roles/roles">
                     #{AdminMessages['usersgroupsroles.roles.label']}
                 </a>
             </li>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml
index 5b0b7a27f..4b7c187ff 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml
@@ -1,9 +1,8 @@
 <!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-      xmlns:h="http://xmlns.jcp.org/jsf/html"
-      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-      xmlns:xlink="http://www.w3.org/1999/xlink">
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
         <ui:param name="activePage" value="usersgroupsroles" />
         <ui:param name="activePanel" value="roles" />
@@ -12,7 +11,7 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                <a href="#{mvc.basePath}/users-groups-roles">
                     #{AdminMessages['usersgroupsroles.label']}
                 </a>
             </li>
@@ -28,13 +27,8 @@
                 </div>
                 <div class="col-sm-3 text-right">
                     <a class="btn btn-secondary"
-                       href="#{mvc.uri('RolesController#newRole')}">
-                        <svg class="bi"
-                             width="1em"
-                             height="1em"
-                             fill="currentColor">
-                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
-                        </svg>
+                       href="#{mvc.basePath}/users-groups-roles/roles/new">
+                        <bootstrap:svgIcon icon="plus-circle" />
                         <span>#{AdminMessages['usersgroupsroles.roles.add']}</span>
                     </a>
                 </div>
@@ -53,13 +47,8 @@
                             <td>#{role.name}</td>
                             <td class="text-center action-col">
                                 <a class="btn btn-info"
-                                   href="#{mvc.uri('RolesController#getRoleDetails', { 'roleIdentifier': role.name })}">
-                                    <svg class="bi"
-                                         width="1em"
-                                         height="1em"
-                                         fill="currentColor">
-                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#eye" />
-                                    </svg>
+                                   href="#{mvc.basePath}/users-groups-roles/roles/#{role.name}/details">
+                                    <bootstrap:svgIcon icon="eye" />
                                     <span>
                                         #{AdminMessages['usersgroupsroles.roles.detailslink.label']}
                                     </span>
@@ -70,12 +59,7 @@
                                         data-toggle="modal"
                                         data-target="#confirm-delete-#{role.name}"
                                         href="#">
-                                    <svg class="bi"
-                                         width="1em"
-                                         height="1em"
-                                         fill="currentColor">
-                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
-                                    </svg>
+                                    <bootstrap:svgIcon icon="x-circle" />
                                     <span>
                                         #{AdminMessages['usersgroupsroles.roles.delete.button.label']}
                                     </span>
@@ -84,7 +68,7 @@
                                      id="confirm-delete-#{role.name}"
                                      tabindex="-1">
                                     <div class="modal-dialog">
-                                        <form action="#{mvc.uri('RolesController#deleteRole', { 'roleIdentifier': role.name })}"
+                                        <form action="#{mvc.basePath}/users-groups-roles/roles/#{role.name}/delete"
                                               class="modal-content"
                                               method="post">
                                             <div class="modal-header">
@@ -105,16 +89,16 @@
                                                        value="true" />
                                             </div>
                                             <div class="modal-footer">
-                                                    <button class="btn btn-secondary"
-                                                            data-dismiss="modal"
-                                                            type="button">
-                                                        #{AdminMessages['usersgroupsroles.roles.delete.confirm.cancel']}
-                                                    </button>
-                                                    <button class="btn btn-danger" 
-                                                            type="submit">
-                                                        #{AdminMessages['usersgroupsroles.roles.delete.confirm.yes']}
-                                                    </button>
-                                                </div>
+                                                <button class="btn btn-secondary"
+                                                        data-dismiss="modal"
+                                                        type="button">
+                                                    #{AdminMessages['usersgroupsroles.roles.delete.confirm.cancel']}
+                                                </button>
+                                                <button class="btn btn-danger" 
+                                                        type="submit">
+                                                    #{AdminMessages['usersgroupsroles.roles.delete.confirm.yes']}
+                                                </button>
+                                            </div>
                                         </form>
                                     </div>
                                 </div>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
index 573c25805..746af1e2f 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
@@ -1,9 +1,8 @@
 <!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-      xmlns:h="http://xmlns.jcp.org/jsf/html"
-      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-      xmlns:xlink="http://www.w3.org/1999/xlink">
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
         <ui:param name="activePage" value="usersgroupsroles" />
         <ui:param name="activePanel" value="users" />
@@ -12,12 +11,12 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                <a href="#{mvc.basePath}/users-groups-roles">
                     #{AdminMessages['usersgroupsroles.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersController#getUsers')}">
+                <a href="#{mvc.basePath}/users-groups-roles/users">
                     #{AdminMessages['usersgroupsroles.users.label']}
                 </a>
             </li>
@@ -119,13 +118,8 @@
                 </div>
             </dl>
             <a class="btn btn-primary" 
-               href="#{mvc.uri('UsersController#editUser', {'userIdentifier': UserDetailsModel.name })}">
-                <svg class="bi"
-                     width="1em"
-                     height="1em"
-                     fill="currentColor">
-                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
-                </svg>
+               href="#{mvc.basePath}/users-groups-roles/users/#{UserDetailsModel.name}/edit">
+                <bootstrap:svgIcon icon="pen" />
                 <span>
                     #{AdminMessages['usersgroupsroles.users.user_details.edit_user']}
                 </span>
@@ -137,13 +131,8 @@
                 </h2>
                 <div>
                     <a class="btn btn-primary" 
-                       href="#{mvc.uri('UsersController#getNewEmailAddressForm', {'userIdentifier': UserDetailsModel.name })}">
-                        <svg class="bi"
-                             width="1em"
-                             height="1em"
-                             fill="currentColor">
-                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
-                        </svg>
+                       href="#{mvc.basePath}/users-groups-roles/users/#{UserDetailsModel.name}/email-addresses/new">
+                        <bootstrap:svgIcon icon="plus-circle" />
                         <span>#{AdminMessages['usersgroupsroles.users.user_details.additional_email_addresses.add']}</span>
                     </a>
                 </div>
@@ -195,13 +184,8 @@
                                     </td>
                                     <td>
                                         <a class="btn btn-info" 
-                                           href="#{mvc.uri('UsersController#getEditEmailAddressForm', { 'userIdentifier': UserDetailsModel.name, 'emailId': status.index })}">
-                                            <svg class="bi"
-                                                 width="1em"
-                                                 height="1em"
-                                                 fill="currentColor">
-                                                <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
-                                            </svg>
+                                           href="#{mvc.basePath}/users-groups-roles/users/#{UserDetailsModel.name}/email-addresses/#{status.index}">
+                                            <bootstrap:svgIcon icon="pen" />
                                             <span>
                                                 #{AdminMessages['usersgroupsroles.users.user_details.email_addresses.edit']}
                                             </span>
@@ -211,12 +195,7 @@
                                         <button class="btn btn-danger" 
                                                 data-toggle="modal"
                                                 data-target="#confirm-remove-#{status.index}">
-                                            <svg class="bi"
-                                                 width="1em"
-                                                 height="1em"
-                                                 fill="currentColor">
-                                                <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
-                                            </svg>
+                                            <bootstrap:svgIcon icon="x-circle" />
                                             <span>
                                                 #{AdminMessages['usersgroupsroles.users.user_details.email_addresses.remove']}
                                             </span>
@@ -281,12 +260,7 @@
                         data-toggle="modal"
                         data-target="#user-groups-dialog"
                         type="button">
-                    <svg class="bi"
-                         width="1em"
-                         height="1em"
-                         fill="currentColor">
-                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
-                    </svg>
+                    <bootstrap:svgIcon icon="pen" />
                     <span>#{AdminMessages['usersgroupsroles.users.user_details.groups.edit']}</span>
                 </button>
                 <div aria-labelledby="user-groups-dialog-title"
@@ -296,7 +270,7 @@
                      id="user-groups-dialog" 
                      tabindex="-1">
                     <div class="modal-dialog">
-                        <form action="#{mvc.uri('UserGroupsRolesController#updateGroupMemberships', {'userIdentifier': UserDetailsModel.name})}" 
+                        <form action="#{mvc.basePath}/users-groups-roles/users/#{UserDetailsModel.name}/groups" 
                               class="modal-content" 
                               method="post">
                             <div class="modal-header">
@@ -348,7 +322,7 @@
                         <c:forEach items="#{UserDetailsModel.groupMemberships}" 
                                    var="group">
                             <li class="list-group-item">
-                                <a href="#{mvc.uri('GroupsController#getGroupDetails', {'groupIdentifier': group.groupName})}">
+                                <a href="#{mvc.basePath}/users-groups-roles/groups/#{group.groupName}/details">
                                     #{group.groupName}
                                 </a>
                             </li>
@@ -370,12 +344,7 @@
                         data-toggle="modal"
                         data-target="#user-roles-dialog"
                         type="button">
-                    <svg class="bi"
-                         width="1em"
-                         height="1em"
-                         fill="currentColor">
-                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
-                    </svg>
+                    <bootstrap:svgIcon icon="pen" />
                     <span>#{AdminMessages['usersgroupsroles.users.user_details.roles.edit']}</span>
                 </button>
                 <div aria-labelledby="user-roles-dialog-title"
@@ -385,7 +354,7 @@
                      id="user-roles-dialog"
                      tabindex="-1">
                     <div class="modal-dialog">
-                        <form action="#{mvc.uri('UserGroupsRolesController#updateRoleMemberships', {'userIdentifier': UserDetailsModel.name })}"
+                        <form action="#{mvc.basePath}/users-groups-roles/users/#{UserDetailsModel.name}/roles"
                               class="modal-content"
                               method="post">
                             <div class="modal-header">
@@ -436,7 +405,7 @@
                     <ul class="list-group mt-1 mb-4">
                         <c:forEach items="#{UserDetailsModel.roles}" var="role">
                             <li class="list-group-item">
-                                <a href="#{mvc.uri('RolesController#getRoleDetails', {'roleIdentifier': role.roleName })}">
+                                <a href="#{mvc.basePath}/users-groups-roles/roles/#{role.roleName}/details">
                                     #{role.roleName}
                                 </a>
                             </li>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml
index d19034fdc..7d5f64773 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-      xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
         <ui:param name="activePage" value="usersgroupsroles" />
@@ -11,17 +10,17 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                <a href="#{mvc.basePath}/users-groups-roles">
                     #{AdminMessages['usersgroupsroles.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersController#getUsers')}">
+                <a href="#{mvc.basePath}/users-groups-roles/users">
                     #{AdminMessages['usersgroupsroles.users.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvn.uri('UsersController#getUserDetails', { 'userIdentfier': user.name })}">
+                <a href="#{mvc.basePath}/users-groups-roles/users/#{user.name}/details">
                     #{UserDetailsModel.name}
                 </a>
             </li>
@@ -37,7 +36,7 @@
                     #{error}
                 </div>
             </c:forEach>
-            <form action="#{UserDetailsModel.newUser ? mvc.uri('UserFormController#createUser') : mvc.uri('UserFormController#updateUser', { 'userIdentifier': UserDetailsModel.name })}"
+            <form action="#{UserDetailsModel.newUser ? mvc.basePath += '/users-groups-roles/users/new': mvc.basePath += '/users-groups-roles/users/' += UserDetailsModel.name += '/edit'}"
                   method="post">
                 <div class="form-group">
                     <label for="username">
@@ -176,7 +175,7 @@
                     </label>
                 </div>
                 <a class="btn btn-warning" 
-                   href="#{mvc.uri('UsersController#getUsers')}">
+                   href="#{mvc.basePath}/users-groups-roles/users">
                     #{AdminMessages['usersgroupsroles.users.form.buttons.cancel']}
                 </a>
                 <button class="btn btn-success" type="submit">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml
index 4f4079020..122d02e29 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml
@@ -11,12 +11,12 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                <a href="#{mvc.basePath}/users-groups-roles">
                     #{AdminMessages['usersgroupsroles.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersController#getUsers')}">
+                <a href="#{mvc.basePath}/users-groups-roles/users">
                     #{AdminMessages['usersgroupsroles.users.label']}
                 </a>
             </li>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
index 7cf4fa1e9..7bcab6a2e 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
@@ -1,8 +1,8 @@
 <!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-      xmlns:xlink="http://www.w3.org/1999/xlink">
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
         <ui:param name="activePage" value="usersgroupsroles" />
         <ui:param name="activePanel" value="users" />
@@ -11,7 +11,7 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                <a href="#{mvc.basePath}/users-groups-roles">
                     #{AdminMessages['usersgroupsroles.label']}
                 </a>
             </li>
@@ -23,7 +23,7 @@
         <ui:define name="panel">
             <div class="row mb-2">
                 <div class="col-sm-9">
-                    <form action="#{mvc.uri('UsersController#getUsers')}" 
+                    <form action="#{mvc.basePath}/users-groups-roles/users" 
                           class="form-inline" 
                           method="get">
                         <div class="form-group">
@@ -43,13 +43,8 @@
                 </div>
                 <div class="col-sm-3 text-right">
                     <a class="btn btn-secondary" 
-                       href="#{mvc.uri('UsersController#newUser')}">
-                        <svg class="bi"
-                             width="1em"
-                             height="1em"
-                             fill="currentColor">
-                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#person-plus" />
-                        </svg>
+                       href="#{mvc.basePath}/users-groups-roles/users/new">
+                        <bootstrap:svgIcon icon="person-plus" />
                         <span>#{AdminMessages['usersgroupsroles.users.add']}</span>
                     </a>
                 </div>
@@ -80,13 +75,8 @@
                             </td>
                             <td class="text-center action-col">
                                 <a class="btn btn-info" 
-                                   href="#{mvc.uri('UsersController#getUserDetails', { 'userIdentifier': user.name })}">
-                                    <svg class="bi"
-                                         width="1em"
-                                         height="1em"
-                                         fill="currentColor">
-                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#eye" />
-                                    </svg>
+                                   href="#{mvc.basePath}/users-groups-roles/users/#{user.name}/details">
+                                    <bootstrap:svgIcon icon="eye" />
                                     <span>
                                         #{AdminMessages['usersgroupsroles.users.detailslink.label']}
                                     </span>
@@ -97,12 +87,7 @@
                                     <button class="btn btn-danger"
                                             data-toggle="modal"
                                             data-target="#confirm-disable-#{user.name}">
-                                        <svg class="bi"
-                                             width="1em"
-                                             height="1em"
-                                             fill="currentColor">
-                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#person-x" />
-                                        </svg>
+                                        <bootstrap:svgIcon icon="person-x" />
                                         <span>
                                             #{AdminMessages['usersgroupsroles.users.disablebutton.label']}
                                         </span>
@@ -111,7 +96,7 @@
                                          id="confirm-disable-#{user.name}" 
                                          tabindex="-1">
                                         <div class="modal-dialog">
-                                            <form action="#{mvc.uri('UsersController#disableUser', { 'userIdentifier': user.name })}" 
+                                            <form action="#{mvc.basePath}/users-groups-roles/users/#{user.name}/disable" 
                                                   class="modal-content"
                                                   method="post">
                                                 <div class="modal-header">