diff --git a/src/webapp/lenya/content/welcome.xml b/src/webapp/lenya/content/welcome.xml
index c3b4ebc..8c5c8d0 100644
--- a/src/webapp/lenya/content/welcome.xml
+++ b/src/webapp/lenya/content/welcome.xml
@@ -22,30 +22,56 @@
   xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
   xmlns="http://www.w3.org/1999/xhtml"
 >
-  <page:head/>
+  <page:title>Apache Lenya @lenya.version@ (Revision:@lenya.revision@)</page:title>
   <page:body>
+  
     <h1>Welcome to Apache Lenya</h1>
     <p>
-      You have successfully installed Apache Lenya <strong>@lenya.version@</strong> 
-      (Revision: @lenya.revision@). To start, click on any of the publications on the left.
+      You have successfully installed Apache Lenya 
+      <strong>@lenya.version@</strong> (Revision: @lenya.revision@).
+      To start, click on any of the publications on the left, or create
+      a new publication.
+    </p>
+  
+    <h2>About</h2>
+    <p>
+      <a href="http://lenya.apache.org">Apache Lenya</a> is a Java-based
+      <a href="http://www.opensource.org">open-source</a> Content Management 
+      System. It is based on open standards such as 
+      <a href="http://www.w3c.org/XML/">XML</a> and 
+      <a href="http://www.w3c.org/TR/xslt">XSLT</a>. It is based on
+      <a href="http://cocoon.apache.org">Apache Cocoon</a>.
     </p>
     <p>
-    <h2>About Apache Lenya</h2>
+      Lenya is a community project and is being developed under the aegis of the 
+      <a href="http://www.apache.org/">Apache Software Foundation (ASF)</a>. The
+      project was donated to the ASF by Michael Wechner of <a
+      href="http://wyona.com">Wyona AG</a> and accepted as a top-level ASF
+      project in 2004. You are welcome to join our mailing lists and contribute!
     </p>
-    <p>
-      <a href="http://lenya.apache.org">Apache Lenya</a> is a Java-based 
-      <a href="http://www.opensource.org">Open-Source</a> Content Management System. 
-      It is based on open standards such as <a href="http://www.w3c.org/XML/">XML</a> and 
-      <a href="http://www.w3c.org/TR/xslt">XSLT</a>. One of its core components is 
-      <a href="http://cocoon.apache.org">Cocoon</a> from the 
-      <a href="http://www.apache.org">Apache Software Foundation</a>.
-    </p>
-    <p>
-      Lenya supports inline WYSIWYG editors such as <a href="http://kupu.oscom.org">Kupu</a> 
-      or <a href="http://bxe.oscom.org">BXE</a>. Your site editors do not have to learn XML.
-      This is possible thanks to the support of XML, XSLT and XML Schema on the client side.
-      An administration interface allows advanced users to monitor the CMS, and perform 
-      configuration tasks.
-    </p>
+    
+    <h2>Features</h2>
+    <ul>
+      <li>supports multi-lingual websites</li>
+      <li>
+        includes several client-side content editors, many of them
+        WYSIWYG
+      </li>
+      <li>allows for complex workflows (edit/submit/review/publish)</li>
+      <li>
+        allows for arbitrary output, does not impose standard layouts or 
+        techniques (such as HTML tables) on the user
+      </li>
+      <li>
+        provides revision control, old page versions can be viewed and restored
+        if necessary
+      </li>
+      <li>
+        powerful XML processing capabilities thanks to the underlying Cocoon
+        engine
+      </li>
+      <li>...</li>
+    </ul>
+  
   </page:body>
-</page:page>
\ No newline at end of file
+</page:page>
diff --git a/src/webapp/lenya/xslt/util/introduction.xsl b/src/webapp/lenya/xslt/util/introduction.xsl
index c62e205..da71ba3 100644
--- a/src/webapp/lenya/xslt/util/introduction.xsl
+++ b/src/webapp/lenya/xslt/util/introduction.xsl
@@ -141,16 +141,18 @@
       </td>
     </tr>
     <tr>
-      <th style="white-space: nowrap;"><i18n:text>Templates used</i18n:text></th>
+      <th style="white-space: nowrap;"><i18n:text>Template used</i18n:text></th>
       <td class="border">
-        <xsl:for-each select="lenya:templates/lenya:template">
-          <a href="../{@id}/introduction.html">
-            <xsl:value-of select="@id"/>
-          </a>
-          <xsl:if test="position() != last()">
-            <xsl:text>, </xsl:text>
-          </xsl:if>
-        </xsl:for-each>
+        <xsl:choose>
+          <xsl:when test="lenya:template">
+            <a href="../{lenya:template/@id}/introduction.html">
+              <xsl:value-of select="lenya:template/@id"/>
+            </a>
+          </xsl:when>
+          <xsl:otherwise>
+            <i18n:text>none</i18n:text>
+          </xsl:otherwise>
+        </xsl:choose>
       </td>
     </tr>
   </table>