diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/drop_table_cms_article_image_map.sql b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/drop_table_cms_article_image_map.sql
index 744c7a551..9e3a8c01a 100644
--- a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/drop_table_cms_article_image_map.sql
+++ b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/drop_table_cms_article_image_map.sql
@@ -15,4 +15,6 @@
 --
 -- $Id: drop_table_cms_article_image_map.sql pboy $
 
+-- move data from cms_article_image_map to cms_item_image_attachments
+
 drop table cms_article_image_map;
\ No newline at end of file
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ImageComponentAbstractListener.java b/ccm-cms/src/com/arsdigita/cms/ui/ImageComponentAbstractListener.java
index d61d851ff..657757faa 100644
--- a/ccm-cms/src/com/arsdigita/cms/ui/ImageComponentAbstractListener.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/ImageComponentAbstractListener.java
@@ -28,11 +28,11 @@ import org.apache.log4j.Logger;
  * @author Sören Bernstein <quasi@quasiweb.de>
  */
 public abstract class ImageComponentAbstractListener implements FormInitListener,
-	FormProcessListener,
-	FormSubmissionListener {
+		FormProcessListener,
+		FormSubmissionListener {
 
 	private static final Logger s_log = Logger.getLogger(
-		ImageComponentSelectListener.class);
+			ImageComponentSelectListener.class);
 	MapComponentSelectionModel m_imageComponent;
 
 	public ImageComponentAbstractListener(MapComponentSelectionModel imageComponent) {
@@ -42,7 +42,7 @@ public abstract class ImageComponentAbstractListener implements FormInitListener
 
 	@Override
 	public void init(FormSectionEvent event)
-		throws FormProcessException {
+			throws FormProcessException {
 		PageState ps = event.getPageState();
 		if (!m_imageComponent.isSelected(ps)) {
 			setImageComponent(ps, ImageComponent.LIBRARY);
@@ -84,9 +84,12 @@ public abstract class ImageComponentAbstractListener implements FormInitListener
 			return;
 		}
 
-		ReusableImageAsset image = component.getImage(event);
+//		try {
+			ReusableImageAsset image = component.getImage(event);
 
-		processImage(event, ps, component, image);
+			processImage(event, ps, component, image);
+//		} catch (FormProcessException ex) {
+//		}
 	}
 
 	/**
@@ -97,8 +100,6 @@ public abstract class ImageComponentAbstractListener implements FormInitListener
 	protected void cancelled(PageState ps) {
 	}
 
-	;
-    
     /**
      * Process the input.
      * 
diff --git a/ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css b/ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css
index 5b477acbb..49e3901e9 100644
--- a/ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css
+++ b/ccm-sci-bundle/web/themes/mandalay/css/screen/global/admin.css
@@ -37,12 +37,14 @@ h1, h2, h3
 
 html, body{
   margin: 0;
+  border: 0;
   padding: 0;
   width: 100%;
   max-width: 100%;
   height: 100%;
   color: #4a4a4a;
   background-color: #e6e4f2;
+  background-image: none;
   font-family: Verdana, Helvetica, Arial, sans-serif;
   font-size: 1em;
   line-height: 1em;
@@ -63,15 +65,18 @@ h2 {
 .table {
   display: table;
   width: 100%;
+  border: none;
 }
 
 .tableRow {
   display: table-row;
+  border: none;
 }
 
 .tableCell, span.key, span.value {
   display: table-cell;
   width: auto;
+  border: none;
 }
 
 
@@ -402,12 +407,12 @@ div#content ul, div#content ol {
 
 /*----Left----*/
 div#left {
-  margin: 0;
+  margin: 0 !important;
   width: 25%;
 }
 
 div#left, div#right{
-  top: 0;
+  top: 0 !important;
   bottom: 0;
 }
 
@@ -534,7 +539,7 @@ table thead tr th {
   color: #999999;
   text-align: left;
   background-color: #eeeeee;
-  border: 1px solid #f2f0ff;
+  border: 1px solid #f2f0ff !important;
 }
 
 table tbody tr:nth-child(2n) {
@@ -545,6 +550,10 @@ table tbody tr td {
   text-align: left;
   vertical-align: middle;
   border: none !important;
+  hyphens: none;
+  -moz-hyphens: none;
+  -webkit-hyphens: none;
+  -o-hyphens: none;
 }
 
 table tbody tr td + td{ 
@@ -643,6 +652,10 @@ span.heading {
 
 span.key {
   font-weight: bold;
+  hyphens: none;
+  -moz-hyphens: none;
+  -webkit-hyphens: none;
+  -o-hyphens: none;
 }
 
 div.actionLink {  
@@ -694,6 +707,7 @@ ul.bebopList {
 
 #folder-browse table.dataTable tbody tr td { 
   text-align: left;
+  padding:5px;
 }
 
 #folder-browse table.dataTable tbody tr td + td + td + td + td { 
@@ -894,7 +908,8 @@ div.bebopPanelRow {
 	width:40%;
 }
 div.bebopPanelRow table tr td { 
-	margin-bottom:1em;
+  margin-bottom: 1em;
+  padding: 3px;
 }
 
 div.bebopPanelRow textarea{
@@ -923,6 +938,7 @@ div#right div.bebopBody {
 }
 
 div.bebopBody table tr{
+  border: none !important;
   text-align:left;
 }
 
@@ -1219,7 +1235,7 @@ div#cmsFooter .systemInformation {
 }
 
 div#cmsFooter .systemInformation a {
-  color: inherit;
+  color: inherit !important;
 }
 div#cmsFooter .systemInformation a:hover {
   color: #ffffff;
@@ -1239,7 +1255,7 @@ div#cmsFooter .cmsGlobalNavigation span:hover {
 }
 
 div#cmsFooter .cmsGlobalNavigation span a {
-  color: inherit;
+  color: inherit !important;
 }
 
 div#cmsFooter .cmsGlobalNavigation + .cmsGlobalNavigation {
@@ -1299,7 +1315,7 @@ a:focus, a:hover, a:active,
 }
 
 #left {
-  position: static;
+  position: static !important;
 	float: left;
 	m in-width: 14em;
 	height: 100%;
diff --git a/ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css b/ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css
index 6c84a3122..e78e735d2 100755
--- a/ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css
+++ b/ccm-sci-bundle/web/themes/mandalay/css/screen/global/basic.css
@@ -186,6 +186,11 @@ body,
   border-color: #f8f6ff;
 }
 
+.filterControls fieldset {
+    border-color: #0776a0;
+}
+
+
 /* Farben Ende */
 
 /* Schriften */
@@ -1835,3 +1840,15 @@ div.contentDefaultLayout div.editLink {
     top: 3em;
 }
 
+form.filterControls fieldset {
+    padding: 0.3em;
+}
+
+form.filterControls span.textFilter,
+form.filterControls span.categoryFilter{
+    display: block;
+}
+
+form.filterControls input.submit {
+    display: block;
+}
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageAttachment.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageAttachment.xsl
index 6d2dafaf0..8e6d0f1fb 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageAttachment.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/imageAttachment.xsl
@@ -137,6 +137,9 @@ Parameter showCaption: boolean to sshow caption
           <xsl:attribute name="href">
             <xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/image/?image_id=<xsl:value-of select="id"/>
           </xsl:attribute>
+          <xsl:attribute name="title">
+            <xsl:value-of select="../caption"/>
+          </xsl:attribute>
           <xsl:variable name="imageGallery">
             <xsl:choose>
               <xsl:when test="count(//cms:item/image | //cms:item/imageAttachments/image) > 1">
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
index b93ffb111..eea794b55 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
@@ -389,7 +389,7 @@
             <xsl:when test="$resultTree/@application = 'ds'">
                 <xsl:apply-templates select="$resultTree//ui:debugPanel | $resultTree//bebop:boxPanel"/>
             </xsl:when>
-            <xsl:otherwise>                
+            <xsl:otherwise>
                 <xsl:apply-templates select="$resultTree/nav:categoryHierarchy | $resultTree//cms:item | $resultTree//bebop:form"/>
             </xsl:otherwise>
         </xsl:choose>
@@ -632,35 +632,35 @@
         <xsl:apply-templates select=""/>
       </xsl:when>
       
