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 12570e4ea..40fd1e749 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
@@ -30,12 +30,26 @@ html, body{
   margin: 0;
   padding: 0;
   width: 100%;
+  max-width: 100%;
   height: 100%;
   color: #4a4a4a;
   background-color: #e6e4f2;
   font-family: Verdana, Helvetica, Arial, sans-serif;
+  font-size: 1em;
+  line-height: 1em;
 }
 
+h1 {
+  padding: 0;
+  background-image: none;
+}
+
+h2 {
+  font-family: Verdana,Helvetica,Arial,sans-serif;
+  color: #4a4a4a;
+  font-weight: bold;
+  line-height: 1.5em;
+}
 
 .table {
   display: table;
@@ -68,7 +82,7 @@ html, body{
 
 #cmsPage .headerHeight {
   height: 100px;
-  top: 175px; /* this should be height + 75px*/
+  top: 100px;
 }
 
 /*-----CMS Header-----*/
@@ -335,6 +349,7 @@ div#cmsContent {
   left:0;
   right: 0;
   height: auto !important;
+  margin-top: 75px !important;
   font-size: 1em;
   overflow: hidden;
   border-radius: 0.3em;
@@ -369,6 +384,10 @@ div#right div.columnContent > div {
   right: 0;
 }
 
+div#content ul, div#content ol {
+    margin: 0em;
+}
+
 /*----Left----*/
 div#left {
   margin: 0;
@@ -416,6 +435,7 @@ div#right div.columnHead .contenttitle h1 {
   border: none;
   font:inherit;
   color: inherit;
+  text-transform: none;;
 }
 
 /*
@@ -466,7 +486,7 @@ a img {
 ul {
   list-style: none;
   d isplay: inline;
-  m argin: 0em;
+  margin: 0em !important;
   p adding: 0em;
 }
 
@@ -620,8 +640,10 @@ div.actionLink span {
   box-shadow: inset 5px 5px 10px rgba(255,255,255,0.3),inset -5px -5px 10px rgba(0,0,0,0.3);
 }
 
-div.actionLink a{
-  color:#ffffff;
+div.actionLink a {
+  padding: 0;
+  background-image: none;
+  color:#ffffff !important;
 }
 
 div.actionLink span:hover {
@@ -846,6 +868,7 @@ div.bebopLeft div.bebopPanelRow {
 
 div.bebopPanelRow { 
 	margin-bottom:1em;
+	padding: 0;
 	width:40%;
 }
 div.bebopPanelRow table tr td { 
@@ -1240,21 +1263,26 @@ input#draft_search:active {
 }
 
 /* Links */
-a, a:link, a:visited {
+a, a:link, a:visited,
+#content a, #content a:link, #content a:visited {
 	color: #75051d;
 	text-decoration: none;
 }
 
-a:focus, a:hover, a:active {
+a:focus, a:hover, a:active,
+#content a:hover,  #content a:focus,  #content a:active {
 	color: #cc0033;
+  text-decoration: inherit;
 }
 
 #left {
+  position: static;
 	float: left;
 	width: 14em;
 	height: 100%;
 	overflow: hidden;
 	margin: 0.3em;
+	padding: 0;
 	background-color: #ffffff;
 }
 
@@ -1267,16 +1295,20 @@ a:focus, a:hover, a:active {
 #right {
 	position: relative;
 	top: 0em;
-	width: 14em;
 	height: 100%;
 	overflow: hidden;
 	margin: 0.3em;
+  padding: 0;
 	background-color: #ffffff;
 }
 #content {
-	min-height: 40em;
+  border: 0;
+  padding: 0;
+	min-height: inherit;
 	color: #4a4a4a;
+	background-color: inherit;
 	line-height: 1.5em;
+	font-family: Verdana, Helvetica, Arial, sans-serif;
 }
 
 /*momentan für die Inhalt von Content*/
