diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index dc3138d40..162dc8412 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -9,7 +9,7 @@
                     name="ScientificCMS" 
               prettyName="Scientific CMS" 
                  version="2.3.0" 
-                 release="devel-SNAPSHOT-r2816" 
+                 release="devel-SNAPSHOT-r2820" 
                   webxml="sci-web.xml" 
               portletxml="sci-portlet.xml" 
                   webapp="libreccm" 
diff --git a/ccm-sci-bundle/web/themes/mandalay/fallback/fallbackEntryPoints.xsl b/ccm-sci-bundle/web/themes/mandalay/fallback/fallbackEntryPoints.xsl
index 97fb0b4ef..43436178e 100755
--- a/ccm-sci-bundle/web/themes/mandalay/fallback/fallbackEntryPoints.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/fallback/fallbackEntryPoints.xsl
@@ -20,158 +20,200 @@
     along with Mandalay.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:nav="http://ccm.redhat.com/navigation"
-  xmlns:mandalay="http://mandalay.quasiweb.de"
-  xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:ui="http://www.arsdigita.com/ui/1.0"
-  xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
-  exclude-result-prefixes="xsl bebop nav cms ui aplaws mandalay"
-  version="1.0">
+<xsl:stylesheet   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+                  xmlns:nav="http://ccm.redhat.com/navigation"
+                  xmlns:mandalay="http://mandalay.quasiweb.de"
+                  xmlns:cms="http://www.arsdigita.com/cms/1.0"
+                  xmlns:ui="http://www.arsdigita.com/ui/1.0"
+                  xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
+                  exclude-result-prefixes="xsl bebop nav cms ui aplaws mandalay"
+                  version="1.0">
 
-  <xsl:import href="../../../../../ROOT/packages/content-section/xsl/cms.xsl"/>
-  <xsl:import href="../../../../../ROOT/packages/content-section/xsl/content-center.xsl"/>
-  <xsl:import href="../../../../../ROOT/__ccm__/assets/notes/index.xsl"/>
+    <xsl:import href="../../../../../ROOT/packages/content-section/xsl/cms.xsl"/>
+    <xsl:import href="../../../../../ROOT/packages/content-section/xsl/content-center.xsl"/>
+    <xsl:import href="../../../../../ROOT/__ccm__/assets/notes/index.xsl"/>
 
-  <xsl:import href="../fallback/admin.xsl"/>
-  <xsl:import href="../fallback/admin-navigation.xsl"/>
-  <xsl:import href="../fallback/admin-search.xsl"/>
-  <xsl:import href="../fallback/admin-subsite.xsl"/>
-  <xsl:import href="../fallback/admin-terms.xsl"/>
-  <xsl:import href="../fallback/admin-themes.xsl"/>
+    <xsl:import href="../fallback/admin.xsl"/>
+    <xsl:import href="../fallback/admin-navigation.xsl"/>
+    <xsl:import href="../fallback/admin-search.xsl"/>
+    <xsl:import href="../fallback/admin-subsite.xsl"/>
+    <xsl:import href="../fallback/admin-terms.xsl"/>
+    <xsl:import href="../fallback/admin-themes.xsl"/>
 
-  <xsl:import href="../fallback/admin-category-step.xsl"/> <!-- Support for AJAXed load-cat.jsp -->
-  <xsl:import href="../../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
-  <xsl:variable name="here"><xsl:value-of select="$static-prefix"/>/cms/admin/page</xsl:variable>
+    <xsl:import href="../fallback/admin-category-step.xsl"/> <!-- Support for AJAXed load-cat.jsp -->
+    <xsl:import href="../../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
+    <xsl:variable name="here">
+        <xsl:value-of select="$static-prefix"/>/cms/admin/page</xsl:variable>
 
-  <!-- DE: Einstiegspunkt -->
-  <xsl:template name="mandalay:fallbackEntryPoint">
+    <!-- DE: Einstiegspunkt -->
+    <xsl:template name="mandalay:fallbackEntryPoint">
 