--->
-      <xsl:when test="$resultTree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:body[//bebop:formWidget] | 
+            -->
+            <xsl:when test="$resultTree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:body[//bebop:formWidget] | 
                       $resultTree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:right[//bebop:formWidget]">
-        <form>
-          <xsl:if test="not(@method)">
-            <xsl:attribute name="method">post</xsl:attribute>
-          </xsl:if>
-          <xsl:call-template name="mandalay:processAttributes"/>
-          <xsl:apply-templates select="$resultTree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:body |
+                <form>
+                    <xsl:if test="not(@method)">
+                        <xsl:attribute name="method">post</xsl:attribute>
+                    </xsl:if>
+                    <xsl:call-template name="mandalay:processAttributes"/>
+                    <xsl:apply-templates select="$resultTree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:body |
                                        $resultTree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:right"/>
-        </form>
-      </xsl:when>
+                </form>
+            </xsl:when>
       
-      <xsl:when test="$resultTree//bebop:currentPane/bebop:form[not(//bebop:layoutPanel)]">
-        <xsl:apply-templates select="$resultTree//bebop:currentPane/bebop:form"/>
-      </xsl:when>
+            <xsl:when test="$resultTree//bebop:currentPane/bebop:form[not(//bebop:layoutPanel)]">
+                <xsl:apply-templates select="$resultTree//bebop:currentPane/bebop:form"/>
+            </xsl:when>
       
-      <xsl:when test="$resultTree//bebop:currentPane/cms:container/*[name() != 'cms:container']">
-        <xsl:apply-templates select="$resultTree//bebop:currentPane/cms:container/*[name() != 'cms:container']"/>
-      </xsl:when>
+            <xsl:when test="$resultTree//bebop:currentPane/cms:container/*[name() != 'cms:container']">
+                <xsl:apply-templates select="$resultTree//bebop:currentPane/cms:container/*[name() != 'cms:container']"/>
+            </xsl:when>
       
-      <xsl:when test="$resultTree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:body | 
+            <xsl:when test="$resultTree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:body | 
                       $resultTree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:right">
-        <xsl:apply-templates select="$resultTree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:body | 
+                <xsl:apply-templates select="$resultTree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:body | 
                                      $resultTree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:right"/>
-      </xsl:when>
+            </xsl:when>
       
-      <xsl:otherwise>
-        <xsl:apply-templates select="$resultTree//bebop:currentPane/bebop:layoutPanel/bebop:body |
+            <xsl:otherwise>
+                <xsl:apply-templates select="$resultTree//bebop:currentPane/bebop:layoutPanel/bebop:body |
                                      $resultTree//bebop:currentPane/bebop:layoutPanel/bebop:right |
                                      $resultTree//bebop:currentPane/cms:itemSummary | 
                                      $resultTree//bebop:currentPane/cms:categorySummary | 
@@ -668,15 +668,15 @@
                                      $resultTree//bebop:currentPane/cms:lifecycleSummary | 
                                      $resultTree//bebop:currentPane/cms:workflowSummary | 
                                      $resultTree//bebop:currentPane/cms:transactionSummary"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
 
-  <xsl:template match="showCMSGreeting">
-    <xsl:call-template name="mandalay:cmsGreeting">
-      <xsl:with-param name="resultTree" select="$resultTree"/>
-    </xsl:call-template>
-  </xsl:template>
+    <xsl:template match="showCMSGreeting">
+        <xsl:call-template name="mandalay:cmsGreeting">
+            <xsl:with-param name="resultTree" select="$resultTree"/>
+        </xsl:call-template>
+    </xsl:template>
 
     <xsl:template match="showContentType">
         <span id="contenttype">
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/moreButton.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/moreButton.xsl
index ad18d57d2..b173322a5 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/moreButton.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/moreButton.xsl
@@ -44,6 +44,7 @@
     <xsl:param name="module"/>
 
     <span class="moreButton">
+      <xsl:text> </xsl:text>
       <a>
         <xsl:attribute name="href">
           <xsl:text>/redirect/?oid=</xsl:text>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/search/filterControls.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/search/filterControls.xsl
index 0e5625547..3a66ee948 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/search/filterControls.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/search/filterControls.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'> <!ENTITY Cross '&#10799;'>]>
 
 <xsl:stylesheet 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -199,13 +199,54 @@
                     </span>
                 </xsl:when>
                 <xsl:when test="(./@type='categoryFilter')">
+                    <xsl:variable name="filterId">
+                        <xsl:value-of select="concat(../../@customName, ./@label, 'Filter')"/>
+                    </xsl:variable>
                     <span>
                         <xsl:attribute name="class">
                             <xsl:value-of select="'categoryFilter'"/>
                         </xsl:attribute>
                         <xsl:attribute name="id">
-                            <xsl:value-of select="concat(../../@customName, ./@label, 'Filter')"/>
+                            <xsl:value-of select="$filterId"/>
                         </xsl:attribute>
+                        <script type="text/javascript">
+                            function addSelectedCategory(catFilterId, selectedCategory) {
+                            //Add span to selected catagories aream, including close/remove function
+                            var elem = $(document.createElement('span'));
+                            elem.attr("id", catFilterId + "Selected" + selectedCategory.replace(" ", "_"));
+                            elem.append(selectedCategory);
+                            var closeElem = $(document.createElement('a'));
+                            closeElem.attr("href", "#");
+                            closeElem.append("&Cross;");
+                            closeElem.click(function() {
+                            removeSelectedCategory(elem, catFilterId, selectedCategory);
+                            });
+                            elem.append(closeElem);
+                                
+                            $("#" + catFilterId + " span.selectedCategories").append(elem);
+                                
+                            var newVal = $("#" + catFilterId + " input.selectedCategories").val() + selectedCategory + ";";
+                            $("#" + catFilterId + " input.selectedCategories").val(newVal);
+                            }
+                            
+                            function removeSelectedCategory(elem, catFilterId, category) {
+                            //alert("close\ncatFilterId = " + catFilterId);
+                                
+                            //var category = $(elem.text();
+                                
+                            //alert("category =" + category);
+                                
+                            //alert("oldVal = '" + $("#" + catFilterId + " input.selectedCategories").val() + "'\n"
+                            //    + "newVal = '" + $("#" + catFilterId + " input.selectedCategories").val().replace(category + ";", "") + "'");
+                               
+                                
+                            var newVal = $("#" + catFilterId + " input.selectedCategories").val().replace(category + ";", "");
+                            $("#" + catFilterId + " input.selectedCategories").val(newVal);
+                                
+                            elem.remove();
+                            return false;
+                            }
+                        </script>
                         <label>
                             <xsl:attribute name="for">
                                 <xsl:value-of select="concat(./@label, 'Filter')"/>
@@ -220,6 +261,7 @@
                                 <xsl:element name="input">
                                     <xsl:attribute name="type">text</xsl:attribute>
                                     <xsl:attribute name="size">42</xsl:attribute>
+                                    <xsl:attribute name="class">selectedCategories</xsl:attribute>
                                     <xsl:attribute name="maxlength">1024</xsl:attribute>
                                     <xsl:attribute name="id">
                                         <xsl:value-of select="concat(./@label, 'Filter')"/>
@@ -230,54 +272,62 @@
                                     <xsl:attribute name="value">
                                         <xsl:value-of select="./searchString"/>
                                     </xsl:attribute>
-                                </xsl:element>
-                                <span>
-                                    <xsl:attribute name="id">
-                                        <xsl:value-of select="concat(../../@customName, ./@label, 'Filter', 'Invalid')"/>
+                                    <xsl:attribute name="style">
+                                        <xsl:value-of select="'display:none'"/>
                                     </xsl:attribute>
-                                    <xsl:for-each select="./invalid/value">
-                                        <del>
+                                </xsl:element>
+                                <span class="selectedCategories">
+                                    <xsl:attribute name="id">
+                                        <xsl:value-of select="concat(./@label, 'SelectedKeywords')"/>
+                                    </xsl:attribute>
+                                    <xsl:for-each select="./categories/category[@selected='selected']">
+                                        <span>
+                                            <xsl:attribute name="id">
+                                                <xsl:value-of select="concat(../../../../@customName, ../../@label, 'Filter', 'Selected', translate(current(), ' ', '_'))"/>
+                                            </xsl:attribute>
                                             <xsl:value-of select="."/>
-                                        </del>
+                                            <a>
+                                                <xsl:attribute name="href">
+                                                    <xsl:value-of select="'#'"/>
+                                                </xsl:attribute>
+                                                <xsl:text>&Cross;</xsl:text>
+                                            </a>
+                                            <script type="text/javascript">
+                                                $("#<xsl:value-of select="concat(../../../../@customName, ../../@label, 'Filter', 'Selected', translate(current(), ' ', '_'))"/>").click(function() {
+                                                removeSelectedCategory($("#<xsl:value-of select="concat(../../../../@customName, ../../@label, 'Filter', 'Selected', translate(current(), ' ', '_'))"/>"), 
+                                                "<xsl:value-of select="concat(../../../../@customName, ../../@label, 'Filter')"/>", 
+                                                "<xsl:value-of select="concat(., ../separator)"/>");
+                                                return false;
+                                                });
+                                            </script>
+                                        </span>
                                     </xsl:for-each>
                                 </span>
-                                <script>
-                                    $(function() {
-                                    var availableTags = [ <xsl:value-of select="./categoriesStr"/> ];
-                        
-                                    function split(value) {
-                                    return value.split("<xsl:value-of select="./separator"/>");
-                                    }
+                                <select size="1" class="availableCategories">
+                                    <xsl:attribute name="id">
+                                        <xsl:value-of select="concat(./@label, 'AvailableCategories')"/>
+                                    </xsl:attribute>
+                                    <option value=""></option>
+                                    <xsl:for-each select="./categories/category">
+                                        <option>
+                                            <xsl:attribute name="value">
+                                                <xsl:value-of select="./@id"/>
+                                            </xsl:attribute>
+                                            <xsl:value-of select="."/>
+                                        </option>
+                                    </xsl:for-each>
+                                </select>
                                 
-                                    function extractLast(term) {
-                                    return split(term).pop();
-                                    }
-                                
-                                    $("<xsl:value-of select="concat('#', concat(./@label, 'Filter'))"/>")
-                                    .bind("keydown", function(event) {
-                                    if (event.keyCode === $.ui.keyCode.TAB &amp;&amp; 
-                                    $(this).data("ui-autocomplete").menu.active) {
-                                    event.preventDefault();
-                                    }
-                                    })
-                                    .autocomplete({
-                                    minLength: 0,
-                                    source: function(request, response) {
-                                    response($.ui.autocomplete.filter(availableTags, extractLast (request.term)));
-                                    },
-                                    focus: function() {
-                                    return false;
-                                    },
-                                    select: function(event, ui) {
-                                    var terms = split(this.value);
-                                    terms.pop();
-                                    terms.push(ui.item.value);
-                                    terms.push("");
-                                    this.value = terms.join(" ");
-                                    return false;
-                                    }
-                                    });
+                                <script type="text/javascript">
+                                    $("#<xsl:value-of select="concat(./@label, 'AvailableCategories')"/>").change(function() {
+                                    var catFilterId = "<xsl:value-of select="concat(../../@customName, ./@label, 'Filter')"/>";
+                                    var selectedCategory = $("#<xsl:value-of select="concat(./@label, 'AvailableCategories')"/> option:selected").text()
+                                    
+                                    addSelectedCategory(catFilterId, selectedCategory);
+                                        
+                                    $("#<xsl:value-of select="concat(./@label, 'AvailableCategories')"/>").val("");
                                     });
+                                    
                                 </script>
                             </xsl:when>
                             <xsl:otherwise>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/Bookmark.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/Bookmark.xsl
index b55ef23ba..b9c31ad7d 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/types/Bookmark.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/Bookmark.xsl
@@ -344,6 +344,7 @@
                 <xsl:with-param name="showCaption" select="$setImageCaption" />
                 <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
                 <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+                <xsl:with-param name="setZoomLink" select="'false'" />
               </xsl:call-template>
             </xsl:for-each>
           </a>
@@ -364,6 +365,7 @@
                 <xsl:with-param name="showCaption" select="$setImageCaption" />
                 <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
                 <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+                <xsl:with-param name="setZoomLink" select="'false'" />
               </xsl:call-template>
             </xsl:for-each>
           </a>
@@ -392,12 +394,23 @@
           </a>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:call-template name="mandalay:shying">
-            <xsl:with-param name="title">
-              <xsl:value-of disable-output-escaping="yes" select="./linkTitle"/>
-            </xsl:with-param>
-            <xsl:with-param name="mode">dynamic</xsl:with-param>
-          </xsl:call-template>
+          <a class="CIname">
+            <xsl:attribute name="href"><xsl:value-of select="./targetItem/url"/></xsl:attribute>
+            <xsl:attribute name="title">
+              <xsl:call-template name="mandalay:shying">
+                <xsl:with-param name="title">
+                  <xsl:value-of select="./linkTitle"/>
+                </xsl:with-param>
+                <xsl:with-param name="mode">dynamic</xsl:with-param>
+              </xsl:call-template>
+            </xsl:attribute>
+            <xsl:call-template name="mandalay:shying">
+              <xsl:with-param name="title">
+                <xsl:value-of disable-output-escaping="yes" select="./linkTitle"/>
+              </xsl:with-param>
+              <xsl:with-param name="mode">dynamic</xsl:with-param>
+            </xsl:call-template>
+          </a>
         </xsl:otherwise>
       </xsl:choose>
       <xsl:if test="./linkDescription and $setDescription">
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/MultiPartArticle.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/MultiPartArticle.xsl
index 3ea770738..a100c4aa9 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/types/MultiPartArticle.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/MultiPartArticle.xsl
@@ -179,7 +179,9 @@
             <xsl:value-of select="title"/>
           </a>
           <xsl:if test="position() != last()">
-            <xsl:value-of select="$separator"/>
+            <span class="separator">
+              <xsl:value-of select="$separator"/>
+            </span>
           </xsl:if>
         </xsl:for-each>
       </div>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/de/SciInstitute.xml b/ccm-sci-bundle/web/themes/mandalay/lang/de/SciInstitute.xml
index d9c282d3d..86b87395d 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/de/SciInstitute.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/de/SciInstitute.xml
@@ -26,7 +26,7 @@
   <line id="moreButton">weiter...</line>
   <line id="moreButtonTitle">mehr lesen</line>
 
-  <line id="departmentHeadPreText"> (Abteilungsleitung) </line>
+  <line id="departmentHeadPreText">Abteilungsleitung: </line>
 
   <line id="tabs/summary">Überblick</line>
   <line id="tabs/desc">Details</line>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/de/SciProject.xml b/ccm-sci-bundle/web/themes/mandalay/lang/de/SciProject.xml
index 22458950a..2d5dac470 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/de/SciProject.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/de/SciProject.xml
@@ -47,8 +47,10 @@
     <line id="summaryTab/headPreText"> </line>
     <line id="summaryTab/headPostText">(Projektleitung)</line>
 
+    <line id="summaryTab/fundingCode">Förderkennzeichen</line>
     <line id="summaryTab/sponsor">Drittmittelgeber</line>
-    <line id="summaryTab/fundingHeading">Finanzierung</line>    
+    <line id="summaryTab/sponsors">Drittmittelgeber</line>
+    <line id="summaryTab/fundingHeading">Finanzierung</line>
     <line id="summaryTab/fundingVolumeHeading">Volumen der Finanzierung</line>  
 
     <line id="summaryTab/involvedOrganizatinsHeading">Beteiligte Organisationen</line>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/de/filterControls.xml b/ccm-sci-bundle/web/themes/mandalay/lang/de/filterControls.xml
index 6fd3183d3..69341ef0c 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/de/filterControls.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/de/filterControls.xml
@@ -20,6 +20,12 @@
 -->
 
 <translations>
+  <line id="SubmitFilters">Anwenden</line>
+  <line id="sortAndFilterList">Liste filtern und sortieren</line>
+  <line id="filterList">Liste filtern</line>
+
+  <line id="keywords">Schlagworte</line>
+
   <line id="memberListsortAndFilterList">Mitgliederliste filtern</line>
   <line id="memberListfilterList">Mitgliederliste filtern</line>
   <line id="memberListSubmitFilters">Fitern</line>
@@ -31,14 +37,15 @@
   <line id="SciPublicationsListSubmitFilters">Publikationen filtern</line>
   <line id="SciPublicationsListSortList">Publikationen sortieren</line>
   <line id="SciPublicationsListtitle">Nach Titel filtern</line>
-  <line id="SciPublicationsListauthor">Nach Autor filtern</line>
+  <line id="SciPublicationsListauthorsStr">Nach Autor filtern</line>
   <line id="SciPublicationsListyearOfPublication">Erscheinungsjahr</line>
   <line id="SciPublicationsListyearOfPublicationAll">Alle</line>
   <line id="SciPublicationsListSortBy">Sortieren nach</line>
-  <line id="SciPublicationsListSortBytitle">Titel</line>
+  s<line id="SciPublicationsListSortBytitle">Titel</line>
   <line id="SciPublicationsListSortByyearAsc">Jahr (aufsteigend)</line>
   <line id="SciPublicationsListSortByyearDesc">Jahr (absteigend)</line>
   <line id="SciPublicationsListSortByauthors">Autoren</line>
+  <line id="SciPublicationsListkeywords">Schlagwörter</line>
 
   <line id="SciProjectListsortAndFilterList">Projekte filtern und sortieren</line>
   <line id="SciProjectListfilterList">Projekte filtern</line>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/en/SciInstitute.xml b/ccm-sci-bundle/web/themes/mandalay/lang/en/SciInstitute.xml
index 8e842aa86..b7bb28024 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/en/SciInstitute.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/SciInstitute.xml
@@ -26,7 +26,7 @@
   <line id="moreButton">more »</line>
   <line id="moreButtonTitle">read more</line>
 
-  <line id="departmentHeadPreText"> (Abteilungsleitung) </line>
+  <line id="departmentHeadPreText">Head of department: </line>
 
   <line id="tabs/summary">Overview</line>
   <line id="tabs/desc">Details</line>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/en/SciProject.xml b/ccm-sci-bundle/web/themes/mandalay/lang/en/SciProject.xml
index af87dc2e6..19ea8803d 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/en/SciProject.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/SciProject.xml
@@ -45,7 +45,9 @@
     <line id="summaryTab/headPreText"> </line>
     <line id="summaryTab/headPostText">(project coordinator)</line>
 
+    <line id="summaryTab/fundingCode">Funding code</line>
     <line id="summaryTab/sponsor">Sponsor</line>
+    <line id="summaryTab/sponsors">Sponsors</line>
     <line id="summaryTab/fundingHeading">Funding</line>  
     <line id="summaryTab/fundingVolumeHeading">Volume of funding</line>  
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/en/filterControls.xml b/ccm-sci-bundle/web/themes/mandalay/lang/en/filterControls.xml
index 01258dffd..92c57c5fe 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/en/filterControls.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/filterControls.xml
@@ -20,6 +20,14 @@
 -->
 
 <translations>
+
+  <line id="SubmitFilters">Apply</line>
+  <line id="sortAndFilterList">Filter and sort list</line>
+  <line id="filterList">Filter list by</line>
+
+  <line id="keywords">Keywords</line>
+
+
   <line id="SciPublicationsListsortAndFilterList">Filter and sort publications</line>
   <line id="SciPublicationsListfilterList">Filter publications</line>
   <line id="SciPublicationsListsortList">Sort publications</line>
diff --git a/ccm-sci-bundle/web/themes/mandalay/layout/PublicPersonalProfile.xml b/ccm-sci-bundle/web/themes/mandalay/layout/PublicPersonalProfile.xml
index fc1efbfbd..0448e666d 100755
--- a/ccm-sci-bundle/web/themes/mandalay/layout/PublicPersonalProfile.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/layout/PublicPersonalProfile.xml
@@ -87,6 +87,8 @@
             <div id="content"  class="profile" setTypeClass="true">
               <showContent>
                 <usePageTitle/>
+                <useLeadText/>
+                <useImage/>
                 <useContent/>
               </showContent>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/layout/navigation.xml b/ccm-sci-bundle/web/themes/mandalay/layout/navigation.xml
index 9141e6eb0..14bc8a9ec 100755
--- a/ccm-sci-bundle/web/themes/mandalay/layout/navigation.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/layout/navigation.xml
@@ -31,6 +31,7 @@
     <useCSSLoader/>
     <useFancybox/>
     <useMathJax/>
+    <useJqueryUi/>
   </head>
   <body>
 
@@ -111,7 +112,6 @@
             <div class="endFloat"/>
           </divIfNotEmpty>
 
-          <showPublicationExportLinks/>
           <showList>
             <useListHeader>
               <setHeading>false</setHeading>
@@ -121,6 +121,7 @@
             <useList>itemList</useList>
             <usePaginatorNavbar/>
           </showList>
+          <showPublicationExportLinks/>
         </div>
 
 <!--
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl
index de64b1008..62b39a292 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl
@@ -61,7 +61,7 @@ To use the templates definied here follow these steps:
   <piwikImageTracker piwikUrl="piwik.example.org" idSite="42"/>
 
   with the correct values for the piwikUrl (without protocol!) and idSite.
-  piwikUrl is the URL of your Piwik installation, siteI dis the
+  piwikUrl is the URL of your Piwik installation, idSite is the
   the ID of your site in Piwik. These value can be found in settings
   of Piwik itself. 
 
@@ -75,7 +75,7 @@ To use the templates definied here follow these steps:
                 xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
                 xmlns:cms="http://www.arsdigita.com/cms/1.0"
                 exclude-result-prefixes="xsl bebop cms"
-  version="1.0">
+                version="1.0">
 
   <xsl:template name="piwikJsTracker">
     <xsl:param name="piwikUrl"/>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciDepartment/SciDepartment.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciDepartment/SciDepartment.xsl
index dd767de63..4f5860959 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciDepartment/SciDepartment.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciDepartment/SciDepartment.xsl
@@ -37,38 +37,72 @@
         *****************************************************
     -->
 
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciDepartment']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciDepartment'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciDepartment']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciDepartment'"/>
+        <xsl:with-param name="setting" select="'setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxHeight">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciDepartment'"/>
+        <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxWidth">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciDepartment'"/>
+        <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciDepartment'"/>
+        <xsl:with-param name="setting" select="'setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
     <xsl:template name="CT_SciDepartment_graphics"
                   match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciDepartment']"
                   mode="detailed_view">
         
-        <xsl:variable name="setImage">
-            <xsl:call-template name="mandalay:getSetting">
-                <xsl:with-param name="module"  select="'SciDepartment'"/>
-                <xsl:with-param name="setting" select="'setImage'"/>
-                <xsl:with-param name="default" select="'true'"/>
-            </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="setImageCaption">
-            <xsl:call-template name="mandalay:getSetting">
-                <xsl:with-param name="module"  select="'SciDepartment'"/>
-                <xsl:with-param name="setting" select="'setImageCaption'"/>
-                <xsl:with-param name="default" select="'true'"/>
-            </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="setImageMaxHeight">
-            <xsl:call-template name="mandalay:getSetting">
-                <xsl:with-param name="module"  select="'SciDepartment'"/>
-                <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
-                <xsl:with-param name="default" select="''"/>
-            </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="setImageMaxWidth">
-            <xsl:call-template name="mandalay:getSetting">
-                <xsl:with-param name="module"  select="'SciDepartment'"/>
-                <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
-                <xsl:with-param name="default" select="''"/>
-            </xsl:call-template>
-        </xsl:variable>
         <xsl:variable name="setAddendum">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module"  select="'SciDepartment'"/>
@@ -86,14 +120,6 @@
         </xsl:variable>
         
         <div id="mainBody" class="sciTypesOrganization sciDepartment">
-            <xsl:if test="$setImage = 'true'">
-                <xsl:call-template name="mandalay:imageAttachment">
-                    <xsl:with-param name="showCaption" select="$setImageCaption" />
-                    <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-                    <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-                </xsl:call-template>
-            </xsl:if>
-
             <xsl:if test="$setAddendum = 'true'">
                 <span class="addendum">
                     <xsl:value-of select="./addendum"/>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciInstitute/SciInstitute.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciInstitute/SciInstitute.xsl
index ba182e2de..239fd28de 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciInstitute/SciInstitute.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciInstitute/SciInstitute.xsl
@@ -37,21 +37,34 @@
       *****************************************************
   -->
 
-  <xsl:template name="CT_SciInstitute_graphics"
-		match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciInstitute']"
-		mode="detailed_view">
-
-    <xsl:variable name="setImage">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciInstitute']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-	<xsl:with-param name="module"  select="'SciInstitute'"/>
-	<xsl:with-param name="setting" select="'setImage'"/>
-	<xsl:with-param name="default" select="'true'"/>
+        <xsl:with-param name="module"  select="'SciInstitute'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciInstitute']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-	<xsl:with-param name="module"  select="'SciInstitute'"/>
-	<xsl:with-param name="setting" select="'setImageCaption'"/>
+        <xsl:with-param name="module"  select="'SciInstitute'"/>
+        <xsl:with-param name="setting" select="'setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
@@ -69,6 +82,27 @@
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciInstitute'"/>
+        <xsl:with-param name="setting" select="'setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="CT_SciInstitute_graphics"
+		match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciInstitute']"
+		mode="detailed_view">
+
     <xsl:variable name="setAddendum">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'SciInstitute'"/>
@@ -86,13 +120,6 @@
     </xsl:variable>
 
     <div id="mainBody" class="sciTypesOrganization sciDepartment">
-      <xsl:if test="$setImage = 'true'">
-	<xsl:call-template name="mandalay:imageAttachment">
-	  <xsl:with-param name="showCaption" select="$setImageCaption" />
-	  <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-	  <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-	</xsl:call-template>
-      </xsl:if>
 
       <xsl:if test="$setAddendum = 'true'">
 	<span class="addendum">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl
index 39d6fb872..be9d7c3c8 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciMember/SciMember.xsl
@@ -29,6 +29,68 @@
   exclude-result-prefixes="xsl bebop cms"
   version="1.0">
 
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciMember']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciMember'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./pageDescription and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./pageDescription"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciMember']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciMember'"/>
+        <xsl:with-param name="setting" select="'setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxHeight">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciMember'"/>
+        <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxWidth">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciMember'"/>
+        <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciMember'"/>
+        <xsl:with-param name="setting" select="'setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
   <!-- DE Vollansicht -->
   <!-- EN Detailed view -->
   <xsl:template name="CT_SciMember_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciMember']" mode="detailed_view">
@@ -70,34 +132,6 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImage">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciMember'"/>
-        <xsl:with-param name="setting" select="'setImage'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageMaxHeight">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciMember'"/>
-        <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
-        <xsl:with-param name="default" select="''"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageMaxWidth">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciMember'"/>
-        <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
-        <xsl:with-param name="default" select="''"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageCaption">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciMember'"/>
-        <xsl:with-param name="setting" select="'setImageCaption'"/>
-        <xsl:with-param name="default" select="'false'"/>
-      </xsl:call-template>
-    </xsl:variable>
     
     <div id="greeting">
       <xsl:call-template name="CT_GenericPerson_details">
@@ -156,15 +190,6 @@
     </xsl:for-each>
     </div>
 
-    <xsl:if test="$setImage = 'true'">
-      <div id="member_image">
-      <xsl:call-template name="mandalay:imageAttachment">
-        <xsl:with-param name="showCaption" select="$setImageCaption"/>
-        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-      </xsl:call-template>
-      </div>
-    </xsl:if>
     <div class="endFloat"/>
 
   </xsl:template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject.xsl
index c36ef5d03..e4086762c 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject.xsl
@@ -21,16 +21,16 @@
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-		xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-		xmlns:cms="http://www.arsdigita.com/cms/1.0"
-		xmlns:nav="http://ccm.redhat.com/navigation"
-		xmlns:mandalay="http://mandalay.quasiweb.de"
-		xmlns:dabin="http://dabin.quasiweb.de"
-		exclude-result-prefixes="xsl bebop cms mandalay dabin"
-		version="1.0">
+                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+                xmlns:cms="http://www.arsdigita.com/cms/1.0"
+                xmlns:nav="http://ccm.redhat.com/navigation"
+                xmlns:mandalay="http://mandalay.quasiweb.de"
+                xmlns:dabin="http://dabin.quasiweb.de"
+                exclude-result-prefixes="xsl bebop cms mandalay dabin"
+                version="1.0">
 
-  <xsl:import href="SciProject/SciProject.xsl"/>
-  <xsl:import href="SciProject/SciProjectSummaryTab.xsl"/>
-  <xsl:import href="SciProject/SciProjectDescTab.xsl"/>
+    <xsl:import href="SciProject/SciProject.xsl"/>
+    <xsl:import href="SciProject/SciProjectSummaryTab.xsl"/>
+    <xsl:import href="SciProject/SciProjectDescTab.xsl"/>
 
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject/SciProject.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject/SciProject.xsl
index fb431107b..18bae806e 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject/SciProject.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject/SciProject.xsl
@@ -22,536 +22,559 @@
 -->
 
 <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:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:mandalay="http://mandalay.quasiweb.de"
-  exclude-result-prefixes="xsl bebop cms nav"
-  version="1.0"
-  >
+    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:cms="http://www.arsdigita.com/cms/1.0"
+    xmlns:mandalay="http://mandalay.quasiweb.de"
+    exclude-result-prefixes="xsl bebop cms nav"
+    version="1.0"
+>
 
-  <!-- 
-       ***************************************************
-       ** Template for the detail view of a SciProject  **
-       ***************************************************
-  -->
+    <!-- 
+         ***************************************************
+         ** Template for the detail view of a SciProject  **
+         ***************************************************
+    -->
 
-  <xsl:template name="CT_SciProject_graphics"
-		match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciProject']"
-		mode="detailed_view">
+    <xsl:template name="CT_SciProject_graphics"
+                  match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciProject']"
+                  mode="detailed_view">
+
+        <xsl:variable name="setImage">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SciProject'"/>
+                <xsl:with-param name="setting" select="'setImage'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setImageCaption">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SciProject'"/>
+                <xsl:with-param name="setting" select="'setImageCaption'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setImageMaxHeight">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SciProject'"/>
+                <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
+                <xsl:with-param name="default" select="''"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setImageMaxWidth">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SciProject'"/>
+                <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
+                <xsl:with-param name="default" select="''"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setAddendum">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SciProject'"/>
+                <xsl:with-param name="setting" select="'setAddendum'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setShowHeading">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SciProject'"/>
+                <xsl:with-param name="setting" select="'setShowHeading'"/>
+                <xsl:with-param name="default" select="'false'"/>
+            </xsl:call-template>
+        </xsl:variable>
+
+        <xsl:variable name="subNavSeparator">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SciProject'"/>
+                <xsl:with-param name="setting" select="'subNavSeparator'"/>
+                <xsl:with-param name="default" select="' | '"/>
+            </xsl:call-template>
+        </xsl:variable>
+
+        <xsl:variable name="setLifespan">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SciProject'"/>
+                <xsl:with-param name="setting" select="'setLifespan'"/>
+                <xsl:with-param name="default" select="'true'"/>	
+            </xsl:call-template>
+        </xsl:variable>
     
-    <xsl:variable name="setImage">
-	  <xsl:call-template name="mandalay:getSetting">
-	    <xsl:with-param name="module"  select="'SciProject'"/>
-	    <xsl:with-param name="setting" select="'setImage'"/>
-	    <xsl:with-param name="default" select="'true'"/>
-	  </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageCaption">
-      <xsl:call-template name="mandalay:getSetting">
-	<xsl:with-param name="module"  select="'SciProject'"/>
-	<xsl:with-param name="setting" select="'setImageCaption'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageMaxHeight">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciProject'"/>
-        <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
-        <xsl:with-param name="default" select="''"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageMaxWidth">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciProject'"/>
-        <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
-        <xsl:with-param name="default" select="''"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setAddendum">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciProject'"/>
-        <xsl:with-param name="setting" select="'setAddendum'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setShowHeading">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciProject'"/>
-        <xsl:with-param name="setting" select="'setShowHeading'"/>
-        <xsl:with-param name="default" select="'false'"/>
-      </xsl:call-template>
-    </xsl:variable>
+        <xsl:if test="$setAddendum = 'true'">
+            <span class="addendum">
+                <xsl:value-of select="./addendum"/>
+            </span>
+        </xsl:if>
 
-    <xsl:variable name="subNavSeparator">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciProject'"/>
-        <xsl:with-param name="setting" select="'subNavSeparator'"/>
-        <xsl:with-param name="default" select="' | '"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="setLifespan">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciProject'"/>
-        <xsl:with-param name="setting" select="'setLifespan'"/>
-        <xsl:with-param name="default" select="'true'"/>	
-      </xsl:call-template>
-    </xsl:variable>
-    
-    <xsl:if test="$setAddendum = 'true'">
-      <span class="addendum">
-        <xsl:value-of select="./addendum"/>
-      </span>
-    </xsl:if>
-
-    <xsl:if test="$setImage = 'true'">
-      <xsl:call-template name="mandalay:imageAttachment">
-        <xsl:with-param name="showCaption" select="$setImageCaption" />
-        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-      </xsl:call-template>
-    </xsl:if>
-
-    <div id="mainBody" class="sciTypesOrganization sciProject">
-      <xsl:if test="($setLifespan = 'true') and (string-length(./projectBegin/@longDate &gt; 0))">
-        <div class="lifespan">
-          <span>
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'SciProject'"/>
-              <xsl:with-param name="id" select="'lifespan'"/>
+        <xsl:if test="$setImage = 'true'">
+            <xsl:call-template name="mandalay:imageAttachment">
+                <xsl:with-param name="showCaption" select="$setImageCaption" />
+                <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+                <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
             </xsl:call-template>
-	  </span>
+        </xsl:if>
 
-	    <xsl:if test="not(./projectEnd)">
-	      <xsl:call-template name="mandalay:getStaticText">
-		<xsl:with-param name="module" select="'SciProject'"/>
-		<xsl:with-param name="id" select="'lifespan/from'"/>
-	      </xsl:call-template>
-	    </xsl:if>
+        <div id="mainBody" class="sciTypesOrganization sciProject">
+            <xsl:if test="($setLifespan = 'true') and (string-length(./projectBegin/@longDate &gt; 0))">
+                <div class="lifespan">
+                    <span>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SciProject'"/>
+                            <xsl:with-param name="id" select="'lifespan'"/>
+                        </xsl:call-template>
+                    </span>
 
-	    <xsl:choose>
-	      <xsl:when test="./projectBeginSkipMonth = 'true'">
-		<xsl:value-of select="./projectBegin/@year"/>
-	      </xsl:when>
-	      <xsl:when test="./projectBeginSkipDay = 'true'">
-		<xsl:call-template name="mandalay:getStaticText">
-		  <xsl:with-param name="module" select="'monthNames'"/>
-		  <xsl:with-param name="id" select="./projectBegin/@month"/>
-		</xsl:call-template>
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="./projectBegin/@year"/>		  
-	      </xsl:when>
-	      <xsl:otherwise>
-		<xsl:value-of select="./projectBegin/@longDate"/>
-	      </xsl:otherwise>
-	    </xsl:choose>
-          <xsl:if test="./projectEnd and string-length(./projectEnd/@longDate) &gt; 0">
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'SciProject'"/>
-              <xsl:with-param name="id" select="'lifespan/until'"/>
-            </xsl:call-template>
-	    <xsl:choose>
-	      <xsl:when test="./projectEndSkipDay = 'true'">
-		<xsl:value-of select="./projectEnd/@year"/>
-	      </xsl:when>
-	      <xsl:when test="./projectEndSkipMonth = 'true'">
-		<xsl:call-template name="mandalay:getStaticText">
-		  <xsl:with-param name="module" select="'monthNames'"/>
-		  <xsl:with-param name="id" select="./projectEnd/@month"/>
-		</xsl:call-template>
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="./projectEnd/@year"/>
-	      </xsl:when>
-	      <xsl:otherwise>
-		<xsl:value-of select="./projectEnd/@longDate"/>
-	      </xsl:otherwise>
-	    </xsl:choose>
-          </xsl:if>
-        </div>
-      </xsl:if>
+                    <xsl:if test="not(./projectEnd)">
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SciProject'"/>
+                            <xsl:with-param name="id" select="'lifespan/from'"/>
+                        </xsl:call-template>
+                    </xsl:if>
 
-      <ul class="availableData">
-        <xsl:for-each select="./orgaUnitTabs/availableTabs/availableTab">
-	  <li>
-	    <xsl:if test="./@selected = 'true'">
-	      <xsl:attribute name="class">selectedTab active</xsl:attribute>
-	    </xsl:if>
-	    <a>
-	      <xsl:attribute name="href">
-		<xsl:call-template name="mandalay:linkParser">
-		  <xsl:with-param name="link" select="concat('?selectedTab=', ./@label)"/>
-		</xsl:call-template>
-	      </xsl:attribute>
-	      <xsl:if test="./@selected = 'true'">
-		<xsl:attribute name="class">selectedTab active</xsl:attribute>
-	      </xsl:if>
-	      <xsl:call-template name="mandalay:getStaticText">
-	      <xsl:with-param name="module" select="'SciProject'"/>
-	      <xsl:with-param name="id" select="concat('tabs/', ./@label)"/>
-	      </xsl:call-template>
-	    </a>
-	  </li>
-        </xsl:for-each>
-      </ul>
-
-      <div class="activeTab">
-        <xsl:apply-templates select="./orgaUnitTabs/selectedTab" mode="tabs"/>
-      </div>
-
-    </div>
-
-  </xsl:template>
-
-  <xsl:template name="CT_SciProject_List"
-    		match="nav:item[nav:attribute[@name='objectType'] = 'com.arsdigita.cms.contenttypes.SciProject']"
-		mode="list_view">
-    <xsl:variable name="linkProject">
-      <xsl:call-template name="mandalay:getSetting">
-	<xsl:with-param name="module" select="'SciProject'"/>
-	<xsl:with-param name="setting" select="'listView/linkProject'"/>
-	<xsl:with-param name="default" select="'true'"/>	
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="showLifespan">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciProject'"/>
-        <xsl:with-param name="setting" select="'listView/showLifespan'"/>
-	<xsl:with-param name="default" select="'true'"/>	
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="showMembers">
-      <xsl:call-template name="mandalay:getSetting">
-	<xsl:with-param name="module" select="'SciProject'"/>
-	<xsl:with-param name="setting" select="'listView/showMembers'"/>
-	<xsl:with-param name="default" select="'true'"/>	
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="emphHead">
-      <xsl:call-template name="mandalay:getSetting">
-	<xsl:with-param name="module" select="'SciProject'"/>
-	<xsl:with-param name="setting" select="'listView/emphHead'"/>
-	<xsl:with-param name="default" select="'true'"/>	
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="projectHeadText">
-      <xsl:call-template name="mandalay:getStaticText">
-	<xsl:with-param name="module" select="'SciProject'"/>
-	<xsl:with-param name="id" select="'listView/projectHeadText'"/>	
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="projectFormerMemberText">
-      <xsl:call-template name="mandalay:getStaticText">
-	<xsl:with-param name="module" select="'SciProject'"/>
-	<xsl:with-param name="id" select="'listView/projectFormerMemberText'"/>	
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="projectMemberSeparator">
-      <xsl:call-template name="mandalay:getSetting">
-	<xsl:with-param name="module" select="'SciProject'"/>
-	<xsl:with-param name="setting" select="'listView/projectMemberSeparator'"/>
-	<xsl:with-param name="default" select="', '"/>	
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="showShortDesc">
-      <xsl:call-template name="mandalay:getSetting">
-	<xsl:with-param name="module" select="'SciProject'"/>
-	<xsl:with-param name="setting" select="'listView/showShortDesc'"/>
-	<xsl:with-param name="default" select="'true'"/>	
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="CT_SciProject_ListItem">
-      <xsl:with-param name="linkProject" select="$linkProject"/>
-      <xsl:with-param name="showLifespan" select="$showLifespan"/>
-      <xsl:with-param name="showMembers" select="$showMembers"/>
-      <xsl:with-param name="emphHead" select="$emphHead"/>
-      <xsl:with-param name="projectHeadText" select="$projectHeadText"/>
-      <xsl:with-param name="projectFormerMemberText" select="$projectFormerMemberText"/>
-      <xsl:with-param name="projectMemberSeparator" select="$projectMemberSeparator"/>
-      <xsl:with-param name="showShortDesc" select="$showShortDesc"/>
-    </xsl:call-template>
-
-  </xsl:template>
-
-  <xsl:template name="CT_SciProject_UlList"
-		mode="list_view">
-    <xsl:param name="linkProject" select="'true'"/>
-    <xsl:param name="showLifespan" select="'true'"/>
-    <xsl:param name="showMembers" select="'true'"/>
-    <xsl:param name="emphHead" select="'true'"/>
-    <xsl:param name="projectHeadText" select="''"/>
-    <xsl:param name="projectFormerMemberText" select="''"/>
-    <xsl:param name="projectMemberSeparator" select="', '"/>
-    <xsl:param name="showShortDesc" select="'false'"/>
-    <xsl:param name="useRelativeUrl" select="'false'"/>
-    
-    <li>
-      <xsl:call-template name="CT_SciProject_ListItem">
-	<xsl:with-param name="linkProject" select="$linkProject"/>
-	<xsl:with-param name="showLifespan" select="$showLifespan"/>
-	<xsl:with-param name="showMembers" select="$showMembers"/>
-	<xsl:with-param name="emphHead" select="$emphHead"/>
-	<xsl:with-param name="projectHeadText" select="$projectHeadText"/>
-	<xsl:with-param name="projectFormerMemberText" select="$projectFormerMemberText"/>
-	<xsl:with-param name="projectMemberSeparator" select="$projectMemberSeparator"/>
-	<xsl:with-param name="showShortDesc" select="$showShortDesc"/>
-	<xsl:with-param name="useRelativeUrl" select="$useRelativeUrl"/>
-      </xsl:call-template>
-    </li>
-  </xsl:template>
-
-  <xsl:template name="CT_SciProject_ListItem"
-		mode="list_view">
-    <xsl:param name="linkProject" select="'true'"/>
-    <xsl:param name="showLifespan" select="'true'"/>
-    <xsl:param name="showMembers" select="'true'"/>
-    <xsl:param name="emphHead" select="'true'"/>
-    <xsl:param name="projectHeadText" select="''"/>
-    <xsl:param name="projectFormerMemberText" select="''"/>
-    <xsl:param name="projectMemberSeparator" select="', '"/>
-    <xsl:param name="showShortDesc" select="'false'"/>
-    <xsl:param name="useRelativeUrl" select="'false'"/>
-
-      <xsl:choose>
-	<xsl:when test="$linkProject = 'true'">
-	  <a class="CIname">
-	    <xsl:choose>
-	      <xsl:when test="$useRelativeUrl = 'true'">
-		<xsl:attribute name="href"><xsl:value-of select="@oid"/></xsl:attribute>
-	      </xsl:when>
-	      <xsl:otherwise>
-		<xsl:attribute name="href">/redirect/?oid=<xsl:value-of select="@oid"/></xsl:attribute>
-	      </xsl:otherwise>
-	    </xsl:choose>	 
-	    <xsl:value-of select="./title"/>
-	  </a>
-	</xsl:when>
-	<xsl:otherwise>
-	  <em><xsl:value-of select="./title"/></em>	
-	</xsl:otherwise>
-      </xsl:choose>
-      <xsl:if test="($showLifespan = 'true') and (string-length(./projectBegin/@longDate) &gt; 0)">
-      	<div class="sciProjectLifespan">
-      	  <span>
-      	    <xsl:call-template name="mandalay:getStaticText">
-      	        <xsl:with-param name="module" select="'SciProject'"/>
-      	        <xsl:with-param name="id" select="'lifespan'"/>
-      	    </xsl:call-template>
-      	  </span>
-      	  <xsl:if test="not(./projectEnd)">
-      	    <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'SciProject'"/>
-              <xsl:with-param name="id" select="'lifespan/from'"/>
-            </xsl:call-template>
-      	  </xsl:if>
-      	  
-      	   <xsl:choose>
-              <xsl:when test="./projectBeginSkipMonth = 'true'">
-                <xsl:value-of select="./projectBegin/@year"/>
-              </xsl:when>
-              <xsl:when test="./projectBeginSkipDay = 'true'">
-                <xsl:call-template name="mandalay:getStaticText">
-                  <xsl:with-param name="module" select="'monthNames'"/>
-                  <xsl:with-param name="id" select="./projectBegin/@month"/>
-                </xsl:call-template>
-                <xsl:text> </xsl:text>
-                <xsl:value-of select="./projectBegin/@year"/>             
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="./projectBegin/@longDate"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          <xsl:if test="./projectEnd and string-length(./projectEnd/@longDate) &gt; 0">
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'SciProject'"/>
-              <xsl:with-param name="id" select="'lifespan/until'"/>
-            </xsl:call-template>
-            <xsl:choose>
-              <xsl:when test="./projectEndSkipDay = 'true'">
-                <xsl:value-of select="./projectEnd/@year"/>
-              </xsl:when>
-              <xsl:when test="./projectEndSkipMonth = 'true'">
-                <xsl:call-template name="mandalay:getStaticText">
-                  <xsl:with-param name="module" select="'monthNames'"/>
-                  <xsl:with-param name="id" select="./projectEnd/@month"/>
-                </xsl:call-template>
-                <xsl:text> </xsl:text>
-                <xsl:value-of select="./projectEnd/@year"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="./projectEnd/@longDate"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:if>
-      	</div>
-      </xsl:if>
-      <xsl:if test="$showMembers = 'true'">
-	<div class="members">
-	  <xsl:for-each select="./members/member">
-	    <xsl:if test="string-length(./givenName) &gt; 0">
-	      <xsl:value-of select="./givenName"/>
-	      <xsl:text> </xsl:text>		    
-	    </xsl:if>
-	    <xsl:if test="string-length(./surname) &gt; 0">
-	      <xsl:value-of select="./surname"/>
-	      <xsl:if test="($emphHead = 'true') and (./@role = 'head') and ((./@status != 'former') or (string-length(./@status) = 0))">
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="$projectHeadText"/>
-	      </xsl:if>
-		<xsl:if test="./@status = 'former' and (string-length($projectFormerMemberText) &gt; 1)">
-			<xsl:text> </xsl:text>
-			<xsl:value-of select="$projectFormerMemberText"/>
-	      </xsl:if>
-	      <xsl:if test="(position() &lt; count(../persons)) or (position() &lt; count(../member))">
-		<xsl:value-of select="$projectMemberSeparator"/>			
-	      </xsl:if>		    
-	    </xsl:if>
-	  </xsl:for-each>
-	</div>
-      </xsl:if>
-      <xsl:if test="($showShortDesc = 'true')">
-	<div class="shortDesc">
-	  <xsl:value-of select="./projectShortDesc"/>
-	</div>
-      </xsl:if> 
-  </xsl:template>
-
-  <xsl:template name="CT_SciProject_Link" 
-		match="*/cms:item/links[targetItem/objectType = 'com.arsdigita.cms.contenttypes.SciProject']" 
-		mode="link_view">
-    <!-- DE Hole alle benötigten Einstellungen-->
-    <!-- EN Getting all needed setting-->
-    <xsl:variable name="setImageAndText">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciMember'"/>
-        <xsl:with-param name="setting" select="'linkView/setImageAndText'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImage">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciMember'"/>
-        <xsl:with-param name="setting" select="'linkView/setImage'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageMaxHeight">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciMember'"/>
-        <xsl:with-param name="setting" select="'linkView/setImageMaxHeight'"/>
-        <xsl:with-param name="default" select="''"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageMaxWidth">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciMember'"/>
-        <xsl:with-param name="setting" select="'linkView/setImageMaxWidth'"/>
-        <xsl:with-param name="default" select="''"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageCaption">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciMember'"/>
-        <xsl:with-param name="setting" select="'linkView/setImageCaption'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setDescription">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciMember'"/>
-        <xsl:with-param name="setting" select="'linkView/setDescription'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setDescriptionLength">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciMember'"/>
-        <xsl:with-param name="setting" select="'linkView/setDescriptionLength'"/>
-        <xsl:with-param name="default" select="'0'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setMoreButton">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciMember'"/>
-        <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
-        <xsl:with-param name="default" select="'false'"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <!-- DE Wenn es Bilder gibt, dann soll das erste hier als Link angezeigt werden -->
-    <!-- EN -->
-    <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
-      <a>
-        <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-        <xsl:attribute name="title">
-          <xsl:call-template name="mandalay:shying">
-            <xsl:with-param name="title">
-              <xsl:value-of select="./linkTitle"/>
-            </xsl:with-param>
-            <xsl:with-param name="mode">dynamic</xsl:with-param>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:for-each select="./targetItem">
-          <xsl:call-template name="mandalay:imageAttachment">
-            <xsl:with-param name="showCaption" select="$setImageCaption" />
-            <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-            <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-          </xsl:call-template>
-        </xsl:for-each>
-      </a>
-    </xsl:if>
-    <xsl:if test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
-      <a class="CIname">
-        <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-        <xsl:attribute name="title">
-          <xsl:call-template name="mandalay:shying">
-            <xsl:with-param name="title">
-              <xsl:value-of select="./linkTitle"/>
-            </xsl:with-param>
-            <xsl:with-param name="mode">dynamic</xsl:with-param>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:call-template name="mandalay:shying">
-          <xsl:with-param name="title">
-            <xsl:value-of disable-output-escaping="yes" select="./linkTitle"/>
-          </xsl:with-param>
-          <xsl:with-param name="mode">dynamic</xsl:with-param>
-        </xsl:call-template>
-      </a>
-      <xsl:if test="./linkDescription and $setDescription">
-        <br />
-        <xsl:choose>
-          <xsl:when test="$setDescriptionLength = '0'">
-            <xsl:value-of disable-output-escaping="yes" select="./linkDescription" />
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
-            <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
-              <xsl:text>...</xsl:text>
-              <xsl:if test="$setMoreButton = 'true'">
-                <span class="moreButton">
-                  <a>
-                    <xsl:attribute name="href"><xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="./targetItem/@oid"/></xsl:attribute>
-                    <xsl:attribute name="title">
-                      <xsl:call-template name="mandalay:getStaticText">
-                        <xsl:with-param name="module" select="'SciMember'"/>
-                        <xsl:with-param name="id" select="'moreButtonTitle'"/>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="mandalay:getStaticText">
-                      <xsl:with-param name="module" select="'SciMember'"/>
-                      <xsl:with-param name="id" select="'moreButton'"/>
-                    </xsl:call-template>
-                  </a> 
-                </span>
-              </xsl:if>
+                    <xsl:choose>
+                        <xsl:when test="./projectBeginSkipMonth = 'true'">
+                            <xsl:value-of select="./projectBegin/@year"/>
+                        </xsl:when>
+                        <xsl:when test="./projectBeginSkipDay = 'true'">
+                            <xsl:call-template name="mandalay:getStaticText">
+                                <xsl:with-param name="module" select="'monthNames'"/>
+                                <xsl:with-param name="id" select="./projectBegin/@month"/>
+                            </xsl:call-template>
+                            <xsl:text> </xsl:text>
+                            <xsl:value-of select="./projectBegin/@year"/>		  
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="./projectBegin/@longDate"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                    <xsl:if test="./projectEnd and string-length(./projectEnd/@longDate) &gt; 0">
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SciProject'"/>
+                            <xsl:with-param name="id" select="'lifespan/until'"/>
+                        </xsl:call-template>
+                        <xsl:choose>
+                            <xsl:when test="./projectEndSkipDay = 'true'">
+                                <xsl:value-of select="./projectEnd/@year"/>
+                            </xsl:when>
+                            <xsl:when test="./projectEndSkipMonth = 'true'">
+                                <xsl:call-template name="mandalay:getStaticText">
+                                    <xsl:with-param name="module" select="'monthNames'"/>
+                                    <xsl:with-param name="id" select="./projectEnd/@month"/>
+                                </xsl:call-template>
+                                <xsl:text> </xsl:text>
+                                <xsl:value-of select="./projectEnd/@year"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:value-of select="./projectEnd/@longDate"/>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:if>
+                </div>
             </xsl:if>
-          </xsl:otherwise>
+
+            <ul class="availableData">
+                <xsl:for-each select="./orgaUnitTabs/availableTabs/availableTab">
+                    <li>
+                        <xsl:if test="./@selected = 'true'">
+                            <xsl:attribute name="class">selectedTab active</xsl:attribute>
+                        </xsl:if>
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:call-template name="mandalay:linkParser">
+                                    <xsl:with-param name="link" select="concat('?selectedTab=', ./@label)"/>
+                                </xsl:call-template>
+                            </xsl:attribute>
+                            <xsl:if test="./@selected = 'true'">
+                                <xsl:attribute name="class">selectedTab active</xsl:attribute>
+                            </xsl:if>
+                            <xsl:call-template name="mandalay:getStaticText">
+                                <xsl:with-param name="module" select="'SciProject'"/>
+                                <xsl:with-param name="id" select="concat('tabs/', ./@label)"/>
+                            </xsl:call-template>
+                        </a>
+                    </li>
+                </xsl:for-each>
+            </ul>
+
+            <div class="activeTab">
+                <xsl:apply-templates select="./orgaUnitTabs/selectedTab" mode="tabs"/>
+            </div>
+
+        </div>
+
+    </xsl:template>
+
+    <xsl:template name="CT_SciProject_List"
+                  match="nav:item[nav:attribute[@name='objectType'] = 'com.arsdigita.cms.contenttypes.SciProject']"
+                  mode="list_view">
+        <xsl:variable name="linkProject">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciProject'"/>
+                <xsl:with-param name="setting" select="'listView/linkProject'"/>
+                <xsl:with-param name="default" select="'true'"/>	
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="showLifespan">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciProject'"/>
+                <xsl:with-param name="setting" select="'listView/showLifespan'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="showMembers">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciProject'"/>
+                <xsl:with-param name="setting" select="'listView/showMembers'"/>
+                <xsl:with-param name="default" select="'true'"/>	
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="emphHead">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciProject'"/>
+                <xsl:with-param name="setting" select="'listView/emphHead'"/>
+                <xsl:with-param name="default" select="'true'"/>	
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="projectHeadText">
+            <xsl:call-template name="mandalay:getStaticText">
+                <xsl:with-param name="module" select="'SciProject'"/>
+                <xsl:with-param name="id" select="'listView/projectHeadText'"/>	
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="projectFormerMemberText">
+            <xsl:call-template name="mandalay:getStaticText">
+                <xsl:with-param name="module" select="'SciProject'"/>
+                <xsl:with-param name="id" select="'listView/projectFormerMemberText'"/>	
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="projectMemberSeparator">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciProject'"/>
+                <xsl:with-param name="setting" select="'listView/projectMemberSeparator'"/>
+                <xsl:with-param name="default" select="', '"/>	
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="showShortDesc">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SciProject'"/>
+                <xsl:with-param name="setting" select="'listView/showShortDesc'"/>
+                <xsl:with-param name="default" select="'true'"/>	
+            </xsl:call-template>
+        </xsl:variable>
+
+        <xsl:call-template name="CT_SciProject_ListItem">
+            <xsl:with-param name="linkProject" select="$linkProject"/>
+            <xsl:with-param name="showLifespan" select="$showLifespan"/>
+            <xsl:with-param name="showMembers" select="$showMembers"/>
+            <xsl:with-param name="emphHead" select="$emphHead"/>
+            <xsl:with-param name="projectHeadText" select="$projectHeadText"/>
+            <xsl:with-param name="projectFormerMemberText" select="$projectFormerMemberText"/>
+            <xsl:with-param name="projectMemberSeparator" select="$projectMemberSeparator"/>
+            <xsl:with-param name="showShortDesc" select="$showShortDesc"/>
+        </xsl:call-template>
+
+    </xsl:template>
+
+    <xsl:template name="CT_SciProject_UlList"
+                  mode="list_view">
+        <xsl:param name="linkProject" select="'true'"/>
+        <xsl:param name="showLifespan" select="'true'"/>
+        <xsl:param name="showMembers" select="'true'"/>
+        <xsl:param name="emphHead" select="'true'"/>
+        <xsl:param name="projectHeadText" select="''"/>
+        <xsl:param name="projectFormerMemberText" select="''"/>
+        <xsl:param name="projectMemberSeparator" select="', '"/>
+        <xsl:param name="showShortDesc" select="'false'"/>
+        <xsl:param name="useRelativeUrl" select="'false'"/>
+    
+        <li>
+            <xsl:call-template name="CT_SciProject_ListItem">
+                <xsl:with-param name="linkProject" select="$linkProject"/>
+                <xsl:with-param name="showLifespan" select="$showLifespan"/>
+                <xsl:with-param name="showMembers" select="$showMembers"/>
+                <xsl:with-param name="emphHead" select="$emphHead"/>
+                <xsl:with-param name="projectHeadText" select="$projectHeadText"/>
+                <xsl:with-param name="projectFormerMemberText" select="$projectFormerMemberText"/>
+                <xsl:with-param name="projectMemberSeparator" select="$projectMemberSeparator"/>
+                <xsl:with-param name="showShortDesc" select="$showShortDesc"/>
+                <xsl:with-param name="useRelativeUrl" select="$useRelativeUrl"/>
+            </xsl:call-template>
+        </li>
+    </xsl:template>
+
+    <xsl:template name="CT_SciProject_ListItem"
+                  mode="list_view">
+        <xsl:param name="linkProject" select="'true'"/>
+        <xsl:param name="showLifespan" select="'true'"/>
+        <xsl:param name="showMembers" select="'true'"/>
+        <xsl:param name="emphHead" select="'true'"/>
+        <xsl:param name="projectHeadText" select="''"/>
+        <xsl:param name="projectFormerMemberText" select="''"/>
+        <xsl:param name="projectMemberSeparator" select="', '"/>
+        <xsl:param name="showShortDesc" select="'false'"/>
+        <xsl:param name="useRelativeUrl" select="'false'"/>
+
+        <xsl:choose>
+            <xsl:when test="$linkProject = 'true'">
+                <a class="CIname">
+                    <xsl:choose>
+                        <xsl:when test="$useRelativeUrl = 'true'">
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="@oid"/>
+                            </xsl:attribute>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:attribute name="href">/redirect/?oid=<xsl:value-of select="@oid"/></xsl:attribute>
+                        </xsl:otherwise>
+                    </xsl:choose>	 
+                    <xsl:value-of select="./title"/>
+                </a>
+            </xsl:when>
+            <xsl:otherwise>
+                <em>
+                    <xsl:value-of select="./title"/>
+                </em>	
+            </xsl:otherwise>
         </xsl:choose>
-      </xsl:if>
-    </xsl:if>
-  </xsl:template>
+        <xsl:if test="($showLifespan = 'true') and (string-length(./projectBegin/@longDate) &gt; 0)">
+            <div class="sciProjectLifespan">
+                <span>
+                    <xsl:call-template name="mandalay:getStaticText">
+                        <xsl:with-param name="module" select="'SciProject'"/>
+                        <xsl:with-param name="id" select="'lifespan'"/>
+                    </xsl:call-template>
+                </span>
+                <xsl:if test="not(./projectEnd)">
+                    <xsl:call-template name="mandalay:getStaticText">
+                        <xsl:with-param name="module" select="'SciProject'"/>
+                        <xsl:with-param name="id" select="'lifespan/from'"/>
+                    </xsl:call-template>
+                </xsl:if>
+      	  
+                <xsl:choose>
+                    <xsl:when test="./projectBeginSkipMonth = 'true'">
+                        <xsl:value-of select="./projectBegin/@year"/>
+                    </xsl:when>
+                    <xsl:when test="./projectBeginSkipDay = 'true'">
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'monthNames'"/>
+                            <xsl:with-param name="id" select="./projectBegin/@month"/>
+                        </xsl:call-template>
+                        <xsl:text> </xsl:text>
+                        <xsl:value-of select="./projectBegin/@year"/>             
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="./projectBegin/@longDate"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+                <xsl:if test="./projectEnd and string-length(./projectEnd/@longDate) &gt; 0">
+                    <xsl:call-template name="mandalay:getStaticText">
+                        <xsl:with-param name="module" select="'SciProject'"/>
+                        <xsl:with-param name="id" select="'lifespan/until'"/>
+                    </xsl:call-template>
+                    <xsl:choose>
+                        <xsl:when test="./projectEndSkipDay = 'true'">
+                            <xsl:value-of select="./projectEnd/@year"/>
+                        </xsl:when>
+                        <xsl:when test="./projectEndSkipMonth = 'true'">
+                            <xsl:call-template name="mandalay:getStaticText">
+                                <xsl:with-param name="module" select="'monthNames'"/>
+                                <xsl:with-param name="id" select="./projectEnd/@month"/>
+                            </xsl:call-template>
+                            <xsl:text> </xsl:text>
+                            <xsl:value-of select="./projectEnd/@year"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="./projectEnd/@longDate"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:if>
+            </div>
+        </xsl:if>
+        <xsl:if test="$showMembers = 'true'">
+            <div class="members">
+                <xsl:for-each select="./members/member">
+                    <xsl:if test="string-length(./givenName) &gt; 0">
+                        <xsl:value-of select="./givenName"/>
+                        <xsl:text> </xsl:text>		    
+                    </xsl:if>
+                    <xsl:if test="string-length(./surname) &gt; 0">
+                        <xsl:value-of select="./surname"/>
+                        <xsl:if test="($emphHead = 'true') and (./@role = 'head') and ((./@status != 'former') or (string-length(./@status) = 0))">
+                            <xsl:text> </xsl:text>
+                            <xsl:value-of select="$projectHeadText"/>
+                        </xsl:if>
+                        <xsl:if test="./@status = 'former' and (string-length($projectFormerMemberText) &gt; 1)">
+                            <xsl:text> </xsl:text>
+                            <xsl:value-of select="$projectFormerMemberText"/>
+                        </xsl:if>
+                        <xsl:if test="(position() &lt; count(../persons)) or (position() &lt; count(../member))">
+                            <xsl:value-of select="$projectMemberSeparator"/>			
+                        </xsl:if>		    
+                    </xsl:if>
+                </xsl:for-each>
+            </div>
+        </xsl:if>
+        <xsl:if test="($showShortDesc = 'true')">
+            <div class="shortDesc">
+                <xsl:value-of select="./projectShortDesc"/>
+            </div>
+        </xsl:if> 
+    </xsl:template>
+
+    <xsl:template name="CT_SciProject_Link" 
+                  match="*/cms:item/links[targetItem/objectType = 'com.arsdigita.cms.contenttypes.SciProject']" 
+                  mode="link_view">
+        <!-- DE Hole alle benötigten Einstellungen-->
+        <!-- EN Getting all needed setting-->
+        <xsl:variable name="setImageAndText">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SciMember'"/>
+                <xsl:with-param name="setting" select="'linkView/setImageAndText'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setImage">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SciMember'"/>
+                <xsl:with-param name="setting" select="'linkView/setImage'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setImageMaxHeight">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SciMember'"/>
+                <xsl:with-param name="setting" select="'linkView/setImageMaxHeight'"/>
+                <xsl:with-param name="default" select="''"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setImageMaxWidth">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SciMember'"/>
+                <xsl:with-param name="setting" select="'linkView/setImageMaxWidth'"/>
+                <xsl:with-param name="default" select="''"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setImageCaption">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SciMember'"/>
+                <xsl:with-param name="setting" select="'linkView/setImageCaption'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setDescription">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SciMember'"/>
+                <xsl:with-param name="setting" select="'linkView/setDescription'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setDescriptionLength">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SciMember'"/>
+                <xsl:with-param name="setting" select="'linkView/setDescriptionLength'"/>
+                <xsl:with-param name="default" select="'0'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setMoreButton">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SciMember'"/>
+                <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
+                <xsl:with-param name="default" select="'false'"/>
+            </xsl:call-template>
+        </xsl:variable>
+
+        <!-- DE Wenn es Bilder gibt, dann soll das erste hier als Link angezeigt werden -->
+        <!-- EN -->
+        <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
+            <a>
+                <xsl:attribute name="href">
+                    <xsl:text>/redirect/?oid=</xsl:text>
+                    <xsl:value-of select="./targetItem/@oid"/>
+                </xsl:attribute>
+                <xsl:attribute name="title">
+                    <xsl:call-template name="mandalay:shying">
+                        <xsl:with-param name="title">
+                            <xsl:value-of select="./linkTitle"/>
+                        </xsl:with-param>
+                        <xsl:with-param name="mode">dynamic</xsl:with-param>
+                    </xsl:call-template>
+                </xsl:attribute>
+                <xsl:for-each select="./targetItem">
+                    <xsl:call-template name="mandalay:imageAttachment">
+                        <xsl:with-param name="showCaption" select="$setImageCaption" />
+                        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+                        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+                    </xsl:call-template>
+                </xsl:for-each>
+            </a>
+        </xsl:if>
+        <xsl:if test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
+            <a class="CIname">
+                <xsl:attribute name="href">
+                    <xsl:text>/redirect/?oid=</xsl:text>
+                    <xsl:value-of select="./targetItem/@oid"/>
+                </xsl:attribute>
+                <xsl:attribute name="title">
+                    <xsl:call-template name="mandalay:shying">
+                        <xsl:with-param name="title">
+                            <xsl:value-of select="./linkTitle"/>
+                        </xsl:with-param>
+                        <xsl:with-param name="mode">dynamic</xsl:with-param>
+                    </xsl:call-template>
+                </xsl:attribute>
+                <xsl:call-template name="mandalay:shying">
+                    <xsl:with-param name="title">
+                        <xsl:value-of disable-output-escaping="yes" select="./linkTitle"/>
+                    </xsl:with-param>
+                    <xsl:with-param name="mode">dynamic</xsl:with-param>
+                </xsl:call-template>
+            </a>
+            <xsl:if test="./linkDescription and $setDescription">
+                <br />
+                <xsl:choose>
+                    <xsl:when test="$setDescriptionLength = '0'">
+                        <xsl:value-of disable-output-escaping="yes" select="./linkDescription" />
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
+                        <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
+                            <xsl:text>...</xsl:text>
+                            <xsl:if test="$setMoreButton = 'true'">
+                                <span class="moreButton">
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:text>/redirect/?oid=</xsl:text>
+                                            <xsl:value-of select="./targetItem/@oid"/>
+                                        </xsl:attribute>
+                                        <xsl:attribute name="title">
+                                            <xsl:call-template name="mandalay:getStaticText">
+                                                <xsl:with-param name="module" select="'SciMember'"/>
+                                                <xsl:with-param name="id" select="'moreButtonTitle'"/>
+                                            </xsl:call-template>
+                                        </xsl:attribute>
+                                        <xsl:call-template name="mandalay:getStaticText">
+                                            <xsl:with-param name="module" select="'SciMember'"/>
+                                            <xsl:with-param name="id" select="'moreButton'"/>
+                                        </xsl:call-template>
+                                    </a> 
+                                </span>
+                            </xsl:if>
+                        </xsl:if>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:if>
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template name="CT_SciProject_image"
+                      match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciProject']"
+                      mode="image">
+    </xsl:template>
+    
+    <xsl:template name="CT_SciProject_lead"
+                      match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciProject']"
+                      mode="lead">
+    </xsl:template>
 
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject/SciProjectSummaryTab.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject/SciProjectSummaryTab.xsl
index 9dd8e6459..9dd736d2d 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject/SciProjectSummaryTab.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciProject/SciProjectSummaryTab.xsl
@@ -299,22 +299,36 @@
                 
                 <xsl:if test="count(./sponsors/sponsor) &gt; 0">
                     <xsl:variable name="sponsorsText">
-                         <xsl:call-template name="mandalay:getStaticText">
+                        <xsl:call-template name="mandalay:getStaticText">
                             <xsl:with-param name="module" select="'SciProject'"/>
                             <xsl:with-param name="id" select="'summaryTab/sponsors'"/>
                         </xsl:call-template>
                     </xsl:variable>
                     <xsl:if test="string-length($sponsorsText) &gt; 0">
-                        <h4><xsl:value-of select="$sponsorsText"/></h4>
+                        <h4>
+                            <xsl:value-of select="$sponsorsText"/>
+                        </h4>
                     </xsl:if>
-		    <ul>
-		      <xsl:for-each select="sponsors/sponsor">
-		         <xsl:sort/>
-		         <li>
-	                     <xsl:value-of select="."/>
-		         </li>
-		      </xsl:for-each>
-		    </ul>
+                    <ul>
+                        <xsl:for-each select="sponsors/sponsor">
+                            <xsl:sort/>
+                            <li>
+                                <xsl:value-of select="."/>
+                            </li>
+                        </xsl:for-each>
+                    </ul>
+                </xsl:if>
+                
+                <xsl:if test="string-length(./sponsors/sponsor/@fundingCode) &gt; 1">
+                    <h4>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SciProject'"/>
+                            <xsl:with-param name="id" select="'summaryTab/fundingCode'"/>
+                        </xsl:call-template>
+                    </h4>
+                    <p>
+                        <xsl:value-of select="./sponsors/sponsor/@fundingCode"/>
+                    </p>
                 </xsl:if>
                 
                 <xsl:value-of select="./funding" disable-output-escaping="yes"/>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInCollectedVolume.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInCollectedVolume.xsl
index 844d1edf7..5df5598a6 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInCollectedVolume.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInCollectedVolume.xsl
@@ -40,6 +40,68 @@
        Detail view 
        ===========
   -->
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.ArticleInCollectedVolume']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'articleInCollectedVolume/setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./pageDescription"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.ArticleInCollectedVolume']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'articleInCollectedVolume/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxHeight">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'articleInCollectedVolume/setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxWidth">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'articleInCollectedVolume/setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'articleInCollectedVolume/setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
   <xsl:template name="CT_ArticleInCollectedVolume_graphics"
 		match="cms:item[objectType='com.arsdigita.cms.contenttypes.ArticleInCollectedVolume']"
 		mode="detailed_view">
@@ -51,34 +113,6 @@
         <xsl:with-param name="default" select="'SciPublicationsDefaultFormat.xml'" />
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImage">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'articleInCollectedVolume/setImage'" />
-        <xsl:with-param name="default" select="'true'" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageCaption">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'articleInCollectedVolume/setImageCaption'" />
-        <xsl:with-param name="default" select="'true'" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageMaxHeight">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'articleInCollectedVolume/setImageMaxHeight'" />
-        <xsl:with-param name="default" select="''" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageMaxWidth">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'articleInCollectedVolume/setImageMaxWidth'" />
-        <xsl:with-param name="default" select="''" />
-      </xsl:call-template>
-    </xsl:variable>
     
     <xsl:variable name="setAbstract">
       <xsl:call-template name="mandalay:getSetting">
@@ -180,13 +214,6 @@
     </xsl:variable>
     
     <div class="mainBody publication publicationDetails publicationArticleInCollectedVolumeDetails">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
 
       <dl>
         <xsl:if test="($setAuthors = 'true') and (string-length(./authors) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInJournal.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInJournal.xsl
index eb17a66d8..0843581ea 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInJournal.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ArticleInJournal.xsl
@@ -41,37 +41,71 @@
        Detail view 
        ===========
   -->
-    <xsl:template name="CT_ArticleInJournal_graphics"
-		match="cms:item[objectType='com.arsdigita.cms.contenttypes.ArticleInJournal']"
-		mode="detailed_view">
-    <xsl:variable name="setImage">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.ArticleInJournal']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
-        <xsl:with-param name="setting" select="'articleInJournal/setImage'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'articleInJournal/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.ArticleInJournal']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
-        <xsl:with-param name="setting" select="'articleInJournal/setImageCaption'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'articleInJournal/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
         <xsl:with-param name="setting" select="'articleInJournal/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
         <xsl:with-param name="setting" select="'articleInJournal/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'articleInJournal/setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+    <xsl:template name="CT_ArticleInJournal_graphics"
+		match="cms:item[objectType='com.arsdigita.cms.contenttypes.ArticleInJournal']"
+		mode="detailed_view">
 
     <xsl:variable name="setAbstract">
       <xsl:call-template name="mandalay:getSetting">
@@ -167,13 +201,6 @@
 
 
     <div class="mainBody publication publicationDetails publicationArticleInJournalDetails">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
 
       <dl>
 	<xsl:if test="($setAuthors = 'true') and (string-length(./authors) &gt; 0)">
@@ -488,4 +515,4 @@
     <xsl:call-template name="CT_Publication_Link"/>
   </xsl:template>
   
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl
index e4f506f66..154d2e367 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl
@@ -40,35 +40,69 @@
        Detail view 
        ===========
   -->
-  <xsl:template name="CT_CollectedVolume_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.CollectedVolume']" mode="detailed_view">
-    <xsl:variable name="setImage">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.CollectedVolume']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'collectedVolume/setImage'" />
-        <xsl:with-param name="default" select="'true'" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'collectedVolume/setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.CollectedVolume']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'collectedVolume/setImageCaption'" />
-        <xsl:with-param name="default" select="'true'" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'collectedVolume/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'collectedVolume/setImageMaxHeight'" />
-        <xsl:with-param name="default" select="''" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'collectedVolume/setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'collectedVolume/setImageMaxWidth'" />
-        <xsl:with-param name="default" select="''" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'collectedVolume/setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'collectedVolume/setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="CT_CollectedVolume_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.CollectedVolume']" mode="detailed_view">
 
     <xsl:variable name="setAbstract">
       <xsl:call-template name="mandalay:getSetting">
@@ -198,13 +232,6 @@
     </xsl:variable>
 
     <div class="mainBody publication publicationDetails publicationCollectedVolumeDetails">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
 
       <dl>
         <xsl:if test="($setAuthors = 'true') and (string-length(./authors) &gt; 0)">
@@ -413,7 +440,7 @@
         <ul class="articlesList">
           <xsl:for-each select="./articles/article">
             <li>
-              <xsl:call-template name="CT_ArticleInCollectedVolume_List" />
+              <xsl:call-template name="CT_CollectedVolume_List" />
             </li>
           </xsl:for-each>
         </ul>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl
index d3415ca9c..4c0c0fc31 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl
@@ -40,35 +40,69 @@
        Detail view 
        ===========
   -->
-  <xsl:template name="CT_Expertise_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Expertise']" mode="detailed_view">
-    <xsl:variable name="setImage">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Expertise']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'expertise/setImage'" />
-        <xsl:with-param name="default" select="'true'" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'expertise/setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Expertise']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'expertise/setImageCaption'" />
-        <xsl:with-param name="default" select="'true'" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'expertise/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'expertise/setImageMaxHeight'" />
-        <xsl:with-param name="default" select="''" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'expertise/setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'expertise/setImageMaxWidth'" />
-        <xsl:with-param name="default" select="''" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'expertise/setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'expertise/setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="CT_Expertise_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Expertise']" mode="detailed_view">
 
     <xsl:variable name="setAbstract">
       <xsl:call-template name="mandalay:getSetting">
@@ -156,13 +190,6 @@
     </xsl:variable>
 
     <div class="mainBody publication publicationDetails publicationExpertiseDetails">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
 
       <dl>
         <xsl:if test="($setAuthors = 'true') and (string-length(./authors) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/GreyLiterature.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/GreyLiterature.xsl
index 7fefd188e..776d59c83 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/GreyLiterature.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/GreyLiterature.xsl
@@ -32,7 +32,7 @@
 
   <!--
       **************************************************************************
-      ** Templates for an ArticleInCollectedVolume publication                **
+      ** Templates for an GreyLiterature publication                **
       **************************************************************************
   -->
 
@@ -40,35 +40,69 @@
        Detail view 
        ===========
   -->
-  <xsl:template name="CT_GreyLiterature_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.GreyLiterature']" mode="detailed_view">
-    <xsl:variable name="setImage">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.GreyLiterature']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'greyLiterature/setImage'" />
-        <xsl:with-param name="default" select="'true'" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'greyLiterature/setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.GreyLiterature']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'greyLiterature/setImageCaption'" />
-        <xsl:with-param name="default" select="'true'" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'greyLiterature/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'greyLiterature/setImageMaxHeight'" />
-        <xsl:with-param name="default" select="''" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'greyLiterature/setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'greyLiterature/setImageMaxWidth'" />
-        <xsl:with-param name="default" select="''" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'greyLiterature/setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'greyLiterature/setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="CT_GreyLiterature_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.GreyLiterature']" mode="detailed_view">
     
     <xsl:variable name="setAbstract">
       <xsl:call-template name="mandalay:getSetting">