@@ -1285,6 +1317,8 @@ a:focus, a:hover, a:active {
 }
 
 #content form {
+  margin: 0;
+  color: inherit;
   background-color: transparent;
   text-align: left;
 }
@@ -1294,15 +1328,21 @@ a:focus, a:hover, a:active {
   float: none;
   border: none;
   padding: 0.2em;
+  color: inherit;
+  background-color: #ffffff;
 }
 
 #content form select {
   padding: 0.25em;
   min-width: 11.4em;
+  color: inherit;
+  background-color: #ffffff;
 }
 
 #content textarea {
   padding: 0.25em;
+  color: inherit;
+  background-color: #ffffff;
 }
 
 #content form input[type="submit"] {
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsCategoryStep.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsCategoryStep.xsl
index 3eef83f4a..284092890 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsCategoryStep.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsCategoryStep.xsl
@@ -145,11 +145,13 @@
               </xsl:attribute>
             </img>
             &nbsp;
-            <xsl:value-of select="@name"/>
+            <!--<xsl:value-of select="@name"/>-->
+            <xsl:value-of select="@path"/>
           </a>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:value-of select="@name"/>
+          <!--<xsl:value-of select="@name"/>-->
+          <xsl:value-of select="@path"/>
         </xsl:otherwise>
       </xsl:choose>
     </li>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsGreeting.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsGreeting.xsl
index c6aeff549..63c1cfa47 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsGreeting.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsGreeting.xsl
@@ -35,7 +35,8 @@
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
   xmlns:nav="http://ccm.redhat.com/navigation"
   xmlns:mandalay="http://mandalay.quasiweb.de"
-  exclude-result-prefixes="xsl bebop cms nav mandalay" version="1.0">
+  xmlns:ui="http://www.arsdigita.com/ui/1.0"
+  exclude-result-prefixes="xsl bebop cms nav mandalay ui" version="1.0">
 
   <!-- DE Gibt die Begrüßungszeile aus -->
   <!-- EN Show the welcome message -->
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 8725c79b9..aa3d722b3 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
@@ -33,7 +33,6 @@
   xmlns:subsite="http://ccm.redhat.com/subsite/1.0"
   xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
   xmlns:ppp="http://www.arsdigita.com/PublicPersonalProfile/1.0"
-  xmlns:atoz="http://www.arsdigita.com/atoz/1.0"
   xmlns:mandalay="http://mandalay.quasiweb.de"  
   exclude-result-prefixes="xsl aplaws bebop cms docs forum mandalay nav portal ppp search subsite terms ui"
   version="1.0">
@@ -187,6 +186,10 @@
     <xsl:call-template name="mandalay:fancybox"/>
   </xsl:template>
 
+  <xsl:template match="useJqueryUi">
+  	<script type="text/javascript" src="/assets/jquery-ui.min.js"/>
+  </xsl:template>
+
   <xsl:template match="useMathJax">
     <script type="text/javascript" src="/assets/mathjax/MathJax.js?config=TeX-MML-AM_HTMLorMML"/>
   </xsl:template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/notes.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/notes.xsl
index 2ea0fbdff..4039295f8 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/notes.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/notes.xsl
@@ -59,7 +59,7 @@
           <xsl:with-param name="node"  select="$layoutTree/setHeadingPerItem"/>
           <xsl:with-param name="module"  select="'notes'"/>
           <xsl:with-param name="setting" select="'setHeadingPerItem'"/>
-          <xsl:with-param name="default" select="'true'"/>
+          <xsl:with-param name="default" select="'false'"/>
         </xsl:call-template>
       </xsl:variable>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/quicksearch.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/quicksearch.xsl
index 9fa31cce2..ee26f89eb 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/quicksearch.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/quicksearch.xsl
@@ -78,7 +78,7 @@
     <form id="quicksearch" name="search" method="get" action="{$dispatcher-prefix}/search/">
       <p>
         <label for="quicksearchbox" accesskey="4">
