diff --git a/ccm-sci-bundle/web/themes/mandalay/css/screen/portal.css b/ccm-sci-bundle/web/themes/mandalay/css/screen/portal.css
new file mode 100644
index 000000000..0f1e8e93b
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/css/screen/portal.css
@@ -0,0 +1,26 @@
+/* 
+CSS styles for the portal workspace 
+Only for putting the columns in the right place.
+*/
+
+div#workspace div.portalColumn {
+    
+    float: left;
+    
+}
+
+div#workspace div.portalColumn:last-child {
+    float: right;
+}
+
+div#workspace div.editPortlet:hover {
+    
+    /*border: 1px solid #ccc;*/
+    
+    background-color: #eee;
+    
+}
+
+div#workspace div.moveLeft.disabled img {
+    opacity: 0.25;
+}
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/portal/portal.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/portal/portal.xsl
index a48b98f84..45884294d 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/portal/portal.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/portal/portal.xsl
@@ -31,313 +31,329 @@
 <!-- Autor: Sören Bernstein -->
 
 <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:portal="http://www.uk.arsdigita.com/portal/1.0"
-  xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
-  exclude-result-prefixes="xsl bebop cms nav mandalay portal portlet"
-  version="1.0">
+    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:portal="http://www.uk.arsdigita.com/portal/1.0"
+    xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
+    exclude-result-prefixes="xsl bebop cms nav mandalay portal portlet"
+    version="1.0">
 
-  <xsl:template match="portal:portal">
-    <xsl:param name="layout" select="@layout"/>
-    <xsl:param name="column" select="'1'"/>
+    <xsl:template match="portal:portal">
+        <xsl:param name="layout" select="@layout"/>
+        <xsl:param name="column" select="'1'"/>
     
-    <xsl:variable name="style">
-      <xsl:value-of select="(substring-before(@style, ' ') - 1) div substring-before(@style, ' ')"/>
-    </xsl:variable>
+        <xsl:variable name="style">
+            <xsl:value-of select="(substring-before(@style, ' ') - 1) div substring-before(@style, ' ')"/>
+        </xsl:variable>
     
-    <xsl:choose>
-      <xsl:when test="contains($layout, ',')">
-        <div class="portalColumn">
-          <xsl:attribute name="style">
-            <xsl:value-of select="concat('width:',substring-before(substring-before($layout, ','), '%') - $style,'%;')"/>
-          </xsl:attribute>
-          <xsl:apply-templates select="*[@cellNumber = $column]"/>
+        <xsl:choose>
+            <xsl:when test="contains($layout, ',')">
+                <div class="portalColumn">
+                    <xsl:attribute name="style">
+                        <xsl:value-of select="concat('width:',substring-before(substring-before($layout, ','), '%') - $style,'%;')"/>
+                    </xsl:attribute>
+                    <xsl:apply-templates select="*[@cellNumber = $column]"/>
+                </div>
+                <!--<div class="portalColumnSpacer">
+                  &nbsp;
+                </div>-->
+                <xsl:apply-templates select=".">
+                    <xsl:with-param name="layout" select="substring-after($layout, ',')"/>
+                    <xsl:with-param name="column" select="$column + 1"/>
+                </xsl:apply-templates>
+            </xsl:when>
+            <xsl:otherwise>
+                <div class="portalColumn">
+                    <xsl:attribute name="style">
+                        <xsl:choose>
+                            <xsl:when test="$column > 1">
+                                <xsl:value-of select="concat('width:', substring-before($layout, '%') - $style,'%;')"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:value-of select="concat('width:', $layout, ';')"/>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:attribute>
+                    <xsl:apply-templates select="*[@cellNumber = $column]"/>
+                </div>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="portal:portalList">
+        <div class="portalList">
+            <xsl:apply-templates select="portal:portalDetails"/>
+            <div class="portalListEnd"/>
         </div>