@@ -163,13 +197,6 @@
     </xsl:variable>
 
     <div class="mainBody publication publicationDetails publicationGreyLiteratureDetails">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
 
       <dl>
         <xsl:if test="($setAuthors = 'true') and (string-length(./authors) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InProceedings.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InProceedings.xsl
index c0be7ea6f..9f281386b 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InProceedings.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InProceedings.xsl
@@ -40,35 +40,69 @@
        Detail view 
        ===========
   -->
-  <xsl:template name="CT_InProceedings_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.InProceedings']" mode="detailed_view">
-    <xsl:variable name="setImage">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.InProceedings']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'inProceedings/setImage'" />
-        <xsl:with-param name="default" select="'true'" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'inProceedings/setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.InProceedings']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'inProceedings/setImageCaption'" />
-        <xsl:with-param name="default" select="'true'" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'inProceedings/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'inProceedings/setImageMaxHeight'" />
-        <xsl:with-param name="default" select="''" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'inProceedings/setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'inProceedings/setImageMaxWidth'" />
-        <xsl:with-param name="default" select="''" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'inProceedings/setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'inProceedings/setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="CT_InProceedings_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.InProceedings']" mode="detailed_view">
 
     <xsl:variable name="setAbstract">
       <xsl:call-template name="mandalay:getSetting">