-          <xsl:if test="$setPrefix='true'">
+          <xsl:if test="$setPrefix='false'">
             <xsl:attribute name="class">
               <xsl:value-of select="'hide'"/>
             </xsl:attribute>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types.xsl
index 722562728..6114934cf 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/types.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types.xsl
@@ -75,4 +75,13 @@
     <xsl:apply-templates select="." mode="detailed_view"/>
   </xsl:template>
 
+<!--
+  <xsl:template match="cms:item[objectType and not (@useContext = 'itemAdminSummary')]" mode="lead">
+    <xsl:apply-templates select="." mode="lead"/>
+  </xsl:template>
+
+  <xsl:template match="cms:item[objectType and not (@useContext = 'itemAdminSummary')]" mode="image">
+    <xsl:apply-templates select="." mode="image"/>
+  </xsl:template>
+-->
 </xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/Event.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/Event.xsl
index 8863f4a51..a8dd8a8a9 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/types/Event.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/Event.xsl
@@ -418,41 +418,78 @@
 
     <xsl:if test="$setDate = 'true' and ((nav:attribute[@name='startDate'] or nav:attribute[@name='endDate']) or nav:attribute[@name='eventDate'])">
       <div class="dateline">
-        <span class="date">
-          <xsl:choose>
-            <xsl:when test="not(nav:attribute[@name='endDate']) or nav:attribute[@name='startDate'] = nav:attribute[@name='endDate']">
-                <xsl:choose>
-                  <xsl:when test="$setDateFormat = 'L'">
-                    <xsl:value-of select="nav:attribute[@name='startDate']/@longDate"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="nav:attribute[@name='startDate']/@date"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:choose>
-                  <xsl:when test="$setDateFormat = 'L'">
-                    <xsl:value-of select="nav:attribute[@name='startDate']/@longDate"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="nav:attribute[@name='startDate']/@date"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              <span class="separator">
-                <xsl:value-of select="$dateSeparator"/>
-              </span>
-                <xsl:choose>
-                  <xsl:when test="$setDateFormat = 'L'">
-                    <xsl:value-of select="nav:attribute[@name='endDate']/@longDate"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="nav:attribute[@name='endDate']/@date"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-            </xsl:otherwise>
-          </xsl:choose>
-        </span>
+        <xsl:choose>
+          <xsl:when test="not(nav:attribute[@name='endDate']) or nav:attribute[@name='startDate'] = nav:attribute[@name='endDate']">
+            <span class="date">
+              <xsl:choose>
+                <xsl:when test="$setDateFormat = 'L'">
+                  <xsl:value-of select="nav:attribute[@name='startDate']/@longDate"/>
+                </xsl:when>
+                <xsl:when test="$setDateFormat = 'M'">
+                  <span class="day">
+                    <xsl:value-of select="substring(nav:attribute[@name='startDate']/@date, 1, 2)"/>
+                  </span>
+                  <span class="month">
+                    <xsl:value-of select="substring(nav:attribute[@name='startDate']/@monthName, 1, 3)"/>
+                  </span>
+                  <span class="year">
+                    <xsl:value-of select="nav:attribute[@name='startDate']/@year"/>
+                  </span>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="nav:attribute[@name='startDate']/@date"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </span>
+          </xsl:when>
+          <xsl:otherwise>
+            <span class="startDate">
+              <xsl:choose>
+                <xsl:when test="$setDateFormat = 'L'">
+                  <xsl:value-of select="nav:attribute[@name='startDate']/@longDate"/>
+                </xsl:when>
+                <xsl:when test="$setDateFormat = 'M'">
+                  <span class="day">
+                    <xsl:value-of select="substring(nav:attribute[@name='startDate']/@date, 1, 2)"/>
+                  </span>
+                  <span class="month">
+                    <xsl:value-of select="substring(nav:attribute[@name='startDate']/@monthName, 1, 3)"/>
+                  </span>
+                  <span class="year">
+                    <xsl:value-of select="nav:attribute[@name='startDate']/@year"/>
+                  </span>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="nav:attribute[@name='startDate']/@date"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </span>
+            <span class="separator">
+              <xsl:value-of select="$dateSeparator"/>
+            </span>
+            <span class="endDate">
+              <xsl:choose>
+                <xsl:when test="$setDateFormat = 'L'">
+                  <xsl:value-of select="nav:attribute[@name='endDate']/@longDate"/>
+                </xsl:when>
+                <xsl:when test="$setDateFormat = 'M'">
+                  <span class="day">
+                    <xsl:value-of select="substring(nav:attribute[@name='endDate']/@date, 1, 2)"/>
+                  </span>
+                  <span class="month">
+                    <xsl:value-of select="substring(nav:attribute[@name='endDate']/@monthName, 1, 3)"/>
+                  </span>
+                  <span class="year">
+                    <xsl:value-of select="nav:attribute[@name='endDate']/@year"/>
+                  </span>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="nav:attribute[@name='endDate']/@date"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </span>
+          </xsl:otherwise>
+        </xsl:choose>
         <xsl:if test="nav:attribute[@name='eventDate']">
           <xsl:value-of select="$dateSeparator"/>
           <span class="location">
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 2a8ade913..6fd3183d3 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,11 @@
 -->
 
 <translations>