-    <xsl:choose>
-      <!-- DE Adminoberfläche  -->
-      <xsl:when test="@class='cms-admin'">
-        <xsl:call-template name="mandalay:fallbackAdminLayout"/>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <xsl:call-template name="mandalay:fallbackAplawsPage"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  
-  <!-- DE: Ab hier folgen die "geliehenen" Templates des Standard-Aplaws-Theme -->
-    <xsl:template name="mandalay:fallbackAdminLayout">
-    <html xmlns:deditor="http://www.arsdigita.com/deditor/1.0">
-      <head>
-        <title><xsl:value-of select="bebop:title"/></title>
-        <link rel="stylesheet" type="text/css" href="{$legacy-asset-prefix}/css/acs-master.css"/>
-        <link rel="stylesheet" type="text/css" href="{$static-prefix}/cms/admin/cms-admin.css"/>
-        <xsl:call-template name="mandalay:fallbackHeaderStyleSheets"/>
-      </head>
-      <body>
-        <xsl:call-template name="bebop:dcpJavascript"/>
-        <table id="global-header">
-          <tr>
-            <td id="logo"><img src="{$theme-prefix}/images/aplaws-logo-small.png" height="30" width="30"/></td>
-            <td id="context"><xsl:apply-templates select="bebop:contextBar"/></td>
-            <td style="margin: 0; color: #3f3f3f; border: 0; padding: 0; padding-right: 18px;">Welcome <strong><xsl:value-of select="@name" /></strong></td>
-            <td>
-              <table id="global-links">
-                <tr>
-                  <td class="global-link-icon"><a href="{cms:globalNavigation/cms:workspace/@href}"><img src="{$here}/home.png" height="18" width="18"/></a></td>
-                  <td class="global-link"><a href="{cms:globalNavigation/cms:workspace/@href}">Home</a></td>
-
-                  <td class="global-link-icon"><a href="{cms:globalNavigation/cms:signOut/@href}"><img src="{$here}//lock.png" height="18" width="14"/></a></td>
-                  <td class="global-link"><a href="{cms:globalNavigation/cms:signOut/@href}">Logout</a></td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-        </table>
-        <div id="page-title"><xsl:value-of select="bebop:title"/></div>
-        <xsl:if test="bebop:link[@id = 'preview_link']">
-          <xsl:choose>
-            <xsl:when test="bebop:link[@target]">
-              <div style="float: right; margin-right: 12px"><a target="{bebop:link/@target}" href="{bebop:link[@id = 'preview_link']/@href}"><xsl:value-of select="bebop:link[@id = 'preview_link']/bebop:label"/></a></div>
-            </xsl:when>
-            <xsl:otherwise>
-              <div style="float: right; margin-right: 12px"><a href="{bebop:link[@id = 'preview_link']/@href}"><xsl:value-of select="bebop:link[@id = 'preview_link']/bebop:label"/></a></div>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:if>
-        <div><xsl:apply-templates select="*[@id = 'page-body']"/></div>
         <xsl:choose>
-          <xsl:when test="bebop:structure">
-            <div><xsl:apply-templates select="bebop:structure"/></div>
-          </xsl:when>
-          <xsl:when test="ui:debugPanel">
-            <div><xsl:apply-templates select="ui:debugPanel"/></div>            
-          </xsl:when>
+            <!-- DE Adminoberfläche  -->
+            <xsl:when test="@class='cms-admin'">
+                <xsl:call-template name="mandalay:fallbackAdminLayout"/>
+            </xsl:when>
+
+            <xsl:otherwise>
+                <xsl:call-template name="mandalay:fallbackAplawsPage"/>
+            </xsl:otherwise>
         </xsl:choose>