@@ -135,13 +169,6 @@
     </xsl:variable>
 
     <div class="mainBody publication publicationDetails publicationInProceedingsDetails">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
 
       <dl>
         <xsl:if test="($setAuthors = 'true') and (string-length(./authors) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InternetArticle.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InternetArticle.xsl
index 7f35dee57..9b92fab3e 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InternetArticle.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/InternetArticle.xsl
@@ -41,37 +41,71 @@
        Detail view 
        ===========
   -->
-    <xsl:template name="CT_InternetArticle_graphics"
-		match="cms:item[objectType='com.arsdigita.cms.contenttypes.InternetArticle']"
-		mode="detailed_view">
-    <xsl:variable name="setImage">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.InternetArticle']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
-        <xsl:with-param name="setting" select="'internetArticle/setImage'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'internetArticle/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.InternetArticle']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
-        <xsl:with-param name="setting" select="'internetArticle/setImageCaption'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'internetArticle/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
         <xsl:with-param name="setting" select="'internetArticle/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
         <xsl:with-param name="setting" select="'internetArticle/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'internetArticle/setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+    <xsl:template name="CT_InternetArticle_graphics"
+		match="cms:item[objectType='com.arsdigita.cms.contenttypes.InternetArticle']"
+		mode="detailed_view">
 
     <xsl:variable name="setAbstract">
       <xsl:call-template name="mandalay:getSetting">