+  <line id="memberListsortAndFilterList">Mitgliederliste filtern</line>
+  <line id="memberListfilterList">Mitgliederliste filtern</line>
+  <line id="memberListSubmitFilters">Fitern</line>
+  <line id="memberListsurname">Familienname</line>
+
   <line id="SciPublicationsListsortAndFilterList">Publikationen filtern und sortieren</line>
   <line id="SciPublicationsListfilterList">Publikationen filtern</line>
   <line id="SciPublicationsListsortList">Publikationen sortieren</line>
@@ -47,6 +52,12 @@
   <line id="SciProjectListprojectstatusAll">Alle Projekte</line>
   <line id="SciProjectListSortBytitle">Titel</line>
 
+  <line id="projectListsortAndFilterList">Projekt filtern</line>
+  <line id="projectListfilterList"> </line>
+  <line id="projectListtitle">Titel des Projektes</line>
+  <line id="projectListresearchfield">Forschungsfeld</line>
+  <line id="projectListSubmitFilters">Filter anwenden</line>
+
   <line id="sciOrganizationPublicationssortAndFilterList"></line>
   <line id="sciOrganizationPublicationsfilterList">Publikationen filtern</line>
   <line id="sciOrganizationPublicationssortList">Publikationen sortieren</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 70bab8944..01258dffd 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/en/filterControls.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/filterControls.xml
@@ -24,7 +24,6 @@
   <line id="SciPublicationsListfilterList">Filter publications</line>
   <line id="SciPublicationsListsortList">Sort publications</line>
   <line id="SciPublicationsListSubmitFilters">Filter publications</line>
-  <line id="SciPublicationsListsortList">Sort publications</line>
   <line id="SciPublicationsListSortList">Sort publications</line>
   <line id="SciPublicationsListtitle">Fiter by title</line>
   <line id="SciPublicationsListauthorsStr">Filter by author</line>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/layoutParser.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/layoutParser.xsl
index 559f9de7a..85e3ce7b5 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/layoutParser.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/mandalay/layoutParser.xsl
@@ -103,6 +103,10 @@
     <xsl:apply-templates select="$resultTree//ppp:ownerName"/>
   </xsl:template>
 
+  <xsl:template match="showPPPOwnerImage">
+    <xsl:apply-templates select="$resultTree//ppp:profileImage"/>
+  </xsl:template>
+
   <xsl:template match="useOrgaUnitTab">
     <xsl:apply-templates select="$resultTree/orgaUnitTabs/selectedTab/." mode="tabs"/>
   </xsl:template>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/public-personal-profile/public-personal-profile.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/public-personal-profile/public-personal-profile.xsl