-        <div class="portalColumnSpacer">
-          &nbsp;
-        </div>
-        <xsl:apply-templates select=".">
-          <xsl:with-param name="layout" select="substring-after($layout, ',')"/>
-          <xsl:with-param name="column" select="$column + 1"/>
-        </xsl:apply-templates>
-      </xsl:when>
-      <xsl:otherwise>
-        <div class="portalColumn">
-          <xsl:attribute name="style">
+    </xsl:template>
+  
+    <xsl:template match="portal:portalDetails">
+        <xsl:variable name="setConfirmDelete">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'portal'"/>
+                <xsl:with-param name="setting" select="'setConfirmDelete'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+    
+        <div class="portalPane">
+            <xsl:if test="position() != 1">
+                <a href="{@moveLeftAction}">
+                    <img border="0" style="margin-left: 5px">
+                        <xsl:attribute name="src">
+                            <xsl:call-template name="mandalay:linkParser">
+                                <xsl:with-param name="link">
+                                    <xsl:call-template name="mandalay:getSetting">
+                                        <xsl:with-param name="module" select="'portal'"/>
+                                        <xsl:with-param name="setting" select="'setImage/moveLeft'"/>
+                                        <xsl:with-param name="default" select="'/images/portal/moveLeft.gif'"/>
+                                    </xsl:call-template>
+                                </xsl:with-param>
+                                <xsl:with-param name="prefix" select="$theme-prefix"/>
+                            </xsl:call-template>
+                        </xsl:attribute>
+                    </img>
+                </a>
+            </xsl:if>
             <xsl:choose>
-              <xsl:when test="$column > 1">
-                <xsl:value-of select="concat('width:', substring-before($layout, '%') - $style,'%;')"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="concat('width:', $layout, ';')"/>
-              </xsl:otherwise>
+                <xsl:when test="@isSelected = 'true'">
+                    <div>
+                        <xsl:apply-templates select="../bebop:form"/>
+                    </div>
+                </xsl:when>
+                <xsl:otherwise>
+                    <a href="{@selectAction}">
+                        <xsl:value-of select="title"/>
+                    </a>
+                </xsl:otherwise>
             </xsl:choose>
-          </xsl:attribute>
-          <xsl:apply-templates select="*[@cellNumber = $column]"/>
-        </div>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="portal:portalList">
-    <div class="portalList">
-      <xsl:apply-templates select="portal:portalDetails"/>
-      <div class="portalListEnd"/>
-    </div>
-  </xsl:template>
-  
-  <xsl:template match="portal:portalDetails">
-    <xsl:variable name="setConfirmDelete">
-      <xsl:call-template name="mandalay:getSetting">
-        <xsl:with-param name="module" select="'portal'"/>
-        <xsl:with-param name="setting" select="'setConfirmDelete'"/>
-        <xsl:with-param name="default" select="'true'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    
-    <div class="portalPane">
-      <xsl:if test="position() != 1">
-        <a href="{@moveLeftAction}">
-          <img border="0" style="margin-left: 5px">
-            <xsl:attribute name="src">
-              <xsl:call-template name="mandalay:linkParser">
-                <xsl:with-param name="link">
-                  <xsl:call-template name="mandalay:getSetting">
-                    <xsl:with-param name="module" select="'portal'"/>
-                    <xsl:with-param name="setting" select="'setImage/moveLeft'"/>
-                    <xsl:with-param name="default" select="'/images/portal/moveLeft.gif'"/>
-                  </xsl:call-template>
-                </xsl:with-param>
-                <xsl:with-param name="prefix" select="$theme-prefix"/>
-              </xsl:call-template>
-            </xsl:attribute>
-          </img>
-        </a>
-      </xsl:if>
-      <xsl:choose>
-        <xsl:when test="@isSelected = 'true'">
-          <div>
-            <xsl:apply-templates select="../bebop:form"/>
-          </div>
-        </xsl:when>
-        <xsl:otherwise>
-          <a href="{@selectAction}">
-            <xsl:value-of select="title"/>
-          </a>
-        </xsl:otherwise>
-      </xsl:choose>
       