@@ -173,13 +207,6 @@
     </xsl:variable>
 
     <div class="mainBody publication publicationDetails publicationInternetArticleDetails">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
 
       <dl>
 	<xsl:if test="($setAuthors = 'true') and (string-length(./authors) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Journal.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Journal.xsl
index 08e46910e..525bfa405 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Journal.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Journal.xsl
@@ -41,37 +41,71 @@
        Detail view 
        ===========
   -->
-  <xsl:template name="CT_CollectedVolume_graphics"
-		match="cms:item[objectType='com.arsdigita.cms.contenttypes.Journal']"
-		mode="detailed_view">
-    <xsl:variable name="setImage">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Journal']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
-        <xsl:with-param name="setting" select="'journal/setImage'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'journal/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Journal']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
-        <xsl:with-param name="setting" select="'journal/setImageCaption'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'journal/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
         <xsl:with-param name="setting" select="'journal/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
         <xsl:with-param name="setting" select="'journal/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'journal/setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="CT_CollectedVolume_graphics"
+		match="cms:item[objectType='com.arsdigita.cms.contenttypes.Journal']"
+		mode="detailed_view">
 
     <xsl:variable name="setArticles">
       <xsl:call-template name="mandalay:getSetting">
@@ -117,13 +151,6 @@
     </xsl:variable>
 
     <div class="mainBody publication publicationDetails publicationJournalDetails">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
 
       <dl>
       <xsl:if test="($setSymbol = 'true') and (string-length(./symbol) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Monograph.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Monograph.xsl