-      </body>
-    </html>
-  </xsl:template>
+    </xsl:template>
+  
+    <!-- DE: Ab hier folgen die "geliehenen" Templates des Standard-Aplaws-Theme -->
+    <xsl:template name="mandalay:fallbackAdminLayout">
+        <html xmlns:deditor="http://www.arsdigita.com/deditor/1.0">
+            <head>
+                <title>
+                    <xsl:value-of select="bebop:title"/>
+                </title>
+                <link rel="stylesheet" type="text/css" href="{$legacy-asset-prefix}/css/acs-master.css"/>
+                <link rel="stylesheet" type="text/css" href="{$static-prefix}/cms/admin/cms-admin.css"/>
+                <xsl:call-template name="mandalay:fallbackHeaderStyleSheets"/>
+            </head>
+            <body>
+                <xsl:call-template name="bebop:dcpJavascript"/>
+                <table id="global-header">
+                    <tr>
+                        <td id="logo">
+                            <img src="{$theme-prefix}/images/aplaws-logo-small.png" height="30" width="30"/>
+                        </td>
+                        <td id="context">
+                            <xsl:apply-templates select="bebop:contextBar"/>
+                        </td>
+                        <td style="margin: 0; color: #3f3f3f; border: 0; padding: 0; padding-right: 18px;">Welcome <strong>
+                                <xsl:value-of select="@name" />
+                            </strong>
+                        </td>
+                        <td>
+                            <table id="global-links">
+                                <tr>
+                                    <td class="global-link-icon">
+                                        <a href="{cms:globalNavigation/cms:workspace/@href}">
+                                            <img src="{$here}/home.png" height="18" width="18"/>
+                                        </a>
+                                    </td>
+                                    <td class="global-link">
+                                        <a href="{cms:globalNavigation/cms:workspace/@href}">Home</a>
+                                    </td>
 
-  <xsl:template name="mandalay:fallbackAplawsPage">
-    <html>
-      <head>
-        <title><xsl:value-of select="/bebop:page/bebop:title"/></title>
-        <meta name="title">
-          <xsl:attribute name="content">
-            <xsl:value-of select="/bebop:page/bebop:title"/>
-          </xsl:attribute>
-        </meta>
-        <link rel="stylesheet" href="{$legacy-asset-prefix}/css/acs-master.css" type="text/css" media="screen"/>
-        <xsl:call-template name="mandalay:fallbackHeaderStyleSheets"/>
-      </head>
+                                    <td class="global-link-icon">
+                                        <a href="{cms:globalNavigation/cms:signOut/@href}">
+                                            <img src="{$here}//lock.png" height="18" width="14"/>
+                                        </a>
+                                    </td>
+                                    <td class="global-link">
+                                        <a href="{cms:globalNavigation/cms:signOut/@href}">Logout</a>
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                </table>
+                <div id="page-title">
+                    <xsl:value-of select="bebop:title"/>
+                </div>
+                <xsl:if test="bebop:link[@id = 'preview_link']">
+                    <xsl:choose>
+                        <xsl:when test="bebop:link[@target]">
+                            <div style="float: right; margin-right: 12px">
+                                <a target="{bebop:link/@target}" href="{bebop:link[@id = 'preview_link']/@href}">
+                                    <xsl:value-of select="bebop:link[@id = 'preview_link']/bebop:label"/>
+                                </a>
+                            </div>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <div style="float: right; margin-right: 12px">
+                                <a href="{bebop:link[@id = 'preview_link']/@href}">
+                                    <xsl:value-of select="bebop:link[@id = 'preview_link']/bebop:label"/>
+                                </a>
+                            </div>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:if>
+                <div>
+                    <xsl:apply-templates select="*[@id = 'page-body']"/>
+                </div>
+                <xsl:choose>
+                    <xsl:when test="bebop:structure">
+                        <div>
+                            <xsl:apply-templates select="bebop:structure"/>
+                        </div>
+                    </xsl:when>
+                    <xsl:when test="ui:debugPanel">
+                        <div>
+                            <xsl:apply-templates select="ui:debugPanel"/>
+                        </div>            
+                    </xsl:when>
+                </xsl:choose>
+            </body>
+        </html>
+    </xsl:template>
 