index 3c182196d..d2556e2c7 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/public-personal-profile/public-personal-profile.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/public-personal-profile/public-personal-profile.xsl
@@ -37,7 +37,9 @@
   </xsl:template>
 
   <xsl:template match="ppp:ownerName">
-    <h1><xsl:value-of select="."/></h1>
+    <div class="profileName">
+      <h1><xsl:value-of select="."/></h1>
+    </div>
 <!--
     <xsl:choose>
       <xsl:when test="name(..) = 'title'">
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types.xsl
index 51de75276..9fe3a3595 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types.xsl
@@ -40,7 +40,8 @@
   <!--
     <xsl:import href="types/XXX.xsl"/>
   -->
-  <xsl:import href="types/ContentBundle.xsl"/>
+  <xsl:import href="types/ContentBundle.xsl"/>  
+  <xsl:import href="types/DecisionTree.xsl"/>  
   <xsl:import href="types/DecisionTree.xsl"/>  
   <xsl:import href="types/PublicPersonalProfile.xsl"/>
   <xsl:import href="types/SciDepartment.xsl"/>
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 e80547872..fb431107b 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
@@ -316,7 +316,7 @@
 
       <xsl:choose>
 	<xsl:when test="$linkProject = 'true'">
-	  <a>
+	  <a class="CIname">
 	    <xsl:choose>
 	      <xsl:when test="$useRelativeUrl = 'true'">
 		<xsl:attribute name="href"><xsl:value-of select="@oid"/></xsl:attribute>
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 a679ccebf..57bb59291 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
@@ -79,7 +79,7 @@
         <xsl:with-param name="module"  select="'PublicPersonalProfile'"/>
         <xsl:with-param name="setting" select="'contentPos3'"/>
         <xsl:with-param name="default" select="'contact'"/>
-      </xsl:call-template>      
+      </xsl:call-template>
     </xsl:variable>
 
     <xsl:if test="count(./ppp:profile) = 0">
@@ -117,48 +117,47 @@
           <xsl:with-param name="contentKey" select="$contentPos3"/>
         </xsl:call-template>
 
-	<xsl:if test="./position and (string-length(normalize-space(./position)) &gt; 0)">
-	  <div id="pppOwnerPosition">
-	    <h3>
-	      <xsl:call-template name="mandalay:getStaticText">
-		<xsl:with-param name="module" select="'PublicPersonalProfile'"/>
-		<xsl:with-param name="id" select="'position'"/>
-	      </xsl:call-template>
-	    </h3>
-	    <xsl:value-of select="./position"/>
-	  </div>	  	  
-	</xsl:if>
+        <xsl:if test="./position and (string-length(normalize-space(./position)) &gt; 0)">
+          <div id="pppOwnerPosition">
+            <h3>
+              <xsl:call-template name="mandalay:getStaticText">
+                <xsl:with-param name="module" select="'PublicPersonalProfile'"/>
+                <xsl:with-param name="id" select="'position'"/>
+              </xsl:call-template>
+            </h3>
+            <xsl:value-of select="./position"/>
+          </div>
+        </xsl:if>
 
-	<xsl:if test="./interests">
-	  <div id="pppInterests">
-	    <h3>
-	      <xsl:call-template name="mandalay:getStaticText">
-		<xsl:with-param name="module" select="'PublicPersonalProfile'"/>
-		<xsl:with-param name="id" select="'interests'"/>
-	      </xsl:call-template>
-	    </h3>
-	    <xsl:value-of disable-output-escaping="yes" select="./interests"/>
-	  </div>	  	  
-	</xsl:if>
+        <xsl:if test="./interests">
+          <div id="pppInterests">
+            <h3>
+              <xsl:call-template name="mandalay:getStaticText">
+                <xsl:with-param name="module" select="'PublicPersonalProfile'"/>
+                <xsl:with-param name="id" select="'interests'"/>
+              </xsl:call-template>
+            </h3>
+            <xsl:value-of disable-output-escaping="yes" select="./interests"/>
+          </div>
+        </xsl:if>
 