index 0f8694913..5974bb8e4 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Monograph.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Monograph.xsl
@@ -40,35 +40,69 @@
        Detail view 
        ===========
   -->
-  <xsl:template name="CT_Monograph_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Monograph']" mode="detailed_view">
-    <xsl:variable name="setImage">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Monograph']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'monograph/setImage'" />
-        <xsl:with-param name="default" select="'true'" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'monograph/setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Monograph']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'monograph/setImageCaption'" />
-        <xsl:with-param name="default" select="'true'" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'monograph/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'monograph/setImageMaxHeight'" />
-        <xsl:with-param name="default" select="''" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'monograph/setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'monograph/setImageMaxWidth'" />
-        <xsl:with-param name="default" select="''" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'monograph/setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'monograph/setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="CT_Monograph_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Monograph']" mode="detailed_view">
 
     <xsl:variable name="setAbstract">
       <xsl:call-template name="mandalay:getSetting">
@@ -184,13 +218,6 @@
     </xsl:variable>
 
     <div class="mainBody publication publicationDetails publicationMonographDetails">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
 
       <dl>
         <xsl:if test="($setAuthors = 'true') and (string-length(./authors) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl
index 4511ab7ff..882a1968b 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl
@@ -40,35 +40,69 @@
        Detail view 
        ===========
   -->