-      <body style="margin: 0em">
-        <xsl:call-template name="bebop:dcpJavascript"/>
-        <div class="bodyHeader">
-          <xsl:apply-templates select="ui:userBanner"/>
-        </div>
-        <div class="bodyBreadcrumb">
-          <a href="/">APLAWS</a>&gt;<xsl:value-of select="/bebop:page/bebop:title"/>
-        </div>
-        <h1><xsl:value-of select="/bebop:page/bebop:title"/></h1>
-        <div class="bodyContent">
-          <xsl:apply-templates select="*[not(@metadata.tag)]"/>
-        </div>
-        <div class="bodyFooter">
-          <xsl:apply-templates select="ui:siteBanner"/>
-        </div>
-        <div class="bodyDebug">
-          <xsl:apply-templates select="ui:debugPanel"/>
-          <xsl:apply-templates select="bebop:structure"/>
-        </div>
-      </body>
-    </html>
-  </xsl:template>
+    <xsl:template name="mandalay:fallbackAplawsPage">
+        <html>
+            <head>
+                <title>
+                    <xsl:value-of select="/bebop:page/bebop:title"/>
+                </title>
+                <meta name="title">
+                    <xsl:attribute name="content">
+                        <xsl:value-of select="/bebop:page/bebop:title"/>
+                    </xsl:attribute>
+                </meta>
+                <link rel="stylesheet" href="{$legacy-asset-prefix}/css/acs-master.css" type="text/css" media="screen"/>
+                <xsl:call-template name="mandalay:fallbackHeaderStyleSheets"/>
+            </head>
 
-  <xsl:template name="cat-widget-cat-name">
-    <xsl:value-of select="@name"/>
+            <body style="margin: 0em">
+                <xsl:call-template name="bebop:dcpJavascript"/>
+                <div class="bodyHeader">
+                    <xsl:apply-templates select="ui:userBanner"/>
+                </div>
+                <div class="bodyBreadcrumb">
+                    <a href="/">APLAWS</a>&gt;
+                    <xsl:value-of select="/bebop:page/bebop:title"/>
+                </div>
+                <h1>
+                    <xsl:value-of select="/bebop:page/bebop:title"/>
+                </h1>
+                <div class="bodyContent">
+                    <xsl:apply-templates select="*[not(@metadata.tag)]"/>
+                </div>
+                <div class="bodyFooter">
+                    <xsl:apply-templates select="ui:siteBanner"/>
+                </div>
+                <div class="bodyDebug">
+                    <xsl:apply-templates select="ui:debugPanel"/>
+                    <xsl:apply-templates select="bebop:structure"/>
+                </div>
+            </body>
+        </html>
+    </xsl:template>
 
-    <xsl:if test="@pid and @domain='LGSL'">
-        (<xsl:value-of select="@pid"/>)
-    </xsl:if>
-  </xsl:template>
+    <xsl:template name="cat-widget-cat-name">
+        <xsl:value-of select="@name"/>
 
-  <xsl:template name="mandalay:fallbackHeaderStyleSheets">
-    <xsl:choose>
-      <xsl:when test="@application='navigation'">
-        <link rel="stylesheet" href="/__ccm__/apps/navigation/xsl/admin.css" type="text/css" media="screen"/>
-      </xsl:when>
-      <xsl:when test="@application='terms'">
-        <link rel="stylesheet" href="/ccm-ldn-terms/__ccm__/apps/terms/xsl/index.css" type="text/css" media="screen"/>
-      </xsl:when>
-<!--
-      <xsl:when test="@application=''">
-        <link rel="stylesheet" href="{$theme-prefix}/css/fallback/terms-index.css" type="text/css" media="screen"/>
-      </xsl:when>
--->
-    </xsl:choose>
-  </xsl:template>
+        <xsl:if test="@pid and @domain='LGSL'">
+            (<xsl:value-of select="@pid"/>)
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template name="mandalay:fallbackHeaderStyleSheets">
+        <xsl:choose>
+            <xsl:when test="@application='navigation'">
+                <link rel="stylesheet" href="/__ccm__/apps/navigation/xsl/admin.css" type="text/css" media="screen"/>
+            </xsl:when>
+            <xsl:when test="@application='terms'">
+                <link rel="stylesheet" href="/ccm-ldn-terms/__ccm__/apps/terms/xsl/index.css" type="text/css" media="screen"/>
+            </xsl:when>
+            <!--
+                  <xsl:when test="@application=''">
+                    <link rel="stylesheet" href="{$theme-prefix}/css/fallback/terms-index.css" type="text/css" media="screen"/>
+                  </xsl:when>
+            -->
+        </xsl:choose>
+    </xsl:template>
 
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/terms/domain-details.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/terms/domain-details.xsl
index 8a978a88d..e58916f04 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/terms/domain-details.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/terms/domain-details.xsl
@@ -4,97 +4,119 @@
 <!-- no-break space = non-breaking space, U+00A0 ISOnum -->]>
 
 <xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