-	<xsl:if test="./misc">
-	  <div id="pppOwnerMisc">
-	    <h3>
-	      <xsl:call-template name="mandalay:getStaticText">
-		<xsl:with-param name="module" select="'PublicPersonalProfile'"/>
-		<xsl:with-param name="id" select="'misc'"/>
-	      </xsl:call-template>
-	    </h3>
-	    <xsl:value-of disable-output-escaping="yes" select="./misc"/>
-	  </div>	  	  
-	</xsl:if>
+        <xsl:if test="./misc">
+          <div id="pppOwnerMisc">
+            <h3>
+              <xsl:call-template name="mandalay:getStaticText">
+                <xsl:with-param name="module" select="'PublicPersonalProfile'"/>
+                <xsl:with-param name="id" select="'misc'"/>
+              </xsl:call-template>
+            </h3>
+            <xsl:value-of disable-output-escaping="yes" select="./misc"/>
+          </div>
+        </xsl:if>
 
       </div>
 
       <div class="endFloat"/>
 
     </xsl:if>
-
   </xsl:template>
 
   <!-- These templates are only for internal use in *this* file -->
@@ -174,15 +173,16 @@
       <xsl:when test="$contentKey = 'ownerimage'">
         <xsl:call-template name="pppOwnerImage"/>
       </xsl:when>
+      <xsl:otherwise/>
     </xsl:choose>
   </xsl:template>
 
   <xsl:template name="pppContact">
     <dl class="contactEntries">
       <xsl:for-each select="./profileOwner/contacts/contact[@contactType='commonContact']/contactEntryKeys/entryKey">
-	<xsl:if test="current() != 'homepage'">
-	  <xsl:apply-templates select="../../contactentries[keyId=current()]" mode="dl"/>
-	</xsl:if>
+        <xsl:if test="current() != 'homepage'">
+          <xsl:apply-templates select="../../contactentries[keyId=current()]" mode="dl"/>
+        </xsl:if>
       </xsl:for-each>
 
 <!--      <xsl:apply-templates select="./profileOwner/contacts/contact[@contactType='commonContact']/contactentries[keyId='office']" mode="dl"/>
@@ -207,21 +207,21 @@
     </dt>
     <dd class="contactEntryValue">
       <xsl:choose>
-	<xsl:when test="$setLinks and contains(./value, '@')">
-	  <a>
-	    <xsl:attribute name="href">mailto:<xsl:value-of select="./value"/></xsl:attribute>
-	    <xsl:value-of select="./value"/>
-	  </a>
-	</xsl:when>
-	<xsl:when test="$setLinks and starts-with(./value, 'http')">
-	  <a>
-	    <xsl:attribute name="href"><xsl:value-of select="./value"/></xsl:attribute>
-	    <xsl:value-of select="./value"/>
-	  </a>
-	</xsl:when>
-          <xsl:otherwise>
-	    <xsl:value-of select="./value"/>
-	  </xsl:otherwise>
+        <xsl:when test="$setLinks and contains(./value, '@')">
+          <a>
+            <xsl:attribute name="href">mailto:<xsl:value-of select="./value"/></xsl:attribute>
+            <xsl:value-of select="./value"/>
+          </a>
+        </xsl:when>
+        <xsl:when test="$setLinks and starts-with(./value, 'http')">
+          <a>
+            <xsl:attribute name="href"><xsl:value-of select="./value"/></xsl:attribute>
+            <xsl:value-of select="./value"/>
+          </a>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="./value"/>
+        </xsl:otherwise>
       </xsl:choose>
     </dd>
   </xsl:template>