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 4bccdef25..6ecdc5448 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
@@ -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:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <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/configuration/configuration.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/configuration.xhtml
index cfffb9180..b56fa124a 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/configuration.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/configuration.xhtml
@@ -21,7 +21,7 @@
                     <c:forEach items="#{configurationClasses}" 
                                var="confClass">
                         <a class="list-group-item list-group-item-action"
-                           href="#{mvc.uri('SettingsController#showSettings', { 'configurationClass': confClass.name })}">
+                           href="#{mvc.basePath}/configuration/#{confClass.name}">
                             <h2 class="h3 mb-1">
                                 #{confClass.title}
                             </h2>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
index be78558ae..df7b082e9 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.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/ccm-admin.xhtml">
 
         <ui:param name="activePage" value="configuration" />
@@ -11,7 +10,8 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('ConfigurationController#getSettings')}">
+                
+                <a href="#{mvc.basePath}/configuration">
                     #{AdminMessages['configuration.label']}
                 </a>
             </li>
@@ -70,12 +70,7 @@
                                                 data-target="#setting-info-#{setting.name}"
                                                 title="#{AdminMessages.getMessage('configuration.settings.table.actions.info.help', [setting.label])}"
                                                 type="button">
-                                            <svg class="bi"
-                                                 width="1em"
-                                                 height="1em"
-                                                 fill="currentColor">
-                                                <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#info-circle" />
-                                            </svg>
+                                            <bootstrap:svgIcon icon="info-circle" />
                                             #{AdminMessages['configuration.settings.table.actions.info']}
                                         </button>
                                         <div aria-hidden="true"
@@ -117,12 +112,7 @@
                                             data-toggle="modal"
                                             data-target="#setting-#{setting.name}-edit-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" />
                                         #{AdminMessages['configuration.settings.table.actions.edit']}
                                     </button>
                                     <div aria-hidden="true"
@@ -132,7 +122,7 @@
                                          id="setting-#{setting.name}-edit-dialog"
                                          tabindex="-1">
                                         <div class="modal-dialog">
-                                            <form action="#{mvc.uri('SettingsController#updateSettingValue', {'configurationClass': configurationClass, 'settingName': setting.name})}"
+                                            <form action="#{mvc.basePath}/configuration/#{configurationClass}/#{settingName}"
                                                   class="modal-content"
                                                   method="post">
                                                 <div class="modal-header">
@@ -340,12 +330,7 @@
                                             data-target="#setting-#{setting.name}-reset-dialog"
                                             title="#{AdminMessages.getMessage('configuration.settings.table.actions.reset.help', [setting.label, setting.defaultValue])}"
                                             type="button">
-                                        <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" />
                                         #{AdminMessages['configuration.settings.table.actions.reset']}
                                     </button>
                                     <div aria-hidden="true"
@@ -355,7 +340,7 @@
                                          id="setting-#{setting.name}-reset-dialog"
                                          tabindex="-1">
                                         <div class="modal-dialog">
-                                            <form action="#{mvc.uri('SettingsController#resetSettingValue', {'configurationClass': configurationClass, 'settingName': setting.name })}"
+                                            <form action="#{mvc.basePath}/configuration/#{configurationClass}/#{setting.name}/reset"
                                                   class="modal-content"
                                                   method="post">
                                                 <div class="modal-header">