-  xmlns:util="http://xmlns.redhat.com/london/util/1.0"
-  exclude-result-prefixes="terms util"
-  version="1.0">
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
+    xmlns:util="http://xmlns.redhat.com/london/util/1.0"
+    exclude-result-prefixes="terms util"
+    version="1.0">
 
-  <xsl:template match="terms:domainDetails">
-    <xsl:if test="starts-with(terms:url, 'http://www.esd.org.uk')">
-      <h3>WARNING: Modifications to ESD Toolkit domains will be lost at next upgrade</h3>
-    </xsl:if>
-
-    <table class="domainDetails">
-      <thead>
-        <tr><th colspan="2">Domain details</th></tr>
-      </thead>
-      <tbody>
-        <tr class="odd">
-          <th>Title</th>
-          <td><xsl:value-of select="terms:title"/></td>
-        </tr>
-        <tr class="even">
-          <th>Key:</th>
-          <td><xsl:value-of select="terms:key"/></td>
-        </tr>
-        <tr class="odd">
-          <th>URL:</th>
-          <td><xsl:value-of select="terms:url"/></td>
-        </tr>
-        <tr class="even">
-          <th>Description:</th>
-          <td><xsl:value-of select="terms:description"/></td>
-        </tr>
-        <tr class="odd">
-          <th>Version:</th>
-          <td><xsl:value-of select="terms:version"/></td>
-        </tr>
-        <tr class="even">
-          <th>Released:</th>
-          <td><xsl:value-of select="terms:released"/></td>
-        </tr>
-        <tr class="odd">
-          <th>Indexer trained:</th>
-          <td>
-            <xsl:choose>
-                <xsl:when test="terms:indexer">
-                    <xsl:value-of select="terms:indexer/terms:lastModifiedDate"/>
-                    <xsl:text> by </xsl:text> 
-                    <xsl:value-of select="terms:indexer/terms:lastModifiedUser/terms:primaryEmail"/>
-                </xsl:when>
-                <xsl:otherwise>(never)</xsl:otherwise>
-            </xsl:choose>
-          </td>
-        </tr>
-      </tbody>
-      <tfoot>
-        <tr>
-          <td>&nbsp;</td>
-          <td>
-            <a href="{terms:action[@name='edit']/@url}"><img src="/__ccm__/static/cms/admin/action-group/action-generic.png" width="14" height="14" border="0"/></a>
-            <a href="{terms:action[@name='edit']/@url}">Edit</a>
-            <xsl:text>&#160;</xsl:text>
-            <a href="{terms:action[@name='delete']/@url}"><img src="/__ccm__/static/cms/admin/action-group/action-delete.png" width="14" height="14" border="0"/></a>
-            <a href="{terms:action[@name='delete']/@url}">Delete</a>
-            <xsl:text>&nbsp;</xsl:text>
-            <a href="{terms:action[@name='train']/@url}"><img src="{$context-prefix}/assets/action-generic.png" width="14" height="14" border="0"/></a>
-            <xsl:choose>
-                <xsl:when test="terms:indexer">
-                    <a href="{terms:action[@name='train']/@url}">Retrain indexer</a>
-                    <xsl:text>&nbsp;</xsl:text>
-                    <a href="{terms:action[@name='untrain']/@url}"><img src="{$context-prefix}/assets/action-delete.png" width="14" height="14" border="0"/></a>
-                    <a href="{terms:action[@name='untrain']/@url}">Delete indexer</a>
-                </xsl:when>
-                <xsl:otherwise>
-                    <a href="{terms:action[@name='train']/@url}">Train indexer</a>
-                </xsl:otherwise>
-            </xsl:choose>
-            <xsl:text>&nbsp;</xsl:text>
-          </td>
-        </tr>
-        <xsl:if test="util:errorMessage/util:message">
-          <td>&nbsp;</td>
-          <td>
-            <xsl:for-each select="util:errorMessage/util:message">
-              <div class="domainActionErrorMessage">
-                <xsl:value-of select="text()"/>
-              </div>
-            </xsl:for-each>
-          </td>
+    <xsl:template match="terms:domainDetails">
+        <xsl:if test="starts-with(terms:url, 'http://www.esd.org.uk')">
+            <h3>WARNING: Modifications to ESD Toolkit domains will be lost at next upgrade</h3>
         </xsl:if>