-      <!-- XXX -->      
-      <a>
-        <xsl:attribute name="href">
-          <xsl:value-of select="@deleteAction"/>
-        </xsl:attribute>
-        <xsl:if test="$setConfirmDelete = 'true'">
-          <xsl:attribute name="onclick">
-            <xsl:text>return confirm('</xsl:text>
-            <xsl:call-template name="mandalay:getStaticText">
-              <xsl:with-param name="module" select="'portal'"/>
-              <xsl:with-param name="id" select="'pane/delete/confirmMessage'"/>
-            </xsl:call-template>
-            <xsl:text>');</xsl:text>
-          </xsl:attribute>
+            <!-- XXX -->      
+            <a>
+                <xsl:attribute name="href">
+                    <xsl:value-of select="@deleteAction"/>
+                </xsl:attribute>
+                <xsl:if test="$setConfirmDelete = 'true'">
+                    <xsl:attribute name="onclick">
+                        <xsl:text>return confirm('</xsl:text>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'portal'"/>
+                            <xsl:with-param name="id" select="'pane/delete/confirmMessage'"/>
+                        </xsl:call-template>
+                        <xsl:text>');</xsl:text>
+                    </xsl:attribute>
+                </xsl:if>
+                <img border="0" style="margin-left: 5px">
+                    <xsl:attribute name="src">
+                        <xsl:call-template name="mandalay:linkParser">
+                            <xsl:with-param name="link">
+                                <xsl:call-template name="mandalay:getSetting">
+                                    <xsl:with-param name="module" select="'portal'"/>
+                                    <xsl:with-param name="setting" select="'setImage/delete'"/>
+                                    <xsl:with-param name="default" select="'/images/portal/delete.gif'"/>
+                                </xsl:call-template>
+                            </xsl:with-param>
+                            <xsl:with-param name="prefix" select="$theme-prefix"/>
+                        </xsl:call-template>
+                    </xsl:attribute>
+                </img>
+            </a>
+            <xsl:if test="position() != last()">
+                <a href="{@moveRightAction}">
+                    <img border="0" style="margin-left: 5px">
+                        <xsl:attribute name="src">
+                            <xsl:call-template name="mandalay:linkParser">
+                                <xsl:with-param name="link">
+                                    <xsl:call-template name="mandalay:getSetting">
+                                        <xsl:with-param name="module" select="'portal'"/>
+                                        <xsl:with-param name="setting" select="'setImage/delete'"/>
+                                        <xsl:with-param name="default" select="'/images/portal/moveRight.gif'"/>
+                                    </xsl:call-template>
+                                </xsl:with-param>
+                                <xsl:with-param name="prefix" select="$theme-prefix"/>
+                            </xsl:call-template>
+                        </xsl:attribute>
+                    </img>
+                </a>
+            </xsl:if>
+        </div>
+        <xsl:if test="position() != last()">
+            <div class="portalPaneSpacer"/>
         </xsl:if>
-        <img border="0" style="margin-left: 5px">
-          <xsl:attribute name="src">
-            <xsl:call-template name="mandalay:linkParser">
-              <xsl:with-param name="link">
-                <xsl:call-template name="mandalay:getSetting">
-                  <xsl:with-param name="module" select="'portal'"/>
-                  <xsl:with-param name="setting" select="'setImage/delete'"/>
-                  <xsl:with-param name="default" select="'/images/portal/delete.gif'"/>
-                </xsl:call-template>
-              </xsl:with-param>
-              <xsl:with-param name="prefix" select="$theme-prefix"/>
-            </xsl:call-template>
-          </xsl:attribute>
-        </img>
-      </a>
-      <xsl:if test="position() != last()">
-        <a href="{@moveRightAction}">
-          <img border="0" style="margin-left: 5px">
-            <xsl:attribute name="src">
-              <xsl:call-template name="mandalay:linkParser">
-                <xsl:with-param name="link">
-                  <xsl:call-template name="mandalay:getSetting">
-                    <xsl:with-param name="module" select="'portal'"/>
-                    <xsl:with-param name="setting" select="'setImage/delete'"/>
-                    <xsl:with-param name="default" select="'/images/portal/moveRight.gif'"/>
-                  </xsl:call-template>
-                </xsl:with-param>
-                <xsl:with-param name="prefix" select="$theme-prefix"/>
-              </xsl:call-template>
-            </xsl:attribute>
-          </img>
-        </a>
-      </xsl:if>
-    </div>
-    <xsl:if test="position() != last()">
-      <div class="portalPaneSpacer"/>
-    </xsl:if>
-  </xsl:template>  
+    </xsl:template>  
   
-  <xsl:template match="portlet:simple | bebop:portlet">
-    <div class="portlet">
-      <xsl:variable name="setHeading">
-        <xsl:apply-templates mode="setHeading"/>
-      </xsl:variable>
-      <xsl:if test="$setHeading = 'true'">
-        <h2>
-          <xsl:value-of select="@title"/>
-        </h2>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
+    <xsl:template match="portlet:simple | bebop:portlet">
+        <div class="portlet">
+            <xsl:variable name="setHeading">
+                <xsl:apply-templates mode="setHeading"/>
+            </xsl:variable>
+            <xsl:if test="$setHeading = 'true'">
+                <h2>
+                    <xsl:value-of select="@title"/>
+                </h2>
+            </xsl:if>
+            <xsl:apply-templates/>
+        </div>
+    </xsl:template>
   
-  <xsl:template match="bebop:portlet[portlet:action]">
-    <div class="editPortlet">
-      <div class="startLeftFloat customize">
-        <xsl:if test="portlet:action[@name='customize']">
-          <xsl:apply-templates select="portlet:action[@name='customize']">
-            <xsl:with-param name="src">
-              <xsl:call-template name="mandalay:linkParser">
-                <xsl:with-param name="link">
-                  <xsl:call-template name="mandalay:getSetting">
-                    <xsl:with-param name="module" select="'portal'"/>
-                    <xsl:with-param name="setting" select="'setImage/customize'"/>
-                    <xsl:with-param name="default" select="'/images/portal/customize.gif'"/>
-                  </xsl:call-template>
-                </xsl:with-param>
-                <xsl:with-param name="prefix" select="$theme-prefix"/>
-              </xsl:call-template>
-            </xsl:with-param>
-            <xsl:with-param name="title" select="@name"/>
-            <xsl:with-param name="alt" select="'C'"/>
-          </xsl:apply-templates>
-        </xsl:if>
-      </div>
-      <div class="addLeftFloat moveUp">
-        <xsl:if test="portlet:action[@name='moveUp'] and position() != '1'">
-          <xsl:apply-templates select="portlet:action[@name='moveUp']">
-            <xsl:with-param name="src">
-              <xsl:call-template name="mandalay:linkParser">
-                <xsl:with-param name="link">
-                  <xsl:call-template name="mandalay:getSetting">
-                    <xsl:with-param name="module" select="'portal'"/>
-                    <xsl:with-param name="setting" select="'setImage/moveUp'"/>
-                    <xsl:with-param name="default" select="'/images/portal/moveUp.gif'"/>
-                  </xsl:call-template>
-                </xsl:with-param>
-                <xsl:with-param name="prefix" select="$theme-prefix"/>
-              </xsl:call-template>
-            </xsl:with-param>
-            <xsl:with-param name="title" select="@name"/>
-            <xsl:with-param name="alt" select="'^'"/>
-          </xsl:apply-templates>
-        </xsl:if>
-      </div>
-      <div class="addLeftFloat delete">
-        <xsl:if test="portlet:action[@name='delete']">
-          <xsl:apply-templates select="portlet:action[@name='delete']">
-            <xsl:with-param name="src">
-              <xsl:call-template name="mandalay:linkParser">
-                <xsl:with-param name="link">
-                  <xsl:call-template name="mandalay:getSetting">
-                    <xsl:with-param name="module" select="'portal'"/>
-                    <xsl:with-param name="setting" select="'setImage/delete'"/>
-                    <xsl:with-param name="default" select="'/images/portal/delete.gif'"/>
-                  </xsl:call-template>
-                </xsl:with-param>
-                <xsl:with-param name="prefix" select="$theme-prefix"/>
-              </xsl:call-template>
-            </xsl:with-param>
-            <xsl:with-param name="title" select="@name"/>
-            <xsl:with-param name="alt" select="'X'"/>
-          </xsl:apply-templates>
-        </xsl:if>
-      </div>
-      <div class="startLeftFloat moveLeft">
-        <xsl:if test="portlet:action[@name='moveLeft'] and @cellNumber != '1'">
-          <xsl:apply-templates select="portlet:action[@name='moveLeft']">
-            <xsl:with-param name="src">
-              <xsl:call-template name="mandalay:linkParser">
-                <xsl:with-param name="link">
-                  <xsl:call-template name="mandalay:getSetting">
-                    <xsl:with-param name="module" select="'portal'"/>
-                    <xsl:with-param name="setting" select="'setImage/moveLeft'"/>
-                    <xsl:with-param name="default" select="'/images/portal/moveLeft.gif'"/>
-                  </xsl:call-template>
-                </xsl:with-param>
-                <xsl:with-param name="prefix" select="$theme-prefix"/>
-              </xsl:call-template>
-            </xsl:with-param>
-            <xsl:with-param name="title" select="@name"/>
-            <xsl:with-param name="alt" select="'&lt;'"/>
-          </xsl:apply-templates>
-        </xsl:if>
-      </div>
-      <div class="addLeftFloat portlet">
-        <!-- DE Wähle alle Kindknoten mit Ausnahme von portlet:action aus -->
-        <!-- EN Select all child nodes except portlet:action -->
-        <xsl:apply-templates select="*[not(self::portlet:action)]"/>
-      </div>
-      <div class="addLeftFloat moveRight">
-        <xsl:if test="portlet:action[@name='moveRight'] and @cellNumber != substring-before(../@style, ' ')">
-          <xsl:apply-templates select="portlet:action[@name='moveRight']">
-            <xsl:with-param name="src">
-              <xsl:call-template name="mandalay:linkParser">
-                <xsl:with-param name="link">
-                  <xsl:call-template name="mandalay:getSetting">
-                    <xsl:with-param name="module" select="'portal'"/>
-                    <xsl:with-param name="setting" select="'setImage/moveRight'"/>
-                    <xsl:with-param name="default" select="'/images/portal/moveRight.gif'"/>
-                  </xsl:call-template>
-                </xsl:with-param>
-                <xsl:with-param name="prefix" select="$theme-prefix"/>
-              </xsl:call-template>
-            </xsl:with-param>
-            <xsl:with-param name="title" select="@name"/>
-            <xsl:with-param name="alt" select="'&gt;'"/>
-          </xsl:apply-templates>
-        </xsl:if>
-      </div>
-      <div class="startLeftFloat bottomLeft">
-      </div>
-      <div class="addLeftFloat moveDown">
-        <!-- DE Das letzte bebop:portlet ist immer das Widget zum hinzugügen weiterer Portlets,
+    <xsl:template match="bebop:portlet[portlet:action]">
+        <div class="editPortlet">
+            <div class="moveLeft">
+                <xsl:choose>
+                    <xsl:when test="portlet:action[@name='moveLeft'] and @cellNumber != '1'">
+                        <xsl:apply-templates select="portlet:action[@name='moveLeft']">
+                            <xsl:with-param name="src">
+                                <xsl:call-template name="mandalay:linkParser">
+                                    <xsl:with-param name="link">
+                                        <xsl:call-template name="mandalay:getSetting">
+                                            <xsl:with-param name="module" select="'portal'"/>
+                                            <xsl:with-param name="setting" select="'setImage/moveLeft'"/>
+                                            <xsl:with-param name="default" select="'/images/portal/moveLeft.gif'"/>
+                                        </xsl:call-template>
+                                    </xsl:with-param>
+                                    <xsl:with-param name="prefix" select="$theme-prefix"/>
+                                </xsl:call-template>
+                            </xsl:with-param>
+                            <xsl:with-param name="title" select="@name"/>
+                            <xsl:with-param name="alt" select="'&lt;'"/>
+                        </xsl:apply-templates>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:attribute name="class">
+                            <xsl:value-of select="'moveLeft disabled'"/>
+                        </xsl:attribute>
+                        <xsl:variable name="img-src">
+                            <xsl:call-template name="mandalay:getSetting">
+                                <xsl:with-param name="module" select="'portal'"/>
+                                <xsl:with-param name="setting" select="'setImage/moveLeft'"/>
+                                <xsl:with-param name="default" select="'/images/portal/moveLeft.gif'"/>
+                            </xsl:call-template>
+                        </xsl:variable>
+                        <img>
+                            <xsl:attribute name="src">
+                                <xsl:value-of select="concat($theme-prefix, $img-src)"/>
+                            </xsl:attribute>
+                        </img>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </div>
+            <div class="moveUp">
+                <xsl:if test="portlet:action[@name='moveUp'] and position() != '1'">
+                    <xsl:apply-templates select="portlet:action[@name='moveUp']">
+                        <xsl:with-param name="src">
+                            <xsl:call-template name="mandalay:linkParser">
+                                <xsl:with-param name="link">
+                                    <xsl:call-template name="mandalay:getSetting">
+                                        <xsl:with-param name="module" select="'portal'"/>
+                                        <xsl:with-param name="setting" select="'setImage/moveUp'"/>
+                                        <xsl:with-param name="default" select="'/images/portal/moveUp.gif'"/>
+                                    </xsl:call-template>
+                                </xsl:with-param>
+                                <xsl:with-param name="prefix" select="$theme-prefix"/>
+                            </xsl:call-template>
+                        </xsl:with-param>
+                        <xsl:with-param name="title" select="@name"/>
+                        <xsl:with-param name="alt" select="'^'"/>
+                    </xsl:apply-templates>
+                </xsl:if>
+            </div>
+            <div class="customize">
+                <xsl:if test="portlet:action[@name='customize']">
+                    <xsl:apply-templates select="portlet:action[@name='customize']">
+                        <xsl:with-param name="src">
+                            <xsl:call-template name="mandalay:linkParser">
+                                <xsl:with-param name="link">
+                                    <xsl:call-template name="mandalay:getSetting">
+                                        <xsl:with-param name="module" select="'portal'"/>
+                                        <xsl:with-param name="setting" select="'setImage/customize'"/>
+                                        <xsl:with-param name="default" select="'/images/portal/customize.gif'"/>
+                                    </xsl:call-template>
+                                </xsl:with-param>
+                                <xsl:with-param name="prefix" select="$theme-prefix"/>
+                            </xsl:call-template>
+                        </xsl:with-param>
+                        <xsl:with-param name="title" select="@name"/>
+                        <xsl:with-param name="alt" select="'C'"/>
+                    </xsl:apply-templates>
+                </xsl:if>
+            </div>
+            <div class="delete">
+                <xsl:if test="portlet:action[@name='delete']">
+                    <xsl:apply-templates select="portlet:action[@name='delete']">
+                        <xsl:with-param name="src">
+                            <xsl:call-template name="mandalay:linkParser">
+                                <xsl:with-param name="link">
+                                    <xsl:call-template name="mandalay:getSetting">
+                                        <xsl:with-param name="module" select="'portal'"/>
+                                        <xsl:with-param name="setting" select="'setImage/delete'"/>
+                                        <xsl:with-param name="default" select="'/images/portal/delete.gif'"/>
+                                    </xsl:call-template>
+                                </xsl:with-param>
+                                <xsl:with-param name="prefix" select="$theme-prefix"/>
+                            </xsl:call-template>
+                        </xsl:with-param>
+                        <xsl:with-param name="title" select="@name"/>
+                        <xsl:with-param name="alt" select="'X'"/>
+                    </xsl:apply-templates>
+                </xsl:if>
+            </div>
+            <div class="moveDown">
+                <!-- DE Das letzte bebop:portlet ist immer das Widget zum hinzugügen weiterer Portlets,
                 daher wird hier einer abgezogen, damit das letze verschiebare Portlet kein
                 Verschieben nach unten zuläßt. -->
-        <!-- EN The last bebop:portlet is always the widget to add another portlet, so
+                <!-- EN The last bebop:portlet is always the widget to add another portlet, so
                 we substract 1 to ensure that the last movable portlet doesn't have a
                 move down button. -->
-        <xsl:if test="portlet:action[@name='moveDown'] and position() &lt; last() - 1">
-          <xsl:apply-templates select="portlet:action[@name='moveDown']">
-            <xsl:with-param name="src">
-              <xsl:call-template name="mandalay:linkParser">
-                <xsl:with-param name="link">
-                  <xsl:call-template name="mandalay:getSetting">
-                    <xsl:with-param name="module" select="'portal'"/>
-                    <xsl:with-param name="setting" select="'setImage/moveDown'"/>
-                    <xsl:with-param name="default" select="'/images/portal/moveDown.gif'"/>
-                  </xsl:call-template>
-                </xsl:with-param>
-                <xsl:with-param name="prefix" select="$theme-prefix"/>
-              </xsl:call-template>
-            </xsl:with-param>
-            <xsl:with-param name="title" select="@name"/>
-            <xsl:with-param name="alt" select="'v'"/>
-          </xsl:apply-templates>
-        </xsl:if>
-      </div>
-      <div class="addLeftFloat bottomRight">
-      </div>
-      <div class="endFloat horizontalSpacerSmall"/>   
-    </div>
-  </xsl:template>
+                <xsl:if test="portlet:action[@name='moveDown'] and position() &lt; last() - 1">
+                    <xsl:apply-templates select="portlet:action[@name='moveDown']">
+                        <xsl:with-param name="src">
+                            <xsl:call-template name="mandalay:linkParser">
+                                <xsl:with-param name="link">
+                                    <xsl:call-template name="mandalay:getSetting">
+                                        <xsl:with-param name="module" select="'portal'"/>
+                                        <xsl:with-param name="setting" select="'setImage/moveDown'"/>
+                                        <xsl:with-param name="default" select="'/images/portal/moveDown.gif'"/>
+                                    </xsl:call-template>
+                                </xsl:with-param>
+                                <xsl:with-param name="prefix" select="$theme-prefix"/>
+                            </xsl:call-template>
+                        </xsl:with-param>
+                        <xsl:with-param name="title" select="@name"/>
+                        <xsl:with-param name="alt" select="'v'"/>
+                    </xsl:apply-templates>
+                </xsl:if>
+            </div>
+            <div class="moveRight">
+                <xsl:if test="portlet:action[@name='moveRight'] and @cellNumber != substring-before(../@style, ' ')">
+                    <xsl:apply-templates select="portlet:action[@name='moveRight']">
+                        <xsl:with-param name="src">
+                            <xsl:call-template name="mandalay:linkParser">
+                                <xsl:with-param name="link">
+                                    <xsl:call-template name="mandalay:getSetting">
+                                        <xsl:with-param name="module" select="'portal'"/>
+                                        <xsl:with-param name="setting" select="'setImage/moveRight'"/>
+                                        <xsl:with-param name="default" select="'/images/portal/moveRight.gif'"/>
+                                    </xsl:call-template>
+                                </xsl:with-param>
+                                <xsl:with-param name="prefix" select="$theme-prefix"/>
+                            </xsl:call-template>
+                        </xsl:with-param>
+                        <xsl:with-param name="title" select="@name"/>
+                        <xsl:with-param name="alt" select="'&gt;'"/>
+                    </xsl:apply-templates>
+                </xsl:if>
+            </div>
+            <div class="bottomRight">
+            </div>
+            <div class="portlet">
+                <!-- DE Wähle alle Kindknoten mit Ausnahme von portlet:action aus -->
+                <!-- EN Select all child nodes except portlet:action -->
+                <xsl:apply-templates select="*[not(self::portlet:action)]"/>
+            </div>
+        </div>
+    </xsl:template>
 
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/portal/workspace.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/portal/workspace.xsl
index 285f7e5d7..f0822af53 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/portal/workspace.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/portal/workspace.xsl
@@ -55,7 +55,7 @@
           <a>
             <xsl:attribute name="href">
               <xsl:call-template name="mandalay:linkParser">
-                <xsl:with-param name="link" select="'portal/'"/>
+                <xsl:with-param name="link" select="./primaryURL"/>
               </xsl:call-template>
             </xsl:attribute>
             <xsl:attribute name="title">
@@ -83,7 +83,7 @@
           <a>
             <xsl:attribute name="href">
               <xsl:call-template name="mandalay:linkParser">
-                <xsl:with-param name="link" select="'portal/edit.jsp'"/>
+                <xsl:with-param name="link" select="concat(./primaryURL, 'edit.jsp')"/>
               </xsl:call-template>
             </xsl:attribute>
             <xsl:attribute name="title">
@@ -111,7 +111,7 @@
           <a>
             <xsl:attribute name="href">
               <xsl:call-template name="mandalay:linkParser">
-                <xsl:with-param name="link" select="'portal/admin/index.jsp'"/>
+                <xsl:with-param name="link" select="concat(./primaryURL, 'admin/index.jsp')"/>
               </xsl:call-template>
             </xsl:attribute>
             <xsl:attribute name="title">
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/portlet/contentItem.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/portlet/contentItem.xsl
index 4ca464fad..48d368e6d 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/portlet/contentItem.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/portlet/contentItem.xsl
@@ -58,6 +58,7 @@
       <h1>
         <xsl:value-of select="cms:item/title"/>
       </h1>
+      <xsl:apply-templates mode="lead"/>
       <xsl:apply-templates/>
     </div>
   </xsl:template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/css-files.xml b/ccm-sci-bundle/web/themes/mandalay/settings/css-files.xml
index 9031f2423..9875471d3 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/css-files.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/css-files.xml
@@ -39,6 +39,13 @@
     <css-file media="screen">admin.css</css-file>
     <!--<css-file>wysiwyg.css</css-file>-->
   </application>
+  <application name="portal">
+      <css-file media="screen">portal.css</css-file>
+      <css-file media="screen">public.css</css-file>
+      <css-file media="print">public.css</css-file>
+    <iehacks media="screen">public-ie-hacks.css</iehacks>
+    <iehacks media="print">public-ie-hacks.css</iehacks>
+  </application>
   <application name="terms">
       <css-file media="screen">admin.css</css-file>
   </application>