-  <xsl:template name="CT_Proceedings_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Proceedings']" mode="detailed_view">
-    <xsl:variable name="setImage">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Proceedings']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'proceedings/setImage'" />
-        <xsl:with-param name="default" select="'true'" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'proceedings/setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Proceedings']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'proceedings/setImageCaption'" />
-        <xsl:with-param name="default" select="'true'" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'proceedings/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'proceedings/setImageMaxHeight'" />
-        <xsl:with-param name="default" select="''" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'proceedings/setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'SciPublications'" />
-        <xsl:with-param name="setting" select="'proceedings/setImageMaxWidth'" />
-        <xsl:with-param name="default" select="''" />
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'proceedings/setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'proceedings/setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="CT_Proceedings_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.Proceedings']" mode="detailed_view">
 
     <xsl:variable name="setAbstract">
       <xsl:call-template name="mandalay:getSetting">
@@ -213,14 +247,6 @@
 
     <div class="mainBody publication publicationDetails publicationProceedingsDetails">
 
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
-
       <dl>
         <xsl:if test="($setAuthors = 'true') and (string-length(./authors) &gt; 0)">
           <xsl:call-template name="scipublicationsAuthors">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Publisher.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Publisher.xsl
index da2cc43a8..f13b066ab 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Publisher.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Publisher.xsl
@@ -35,47 +35,73 @@
       Detail view
       ===========
   -->
-  <xsl:template name="CT_Publisher_graphics"
-		match="cms:item[objectType='com.arsdigita.cms.contenttypes.Publisher']"
-		mode="detailed_view">
-
-    <xsl:variable name="setImage">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Publisher']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
-        <xsl:with-param name="setting" select="'publisher/setImage'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'publisher/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Publisher']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
-        <xsl:with-param name="setting" select="'publisher/setImageCaption'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'publisher/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
         <xsl:with-param name="setting" select="'publisher/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
         <xsl:with-param name="setting" select="'publisher/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'publisher/setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="CT_Publisher_graphics"
+		match="cms:item[objectType='com.arsdigita.cms.contenttypes.Publisher']"
+		mode="detailed_view">
 
     <div class="publication publicationDetails publisherDetails">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
 
       <dl>
 	<dt>
@@ -104,4 +130,4 @@
 
   </xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ResearchReport.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ResearchReport.xsl
index 0e3b4de1e..22b847c7e 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ResearchReport.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/ResearchReport.xsl
@@ -41,37 +41,71 @@
        Detail view 
        ===========
   -->
-  <xsl:template name="CT_ResearchReport_graphics"
-		match="cms:item[objectType='com.arsdigita.cms.contenttypes.ResearchReport']"
-		mode="detailed_view">
-    <xsl:variable name="setImage">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.ResearchReport']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
-        <xsl:with-param name="setting" select="'researchReport/setImage'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'researchReport/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.ResearchReport']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
-        <xsl:with-param name="setting" select="'researchReport/setImageCaption'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'researchReport/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
         <xsl:with-param name="setting" select="'researchReport/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
         <xsl:with-param name="setting" select="'researchReport/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'researchReport/setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="CT_ResearchReport_graphics"