-      </tfoot>
-    </table>
-  </xsl:template>
+
+        <table class="domainDetails">
+            <thead>
+                <tr>
+                    <th colspan="2">Domain details</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr class="odd">
+                    <th>Title</th>
+                    <td>
+                        <xsl:value-of select="title"/>
+                    </td>
+                </tr>
+                <tr class="even">
+                    <th>Key:</th>
+                    <td>
+                        <xsl:value-of select="key"/>
+                    </td>
+                </tr>
+                <tr class="odd">
+                    <th>URL:</th>
+                    <td>
+                        <xsl:value-of select="url"/>
+                    </td>
+                </tr>
+                <tr class="even">
+                    <th>Description:</th>
+                    <td>
+                        <xsl:value-of select="description"/>
+                    </td>
+                </tr>
+                <tr class="odd">
+                    <th>Version:</th>
+                    <td>
+                        <xsl:value-of select="version"/>
+                    </td>
+                </tr>
+                <tr class="even">
+                    <th>Released:</th>
+                    <td>
+                        <xsl:value-of select="released"/>
+                    </td>
+                </tr>
+                <tr class="odd">
+                    <th>Indexer trained:</th>
+                    <td>
+                        <xsl:choose>
+                            <xsl:when test="terms:indexer">
+                                <xsl:value-of select="terms:indexer/terms:lastModifiedDate"/>
+                                <xsl:text> by </xsl:text> 
+                                <xsl:value-of select="terms:indexer/terms:lastModifiedUser/terms:primaryEmail"/>
+                            </xsl:when>
+                            <xsl:otherwise>(never)</xsl:otherwise>
+                        </xsl:choose>
+                    </td>
+                </tr>
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td>&nbsp;</td>
+                    <td>
+                        <!--<a href="{terms:action[@name='edit']/@url}">
+                            <img src="/__ccm__/static/cms/admin/action-group/action-generic.png" width="14" height="14" border="0"/>
+                        </a>-->
+                        <a href="{terms:action[@name='edit']/@url}">Edit</a>
+                        <xsl:text>&#160;</xsl:text>
+                        <!--<a href="{terms:action[@name='delete']/@url}">
+                            <img src="/__ccm__/static/cms/admin/action-group/action-delete.png" width="14" height="14" border="0"/>
+                        </a>-->
+                        <a href="{terms:action[@name='delete']/@url}">Delete</a>
+                        <xsl:text>&nbsp;</xsl:text>
+                        <!--<a href="{terms:action[@name='train']/@url}">
+                            <img src="{$context-prefix}/assets/action-generic.png" width="14" height="14" border="0"/>
+                        </a>-->
+                        <xsl:choose>
+                            <xsl:when test="terms:indexer">
+                                <a href="{terms:action[@name='train']/@url}">Retrain indexer</a>
+                                <xsl:text>&nbsp;</xsl:text>
+                                <a href="{terms:action[@name='untrain']/@url}">
+                                    <img src="{$context-prefix}/assets/action-delete.png" width="14" height="14" border="0"/>
+                                </a>
+                                <a href="{terms:action[@name='untrain']/@url}">Delete indexer</a>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <a href="{terms:action[@name='train']/@url}">Train indexer</a>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                        <xsl:text>&nbsp;</xsl:text>
+                    </td>
+                </tr>
+                <xsl:if test="util:errorMessage/util:message">
+                    <td>&nbsp;</td>
+                    <td>
+                        <xsl:for-each select="util:errorMessage/util:message">
+                            <div class="domainActionErrorMessage">
+                                <xsl:value-of select="text()"/>
+                            </div>
+                        </xsl:for-each>
+                    </td>
+                </xsl:if>
+            </tfoot>
+        </table>
+    </xsl:template>
   
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/terms/domain-listing.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/terms/domain-listing.xsl
index d4f228b86..77370727d 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/terms/domain-listing.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/terms/domain-listing.xsl
@@ -36,11 +36,15 @@
           <tr class="{$class}">
             <xsl:choose>
               <xsl:when test="@isSelected">
-                <th><xsl:value-of select="terms:title"/></th>
+                <th>
+                    <xsl:value-of select="title"/>
+                </th>
               </xsl:when>
               <xsl:otherwise>
                 <td>
-                  <a title="{$hint}" href="{terms:action[@name='view']/@url}"><xsl:value-of select="terms:title"/></a>
+                  <a title="{$hint}" href="{terms:action[@name='view']/@url}">
+                      <xsl:value-of select="title"/>
+                  </a>
                 </td>
               </xsl:otherwise>
             </xsl:choose>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/terms/domain-usage.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/terms/domain-usage.xsl
index 4e77be9f1..168d84e5c 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/terms/domain-usage.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/terms/domain-usage.xsl
@@ -34,9 +34,9 @@
               <xsl:if test="not(terms:useContext)">
                 <xsl:text>Default</xsl:text>
               </xsl:if>
-              <xsl:value-of select="terms:useContext"/>
+              <xsl:value-of select="useContext"/>
             </td>
-            <td><xsl:value-of select="terms:categoryOwner/terms:primaryURL"/></td>
+            <td><xsl:value-of select="categoryOwner/primaryURL"/></td>
             <td>
               <xsl:for-each select="terms:action">
                 <a href="{@url}"><xsl:value-of select="@name"/></a>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/terms/term-details.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/terms/term-details.xsl
index 351322d24..a27967e8f 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/terms/term-details.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/terms/term-details.xsl
@@ -1,50 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
-  version="1.0">
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
+    version="1.0">
 
-  <xsl:template match="terms:termDetails">
-    <table class="termDetails">
-      <thead>
-        <tr><th colspan="2">Term details</th></tr>
-      </thead>
-      <tbody>
-        <tr class="even">
-          <th>Unique ID:</th>
-          <td><xsl:value-of select="terms:uniqueID"/></td>
-        </tr>
-        <tr class="odd">
-          <th>Name</th>
-          <td><xsl:value-of select="terms:model/terms:name"/></td>
-        </tr>
-        <tr class="even">
-          <th>Description:</th>
-          <td><xsl:value-of select="terms:model/terms:description"/></td>
-        </tr>
-        <tr class="odd">
-          <th>Shortcut:</th>
-          <td><xsl:value-of select="terms:shortcut"/></td>
-        </tr>
-        <tr class="even">
-          <th>In A-Z:</th>
-          <td><xsl:value-of select="terms:inAtoZ"/></td>
-        </tr>
-      </tbody>
-      <tfoot>
-        <tr>
-          <td></td>
-          <td>
-            <a href="{terms:action[@name='edit']/@url}"><img src="{$context-prefix}/assets/images/action-generic.png" width="14" height="14" border="0"/></a>
-            <a href="{terms:action[@name='edit']/@url}">Edit</a>
-            <xsl:text>&#160;</xsl:text>
-            <a href="{terms:action[@name='delete']/@url}"><img src="{$context-prefix}/assets/images/action-delete.png" width="14" height="14" border="0"/></a>
-            <a href="{terms:action[@name='delete']/@url}">Delete</a>
-            <xsl:text>&#160;</xsl:text>
-          </td>
-        </tr>
-      </tfoot>
-    </table>
-  </xsl:template>
+    <xsl:template match="terms:termDetails">
+        <table class="termDetails">
+            <thead>
+                <tr>
+                    <th colspan="2">Term details</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr class="even">
+                    <th>Unique ID:</th>
+                    <td>
+                        <xsl:value-of select="uniqueID"/>
+                    </td>
+                </tr>
+                <tr class="odd">
+                    <th>Name</th>
+                    <td>
+                        <xsl:value-of select="model/name"/>
+                    </td>
+                </tr>
+                <tr class="even">
+                    <th>Description:</th>
+                    <td>
+                        <xsl:value-of select="model/description"/>
+                    </td>
+                </tr>
+                <tr class="odd">
+                    <th>Shortcut:</th>
+                    <td>
+                        <xsl:value-of select="shortcut"/>
+                    </td>
+                </tr>
+                <tr class="even">
+                    <th>In A-Z:</th>
+                    <td>
+                        <xsl:value-of select="inAtoZ"/>
+                    </td>
+                </tr>
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td></td>
+                    <td>
+                        <!--<a href="{terms:action[@name='edit']/@url}">
+                            <img src="{$context-prefix}/assets/images/action-generic.png" width="14" height="14" border="0"/>
+                        </a>-->
+                        <a href="{terms:action[@name='edit']/@url}">Edit</a>
+                        <xsl:text>&#160;</xsl:text>
+                        <!--<a href="{terms:action[@name='delete']/@url}">
+                            <img src="{$context-prefix}/assets/images/action-delete.png" width="14" height="14" border="0"/>
+                        </a>-->
+                        <a href="{terms:action[@name='delete']/@url}">Delete</a>
+                        <xsl:text>&#160;</xsl:text>
+                    </td>
+                </tr>
+            </tfoot>
+        </table>
+    </xsl:template>
   
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/terms/term-listing.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/terms/term-listing.xsl
index 574e8ec71..7a6b01ad2 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/terms/term-listing.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/terms/term-listing.xsl
@@ -84,12 +84,12 @@
           
           <tr class="{$class}">
             <td width="20%">