+		match="cms:item[objectType='com.arsdigita.cms.contenttypes.ResearchReport']"
+		mode="detailed_view">
     
     <xsl:variable name="setAbstract">
       <xsl:call-template name="mandalay:getSetting">
@@ -152,13 +186,6 @@
     </xsl:variable>
 
     <div class="mainBody publication publicationDetails publicationGreyLiteratureDetails">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
 
       <dl>
 	<xsl:if test="($setAuthors = 'true') and (string-length(./authors) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Review.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Review.xsl
index a223f2341..0f25087a0 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Review.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Review.xsl
@@ -41,37 +41,71 @@
        Detail view 
        ===========
   -->
-  <xsl:template name="CT_Review_graphics"
-		match="cms:item[objectType='com.arsdigita.cms.contenttypes.Review']"
-		mode="detailed_view">
-    <xsl:variable name="setImage">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Review']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
-        <xsl:with-param name="setting" select="'review/setImage'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'review/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Review']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
-        <xsl:with-param name="setting" select="'review/setImageCaption'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'review/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
         <xsl:with-param name="setting" select="'review/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
         <xsl:with-param name="setting" select="'review/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'review/setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="CT_Review_graphics"
+		match="cms:item[objectType='com.arsdigita.cms.contenttypes.Review']"
+		mode="detailed_view">
 
     <xsl:variable name="setAbstract">
       <xsl:call-template name="mandalay:getSetting">
@@ -152,13 +186,6 @@
     </xsl:variable>
 
     <div class="mainBody publication publicationDetails publicationReviewDetails">
-      <xsl:if test="$setImage = 'true'">
-        <xsl:call-template name="mandalay:imageAttachment">
-          <xsl:with-param name="showCaption" select="$setImageCaption" />
-          <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-          <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-        </xsl:call-template>
-      </xsl:if>
 
       <dl>
 	<xsl:if test="($setAuthors = 'true') and (string-length(../authors) &gt; 0)">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/SciAuthor.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/SciAuthor.xsl
index 7e1bcbc70..ec5cf8292 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/SciAuthor.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/SciAuthor.xsl
@@ -31,6 +31,68 @@
 
   <!-- DE Vollansicht -->
   <!-- EN Detailed view -->
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciAuthor']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'sciAuthor/setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciAuthor']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'sciAuthor/setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxHeight">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'sciAuthor/setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxWidth">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'sciAuthor/setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'sciAuthor/setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
   <xsl:template name="CT_SciAuthor_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciAuthor']" mode="detailed_view">
     
     <!-- DE Hole alle benötigten Einstellungen-->
@@ -70,34 +132,6 @@
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImage">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciAuthor'"/>
-        <xsl:with-param name="setting" select="'setImage'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageMaxHeight">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciAuthor'"/>
-        <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
-        <xsl:with-param name="default" select="''"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageMaxWidth">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciAuthor'"/>
-        <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
-        <xsl:with-param name="default" select="''"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="setImageCaption">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciAuthor'"/>
-        <xsl:with-param name="setting" select="'setImageCaption'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
     
     <div id="greeting">
       <xsl:call-template name="CT_GenericPerson_details">
@@ -123,13 +157,6 @@
       </xsl:call-template>
     </xsl:for-each>
 
-    <xsl:if test="$setImage = 'true'">
-      <xsl:call-template name="mandalay:imageAttachment">
-        <xsl:with-param name="showCaption" select="$setImageCaption"/>
-        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
-        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
-      </xsl:call-template>
-    </xsl:if>
     <div class="endFloat"/>
   </xsl:template>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Series.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Series.xsl
index a4fdb513d..7a4f94218 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Series.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Series.xsl
@@ -33,7 +33,7 @@
 
   <!--
       **************************************************************************
-      ** Templates for an ArticleInCollectedVolume publication                **
+      ** Templates for an Series publication                **
       **************************************************************************
   -->
 
@@ -42,37 +42,71 @@
        ===========
   -->
   
-  <xsl:template name="CT_Series_graphics"
-		match="cms:item[objectType='com.arsdigita.cms.contenttypes.Series']"
-		mode="detailed_view">
-    <xsl:variable name="setImage">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Series']" mode="lead">
+    <xsl:variable name="setLeadText">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
-        <xsl:with-param name="setting" select="'series/setImage'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'series/setLeadText'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="setImageCaption">
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Series']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
-        <xsl:with-param name="setting" select="'series/setImageCaption'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'series/setImage'"/>
         <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxHeight">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
         <xsl:with-param name="setting" select="'series/setImageMaxHeight'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="setImageMaxWidth">
       <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module"  select="'SciPublications'"/>
+        <xsl:with-param name="module"  select="'SciPublication'"/>
         <xsl:with-param name="setting" select="'series/setImageMaxWidth'"/>
         <xsl:with-param name="default" select="''"/>
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'series/setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="CT_Series_graphics"
+		match="cms:item[objectType='com.arsdigita.cms.contenttypes.Series']"
+		mode="detailed_view">
 
     <xsl:variable name="setAbstract">
       <xsl:call-template name="mandalay:getSetting">
@@ -557,4 +591,4 @@
   </xsl:template>
 
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/WorkingPaper.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/WorkingPaper.xsl
index 75150e493..a55163788 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/WorkingPaper.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/WorkingPaper.xsl
@@ -33,7 +33,7 @@
 
   <!--
       **************************************************************************
-      ** Templates for an ArticleInCollectedVolume publication                **
+      ** Templates for an WorkingPaper publication                **
       **************************************************************************
   -->
 
@@ -41,6 +41,32 @@
        Detail view 
        ===========
   -->
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.WorkingPaper']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciPublication'"/>
+        <xsl:with-param name="setting" select="'workingPaper/setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.WorkingPaper']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+  </xsl:template>
+
   <xsl:template name="CT_WorkingPaper_graphics"
 		match="cms:item[objectType='com.arsdigita.cms.contenttypes.WorkingPaper']"
 		mode="detailed_view">
@@ -256,12 +282,12 @@
                   <xsl:if test="$setSeriesVolume = 'true'">
                     <xsl:call-template name="mandalay:getStaticText">
                         <xsl:with-param name="module" select="'SciPublications'" />
-                        <xsl:with-param name="id" select="'articleInCollectedVolume/seriesVolumePre'" />
+                        <xsl:with-param name="id" select="'workingPaper/seriesVolumePre'" />
                     </xsl:call-template>
                     <xsl:value-of select="./series/series/@volume" />
                     <xsl:call-template name="mandalay:getStaticText">
                         <xsl:with-param name="module" select="'SciPublications'" />
-                        <xsl:with-param name="id" select="'articleInCollectedVolume/seriesVolumePost'" />
+                        <xsl:with-param name="id" select="'workingPaper/seriesVolumePost'" />
                     </xsl:call-template>
                   </xsl:if>
                 </a>
@@ -271,12 +297,12 @@
                 <xsl:if test="$setSeriesVolume = 'true'">
                     <xsl:call-template name="mandalay:getStaticText">
                         <xsl:with-param name="module" select="'SciPublications'" />
-                        <xsl:with-param name="id" select="'articleInCollectedVolume/seriesVolumePre'" />
+                        <xsl:with-param name="id" select="'workingPaper/seriesVolumePre'" />
                     </xsl:call-template>
                     <xsl:value-of select="./series/series/@volume" />
                     <xsl:call-template name="mandalay:getStaticText">
                         <xsl:with-param name="module" select="'SciPublications'" />
-                        <xsl:with-param name="id" select="'articleInCollectedVolume/seriesVolumePost'" />
+                        <xsl:with-param name="id" select="'workingPaper/seriesVolumePost'" />
                     </xsl:call-template>
                   </xsl:if>
               </xsl:otherwise>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SimpleOrganization/SimpleOrganization.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SimpleOrganization/SimpleOrganization.xsl
index daa9f665e..6bbf48ed2 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SimpleOrganization/SimpleOrganization.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SimpleOrganization/SimpleOrganization.xsl
@@ -27,66 +27,76 @@
                 xmlns:mandalay="http://mandalay.quasiweb.de"
                 exclude-result-prefixes="xsl bebop cms nav"
                 version="1.0">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciOrganization']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciOrganization'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SciOrganization']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
+    <xsl:variable name="setImage">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciOrganization'"/>
+        <xsl:with-param name="setting" select="'setImage'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxHeight">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciOrganization'"/>
+        <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageMaxWidth">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciOrganization'"/>
+        <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
+        <xsl:with-param name="default" select="''"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="setImageCaption">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SciOrganization'"/>
+        <xsl:with-param name="setting" select="'setImageCaption'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+  
     <xsl:template name="CT_SimpleOrganization_graphics"
                   match="cms:item[objectType='com.arsdigita.cms.contenttypes.SimpleOrganization']"
                   mode="detailed_view">
         <!-- DE Hole alle benötigten Einstellungen-->
         <!-- EN Getting all needed setting-->
-        <xsl:variable name="setImage">
-            <xsl:call-template name="mandalay:getSetting">
-                <xsl:with-param name="module"
-                                select="'SimpleOrganization'" />
-                <xsl:with-param name="setting"
-                                select="'setImage'" />
-                <xsl:with-param name="default"
-                                select="'true'" />
-            </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="setImageCaption">
-            <xsl:call-template name="mandalay:getSetting">
-                <xsl:with-param name="module"
-                                select="'SimpleOrganization'" />
-                <xsl:with-param name="setting"
-                                select="'setImageCaption'" />
-                <xsl:with-param name="default"
-                                select="'true'" />
-            </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="setImageMaxHeight">
-            <xsl:call-template name="mandalay:getSetting">
-                <xsl:with-param name="module"
-                                select="'SimpleOrganization'" />
-                <xsl:with-param name="setting"
-                                select="'setImageMaxHeight'" />
-                <xsl:with-param name="default"
-                                select="''" />
-            </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="setImageMaxWidth">
-            <xsl:call-template name="mandalay:getSetting">
-                <xsl:with-param name="module"
-                                select="'SimpleOrganization'" />
-                <xsl:with-param name="setting"
-                                select="'setImageMaxWidth'" />
-                <xsl:with-param name="default"
-                                select="''" />
-            </xsl:call-template>
-        </xsl:variable>
-        <div id="details">
-            <xsl:if test="$setImage = 'true'">
-                <xsl:call-template name="mandalay:imageAttachment">
-                    <xsl:with-param name="showCaption"
-                                    select="$setImageCaption" />
-                    <xsl:with-param name="maxHeight"
-                                    select="$setImageMaxHeight" />
-                    <xsl:with-param name="maxWidth"
-                                    select="$setImageMaxWidth" />
-                </xsl:call-template>
-            </xsl:if>
             <p>
                 <xsl:value-of select="./SimpleOrganizationDescription" />
             </p>
-        </div>
     </xsl:template>
     <xsl:template name="CT_SimpleOrganizationList"
                   match="nav:item[nav:attribute[@name='objectType'] = 'com.arsdigita.cms.contenttypes.SimpleOrganization']"
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/public-personal-profile/public-personal-profile.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/public-personal-profile/public-personal-profile.xsl
index 57bb59291..66ba5edf5 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/public-personal-profile/public-personal-profile.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/public-personal-profile/public-personal-profile.xsl
@@ -30,8 +30,30 @@
   version="1.0"
   >
 
-  <!-- Detail view -->
-  <xsl:template name="CT_PublicPersonalProfile_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.PublicPersonalProfile']" mode="detailed_view">
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.PublicPersonalProfile']" mode="lead">
+    <xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'PublicPersonalProfile'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:if test="./lead and $setLeadText = 'true'">
+      <div class="lead">
+        <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- DE Bild -->
+  <!-- EN image -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.PublicPersonalProfile']" mode="image">
+
+    <!-- DE Hole alle benötigten Einstellungen-->
+    <!-- EN Getting all needed setting-->
     <xsl:variable name="setImage">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'PublicPersonalProfile'"/>
@@ -57,9 +79,21 @@
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'PublicPersonalProfile'"/>
         <xsl:with-param name="setting" select="'setImageCaption'"/>
-        <xsl:with-param name="default" select="'false'"/>
+        <xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
+
+    <xsl:if test="$setImage = 'true'">
+      <xsl:call-template name="mandalay:imageAttachment">
+        <xsl:with-param name="showCaption" select="$setImageCaption"/>
+        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- Detail view -->
+  <xsl:template name="CT_PublicPersonalProfile_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.PublicPersonalProfile']" mode="detailed_view">
     <xsl:variable name="contentPos1">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'PublicPersonalProfile'"/>
diff --git a/tools-ng/relocate-theme-dir.sh b/tools-ng/relocate-theme-dir.sh
index ea9664cf0..115e0c2b3 100755
--- a/tools-ng/relocate-theme-dir.sh
+++ b/tools-ng/relocate-theme-dir.sh
@@ -3,7 +3,7 @@
 # Support filenames with spaces
 IFS=$'\n'
 
-function list_dir() {
+function modify_files() {
 	echo "Set working dir to $(pwd)"
 	for fh in *; do
 		if [[ -d "${fh}" ]]; then
@@ -49,5 +49,9 @@ function change_css_file() {
 }
 
 pushd $1
-list_dir
+for file in workspace*; do
+	mv "${file}" "portal-${file}"
+done
+
+modify_files
 popd