-              <xsl:value-of select="terms:uniqueID"/>
+              <xsl:value-of select="uniqueID"/>
             </td>
             <xsl:choose>
               <xsl:when test="@isSelected">
                 <th>
-                  <xsl:value-of select="terms:model/terms:name"/>
+                  <xsl:value-of select="model/name"/>
                   <xsl:if test="terms:domain/terms:key">
                     <xsl:text> (</xsl:text>
                     <xsl:value-of select="terms:domain/terms:key"/>
@@ -99,7 +99,9 @@
               </xsl:when>
               <xsl:otherwise>
                 <td>
-                  <a href="{terms:action[@name='view']/@url}"><xsl:value-of select="terms:model/terms:name"/></a>
+                  <a href="{terms:action[@name='view']/@url}">
+                      <xsl:value-of select="model/name"/>
+                  </a>
                   <xsl:if test="terms:domain/terms:key">
                     <xsl:text> (</xsl:text>
                     <xsl:value-of select="terms:domain/terms:key"/>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/css-files.xml b/ccm-sci-bundle/web/themes/mandalay/settings/css-files.xml
index 5af9697cf..9031f2423 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/css-files.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/css-files.xml
@@ -39,5 +39,8 @@
     <css-file media="screen">admin.css</css-file>
     <!--<css-file>wysiwyg.css</css-file>-->
   </application>
+  <application name="terms">
+      <css-file media="screen">admin.css</css-file>
+  </application>
   
 </css-files>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/start.xml b/ccm-sci-bundle/web/themes/mandalay/settings/start.xml
index 6cfc55eb1..97542487e 100755
--- a/ccm-sci-bundle/web/themes/mandalay/settings/start.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/start.xml
@@ -37,7 +37,7 @@
   <entrypoint application="theme" class="simplePage">content-center.xml</entrypoint>
   <entrypoint application="shortcuts" class="simplePage">content-center.xml</entrypoint>
   <entrypoint application="subsite" class="simplePage">content-center.xml</entrypoint>
-  <entrypoint application="terms" class="simplePage">content-center.xml</entrypoint>
+  <entrypoint application="terms" class="simplePage">terms.xml</entrypoint>
   <entrypoint application="rss" class="simplePage">content-center.xml</entrypoint>
   
   <entrypoint application="portal" class="simplePage">portal.xml</entrypoint>