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 00ed99b6e..12570e4ea 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
@@ -22,61 +22,86 @@
 /* EN CSS for the contentcenter */
 /********************************/
 * {
-	margin: 0em;
-	padding: 0em;
+  margin: 0em;
+  padding: 0em;
 }
 
 html, body{
-	margin: 0;
-	padding: 0;
-	width: 100%;
-	height: 100%;
-	color: #4a4a4a;
-	background-color: #e6e4f2;
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-  }
+  margin: 0;
+  padding: 0;
+  width: 100%;
+  height: 100%;
+  color: #4a4a4a;
+  background-color: #e6e4f2;
+  font-family: Verdana, Helvetica, Arial, sans-serif;
+}
+
+
+.table {
+  display: table;
+  width: 100%;
+}
+
+.tableRow {
+  display: table-row;
+}
+
+.tableCell, span.key, span.value {
+  display: table-cell;
+  width: auto;
+}
+
+
 /*-----cmsPage-----*/
 #cmsPage {
-	height:100%;
-	width: 100%;
-	min-height: 100%;
-	min-width:900px;
-	overflow: hidden;
-	position:absolute;
+  height:100%;
+  width: 100%;
+  min-height: 100%;
+  overflow: hidden;
+  position:absolute;
 }
 
 #cmsPage .minWidth {
-	margin: 0 3.5%;
-	min-width: 1300px;
+  margin: 0 3.5%;
+  min-width: 1300px;
+}
+
+#cmsPage .headerHeight {
+  height: 100px;
+  top: 175px; /* this should be height + 75px*/
 }
 
 /*-----CMS Header-----*/
-#cmsHeader { 
-	color: #ffffff;
-	background-image: linear-gradient(top, #75051d 25%, #2f020c 75%);
-	background-image: -o-linear-gradient(top, #75051d 25%, #2f020c 75%); 
-	background-image: -ie-linear-gradient(top, #75051d 25%, #2f020c 75%);
-	background-image: -moz-linear-gradient(top, #75051d 25%, #2f020c 75%); 
-	background-image: -webkit-linear-gradient(top, #75051d 25%, #2f020c 75%); 
-	/*Compatibility IE- es fuktioniert noch nicht ganz*/
-	filter: progid:DXImageTransform.Microsoft.gradient(enabled='true',gradientType='0',startColorstr='#75051d', 
-	endColorstr='#2f020c'); /* IE6 & IE7 */
-	-ms-filter: progid:DXImageTransform.Microsoft.gradient(enabled='true',gradientType='0',startColorstr='#75051d', 
-	endColorstr='#2f020c'); /* IE8 */ 
-	background-color:#75051d;
+#cmsHeader {
+  position: relative;
+  top: auto !important;
+  padding-bottom: 35px;
+  color: #ffffff;
+  background-color:#75051d;
+  background-image: linear-gradient(top, #75051d 25%, #2f020c 75%);
+  background-image: -o-linear-gradient(top, #75051d 25%, #2f020c 75%); 
+  background-image: -ie-linear-gradient(top, #75051d 25%, #2f020c 75%);
+  background-image: -moz-linear-gradient(top, #75051d 25%, #2f020c 75%); 
+  background-image: -webkit-linear-gradient(top, #75051d 25%, #2f020c 75%); 
+  /*Compatibility IE- es fuktioniert noch nicht ganz*/
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled='true',gradientType='0',startColorstr='#75051d', 
+  endColorstr='#2f020c'); /* IE6 & IE7 */
+  -ms-filter: progid:DXImageTransform.Microsoft.gradient(enabled='true',gradientType='0',startColorstr='#75051d', 
+  endColorstr='#2f020c'); /* IE8 */ 
+  font-size: 0.8em;
 }
 
-div#cmsHeader > div { 
-	position:relative;
-	height: 100%;
+div#cmsHeader .minWidth,
+div#cmsHeader .logo,
+div#cmsHeader .logo img { 
+  height: 100%;
 }
 
 div#cmsHeader .logo{
-	float: left;
-	width: 280px;
-	height: 120px;
+  float: left;
 }
 
+/*
 div#cmsHeader #quicksearchwidget {
 	float: right;
 	margin: 0.5em;
@@ -86,230 +111,21 @@ div#cmsHeader #quicksearchwidget {
 	padding: 0.3em;
 	color: #4a4a4a;
 	background-color: #f0f0f0;
-	font-size: 0.8em;
 }
+*/
+
 /*Änderung wie im konzept vornehmen???*/
+div#cmsHeader div.cmsHeaderMenu,
 div#cmsHeader #userwidget {
-	clear: right;
-	float: right;
-	padding: 0.3em;
-	margin: 0.5em;
-	font-size: 0.8em;
+  float: right;
+  padding: 0.3em;
+  font-size: 0.9em;
 }
 
-div#cmsHeader h1 { 
-	margin: 2em 0em 0em 0em;
-	clear: left;
+div#cmsHeader .cmsGreeting,
+div#cmsHeader .cmsGlobalNavigation {
+  display: inline;
 }
-/*----TabbedPane----*/
-div#bebopTabbedPane {
-    width:100%;
-    min-width: 1300px;
-	clear: both;
-    padding: 0.4em;
-	font-size: 0.75em;
-	display: block;
-}
-
-div#bebopTabbedPane a{
-	color: #ffffff;
-}
-span.bebopTab {
-	margin: 0 -0.7em 0 0;
-	border-top-left-radius: 0.5em;
-	border-top-right-radius: 0.5em;
-	padding: 0.4em;
-	background-color: #1c1b1d;
-}
-
-span.bebopTab a:hover {
-	color:#ffffff;
-}
-
-span.bebopTab.current {
-	color: #656054;
-	background-color: #e6e4f2;
-	font-weight:bold;
-}
-
-div#bebopTabbedPane span:before {
-	position: relative;
-	padding: 0em 0.1em 0em 0em;
-	top: 5px;
-}
-div#bebopTabbedPane span.browse:before {
-	content: url('../../../images/cms/browse.png');
-}
-
-div#bebopTabbedPane span.browse.current:before {
-	content: url('../../../images/cms/browse-current.png');
-}
-
-div#bebopTabbedPane span.search:before {
-	content: url('../../../images/cms/search.png');
-}
-
-div#bebopTabbedPane span.search.current:before {
-	content: url('../../../images/cms/search-current.png');
-}
-
-div#bebopTabbedPane span.images:before {
-	content: url('../../../images/cms/images.png');
-}
-
-div#bebopTabbedPane span.images.current:before {
-	content: url('../../../images/cms/images-current.png');
-}
-
-div#bebopTabbedPane span.roles:before {
-	content: url('../../../images/cms/roles.png');
-}
-
-div#bebopTabbedPane span.roles.current:before {
-	content: url('../../../images/cms/roles-current.png');
-}
-
-div#bebopTabbedPane span.workflows:before {
-	content: url('../../../images/cms/workflows.png');
-}
-
-div#bebopTabbedPane span.workflows.current:before {
-	content: url('../../../images/cms/workflows-current.png');
-}
-
-div#bebopTabbedPane span.lifecycles:before {
-	content: url('../../../images/cms/lifecycles.png');
-}
-
-div#bebopTabbedPane span.lifecycles.current:before {
-	content: url('../../../images/cms/lifecycles-current.png');
-}
-
-div#bebopTabbedPane span.categories:before {
-	content: url('../../../images/cms/categories.png');
-}
-
-div#bebopTabbedPane span.categories.current:before {
-	content: url('../../../images/cms/categories-current.png');
-}
-
-div#bebopTabbedPane span.content_types:before {
-	content: url('../../../images/cms/contenttypes.png');
-}
-
-div#bebopTabbedPane span.content_types.current:before {
-	content: url('../../../images/cms/contenttypes-current.png');
-}
-
-div#bebopTabbedPane span.user_admin:before {
-	content: url('../../../images/cms/admin.png');
-}
-
-div#bebopTabbedPane span.user_admin.current:before {
-	content: url('../../../images/cms/admin-current.png'); 
-}
-
-div#bebopTabbedPane span.cse:before {
-	content: url('../../../images/cms/cse.png');
-}
-
-div#bebopTabbedPane span.cse.current:before {
-	content: url('../../../images/cms/cse-current.png');
-}
-
-div#bebopTabbedPane span.reports:before {
-	content: url('../../../images/cms/reports.png');
-}
-
-div#bebopTabbedPane span.reports.current:before {
-	content: url('../../../images/cms/reports-current.png');
-}
-
-div#bebopTabbedPane span.taskssections:before {
-	content: url('../../../images/cms/taskssections.png');
-}
-
-div#bebopTabbedPane span.taskssections.current:before {
-	content: url('../../../images/cms/taskssections-current.png');
-}
-
-/*------Bebop ContextBar----- */
-div#cmsBreadcrumbs {
-	top: 28%; 
-	height:4%;
-	padding: 1em;
-	font-size: 0.8em;
-	background-color: #e6e4f2;
-}
-div.bebopContextBar {
-	width:100%;
-	font-weight:bold;
-	font-size: 0.8em;
-}
-
-div.bebopContextBar a{
-	color:#767676; 
-	margin-left: 1em;
-	height: 13px;
-	padding: 5px 5px 0px 5px; 
-	padding: 2px 5px; 
-	background: #d6d6d6;
-	float: left;
-	border-width: 1px;
-    border-color: #f5f5f5 #e5e5e5 #ccc;
-	-moz-box-shadow: 0 0 5px #888;
-	-webkit-box-shadow: 0 0 5px#888;
-	box-shadow: 0 0 5px #888;
-}
-
-span.bebopContextBarElement span{
-	color: transparent; 
-	height: 13px;
-	padding: 5px 5px 0px 5px; 
-	padding: 2px 5px; 
-	background: #d6d6d6;
-	float: left;
-	border-width: 1px;
-    border-color: #f5f5f5 #e5e5e5 #ccc;
-	-moz-box-shadow: 0 0 5px #888;
-	-webkit-box-shadow: 0 0 5px#888;
-	box-shadow: 0 0 5px #888;
-	background-image:url('../../../images/scrumb.png');
-	background-repeat:no-repeat;
-	background-position: center;
-}
-
-div.bebopContextBar a:hover{
-	color: #767676; 
-}
-
-div .bebopContextBarCurrentElement{
-	color:#767676; 
-	margin-left: 1.5em;
-	height: 13px;
-	padding: 5px 5px 0px 5px; 
-	padding: 2px 5px; 
-	background: #d6d6d6;
-	float: left;
-	border-width: 1px;
-    border-color: #f5f5f5 #e5e5e5 #ccc;
-	-moz-box-shadow: 0 0 5px #888;
-	-webkit-box-shadow: 0 0 5px#888;
-	box-shadow: 0 0 5px #888;
-}
-
-div#cmsHeader div.cmsHeaderMenu { 
-	float: right;
-	margin: 0.5em;
-	font-size: 0.85em;
-	color: #4a4a4a;
-	padding: 0.3em;
-}
-
-div#cmsHeader .cmsGreeting {
-  color:#ffffff;
-}
-
 
 div#cmsHeader .cmsGreeting .cmsUserName {
 	font-weight: bold;
@@ -317,90 +133,283 @@ div#cmsHeader .cmsGreeting .cmsUserName {
 }
 
 
+div#cmsHeader h1 { 
+	margin: 2em 0em 0em 0em;
+	clear: left;
+}
+/*----TabbedPane----*/
+div#bebopTabbedPane {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: auto !important;
+  padding: 0.4em;
+  font-size: 0.9em;
+}
 
- div#bebopContextbar a:visited {
-	color: #4a4a4a;
+div#bebopTabbedPane a {
+  color: #ffffff;
+}
+
+span.bebopTab {
+  margin: 0 -0.7em 0 0;
+  border-top-left-radius: 0.5em;
+  border-top-right-radius: 0.5em;
+  padding: 0.4em;
+  background-color: #2c2b2d;
+  transition: all 0.5s ease;
+  -o-transition: all 0.5s ease;
+  -ie-transition: all 0.5s ease;
+  -moz-transition: all 0.5s ease;
+  -webkit-transition: all 0.5s ease;
+}
+
+span.bebopTab:hover {
+  background-color: #4c4b4d;
+}
+
+span.bebopTab.current {
+  color: #656054;
+  background-color: #e6e4f2;
+  font-weight:bold;
+}
+
+div#bebopTabbedPane span:before {
+  position: relative;
+  padding: 0 5px 0 0;
+  top: 5px;
+}
+
+div#bebopTabbedPane span.browse:before {
+  content: url('../../../images/cms/browse.png');
+}
+
+div#bebopTabbedPane span.browse.current:before {
+  content: url('../../../images/cms/browse-current.png');
+}
+
+div#bebopTabbedPane span.search:before {
+  content: url('../../../images/cms/search.png');
+}
+
+div#bebopTabbedPane span.search.current:before {
+  content: url('../../../images/cms/search-current.png');
+}
+
+div#bebopTabbedPane span.images:before {
+  content: url('../../../images/cms/images.png');
+}
+
+div#bebopTabbedPane span.images.current:before {
+  content: url('../../../images/cms/images-current.png');
+}
+
+div#bebopTabbedPane span.roles:before {
+  content: url('../../../images/cms/roles.png');
+}
+
+div#bebopTabbedPane span.roles.current:before {
+  content: url('../../../images/cms/roles-current.png');
+}
+
+div#bebopTabbedPane span.workflows:before {
+  content: url('../../../images/cms/workflows.png');
+}
+
+div#bebopTabbedPane span.workflows.current:before {
+  content: url('../../../images/cms/workflows-current.png');
+}
+
+div#bebopTabbedPane span.lifecycles:before {
+  content: url('../../../images/cms/lifecycles.png');
+}
+
+div#bebopTabbedPane span.lifecycles.current:before {
+  content: url('../../../images/cms/lifecycles-current.png');
+}
+
+div#bebopTabbedPane span.categories:before {
+  content: url('../../../images/cms/categories.png');
+}
+
+div#bebopTabbedPane span.categories.current:before {
+  content: url('../../../images/cms/categories-current.png');
+}
+
+div#bebopTabbedPane span.content_types:before {
+  content: url('../../../images/cms/contenttypes.png');
+}
+
+div#bebopTabbedPane span.content_types.current:before {
+  content: url('../../../images/cms/contenttypes-current.png');
+}
+
+div#bebopTabbedPane span.user_admin:before {
+  content: url('../../../images/cms/admin.png');
+}
+
+div#bebopTabbedPane span.user_admin.current:before {
+  content: url('../../../images/cms/admin-current.png'); 
+}
+
+div#bebopTabbedPane span.cse:before {
+  content: url('../../../images/cms/cse.png');
+}
+
+div#bebopTabbedPane span.cse.current:before {
+  content: url('../../../images/cms/cse-current.png');
+}
+
+div#bebopTabbedPane span.reports:before {
+  content: url('../../../images/cms/reports.png');
+}
+
+div#bebopTabbedPane span.reports.current:before {
+  content: url('../../../images/cms/reports-current.png');
+}
+
+div#bebopTabbedPane span.taskssections:before {
+  content: url('../../../images/cms/taskssections.png');
+}
+
+div#bebopTabbedPane span.taskssections.current:before {
+  content: url('../../../images/cms/taskssections-current.png');
+}
+
+/*------Bebop ContextBar----- */
+div#cmsBreadcrumbs {
+  height: 40px;
+  line-height: 40px;
+  font-size: 0.6em;
+}
+
+div.bebopContextBar {
+  color:#767676; 
+  font-weight:bold;
+}
+
+div.bebopContextBar span.bebopContextBarElement,
+div.bebopContextBar span.bebopContextBarSeperator {
+  height: 15px;
+  padding: 2px 0px 2px 5px;
+}
+
+div.bebopContextBar span.bebopContextBarElement,
+div.bebopContextBar span.bebopContextBarCurrentElement {
+  margin-right: 1em;
+  background: #d6d6d6;
+  box-shadow: 0 0 5px #888888;
+  -o-box-shadow: 0 0 5px #888888;
+  -ie-box-shadow: 0 0 5px #888888;
+  -moz-box-shadow: 0 0 5px #888888;
+  -webkit-box-shadow: 0 0 5px #888888;
+}
+
+div.bebopContextBar span.bebopContextBarSeperator {
+  margin-left: 5px;
+  border-left: 1px solid #a4a4a4;
+  color: transparent; 
+  background-image:url('../../../images/scrumb.png');
+  background-repeat:no-repeat;
+  background-position: center;
+}
+
+div.bebopContextBar a,
+div.bebopContextBar a:hover,
+div.bebopContextBar a:focus,
+div.bebopContextBar a:active,
+div.bebopContextBar a:visited
+{
+	color: #767676; 
+}
+
+div .bebopContextBarCurrentElement{
+  padding: 2px 5px; 
 }
 
 /*----cmscontent----*/
 div#cmsContent {
-	left:3.5%;
-	top: 200px;
-	bottom: 0px;
-	right: 3.5%;	
-	overflow: hidden;
-	position: absolute;
-	min-width: 1000px;
-	border-radius: 0.3em;
-	background-color: #e6dcde;
-	box-shadow: 0px 0px 5px #4a4a4a;
+  position: absolute;
+  bottom: 0;
+  left:0;
+  right: 0;
+  height: auto !important;
+  font-size: 1em;
+  overflow: hidden;
+  border-radius: 0.3em;
+  background-color: #e6dcde;
+  box-shadow: 0px 0px 5px #4a4a4a;
+}
+
+
+div#left div.columnHead,
+div#right div.columnHead {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  height: 30px;
+  color: #ffffff;
+  font-size: 0.75em;
+}
+
+div#left div.columnContent,
+div#right div.columnContent {
+  position: absolute;
+  overflow: auto;
+  top: 30px;
+  bottom: 30px;
+  font-size: 0.75em;
+}
+
+div#left div.columnContent > div,
+div#right div.columnContent > div {
+  left: 0;
+  right: 0;
 }
 
 /*----Left----*/
 div#left {
-	margin: 0px;
-	width: 25%;
+  margin: 0;
+  width: 25%;
 }
 
 div#left, div#right{
-	top: 0px;
-	bottom: 0px;
+  top: 0;
+  bottom: 0;
 }
+
 div#left div.columnHead{
-	top: 0px;
-	left: 0px;
-	width: 100%;
-	height: 30px;
-	color: #ffffff;
-	font-size: 0.9em;
-	background-color: #4A4A4A;
+  background-color: #4a4a4a;
 }
 
 div#left div.columnContent{
-	left: 0px;
-	top: 30px;
-	width: 25%;
-	bottom: 29px;
-	position: absolute;
-    background-color: #e6dcde;	
-	overflow: auto;
+  left: 0px;
+  width: 25%;
+  background-color: #e6dcde;
 }
 /*----Right----*/
 div#right{
-	width: 75%;
-	margin-top: 0px;
-	margin-left: 25%;
-	margin-right: 0px;
-    background-color: #f2f0ff;
-}
-div#right div.columnHead {
-	top: 0px;
-	right: 0px;
-	width: 100%;
-	height: 30px;
-	color: #ffffff;
-	font-size: 0.9em;
-	font-weight: bold;
-	position: absolute;
-	background-color: #75051d;
+  width: 75%;
+  margin: 0;
+  background-color: #f2f0ff;
 }
 
-div#right div#content{
-	right: 0px;
-	width: 100%;
+div#right div.columnHead {
+  font-weight: bold;
+  background-color: #75051d;
 }
 
 div#right div.columnContent{
-	padding-left: 0.3em;
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 16px;
-	color: #4a4a4a;
-	font-size:0.8em;
+  right: 0;
+  width: 100%;
 }
+
 div#right div.columnHead .contenttitle {
-	float: left;
-	line-height: 30px;
-	padding-left: 1em;
+  float: left;
+  line-height: 30px;
+  padding: 0 1em;
 }
 
 div#right div.columnHead .contenttitle h1 {
@@ -409,27 +418,28 @@ div#right div.columnHead .contenttitle h1 {
   color: inherit;
 }
 
+/*
 div#right div.columnHead #contentlanguagewidget{
 	float: right;
 	line-height: 30px;
 	padding-right: 1em;
 }
+*/
 
 div#right div.columnHead #contentviewmenu{
-	float: right;
-	line-height: 30px;
-	padding-right: 2em;
-	padding-top: 0.3em;
+  float: right;
+  padding: 0 1em;
+  line-height: 30px;
 }
 
 div#right div.columnHead #contentviewmenu a {
-  font-size: 0;
+  color:white;
 }
 
 span#contenttype {
-	float: left;
-	line-height: 30px;
-	padding-left: 1em;
+  float: left;
+  line-height: 30px;
+  padding: 0 1em;
 }
 
 span#workflowwidget {
@@ -440,94 +450,94 @@ span#workflowwidget {
 
 
 a, a:visited {
-	text-decoration: none;
-	color: #24718b;
+  text-decoration: none;
+  color: #24718b;
 }
 
 a:hover {
-	text-decoration: none;
-	color: #a75b3b;
+  text-decoration: none;
+  color: #a75b3b;
 }
 
 a img { 
-	border:none;
-}
-
-div#cmsHeader .logo a img { 
-	border:none;
-	width: 280px;
-	height: 120px;
-	float: left;
+  border:none;
 }
 
 ul {
-	list-style: none;
-	display: inline;
-	margin: 0em;
-	padding: 0em;
+  list-style: none;
+  d isplay: inline;
+  m argin: 0em;
+  p adding: 0em;
 }
 
 ul ul li{
-	margin-left: 2.3em;
+  margin-left: 2.3em;
 }
 
 table { 
-	width: auto;
-	border-bottom: 1px solid #999999;
-	border-collapse: collapse;
-	border: none !important;
+  width: 100%;
+  border-bottom: 1px solid #999999;
+  border-collapse: collapse;
+  border: none !important;
 }
- table #dataTable{
-	margin-top:20px;
+
+table.dataTable{
+  width: 100%;
 }
+
 table * table ,form table {
-	margin: 0;
+  border-style: none;
+  width: auto;
+  margin: 0;
 }
 
 table thead tr th { 
-    padding-left: 0.9em;
-	color: #999999;
-	font-size: 0.9em;
-	text-align: left;
-	background-color: #eeeeee;
-	border: 1px solid #f2f0ff;
+  padding-left: 0.9em;
+  color: #999999;
+  text-align: left;
+  background-color: #eeeeee;
+  border: 1px solid #f2f0ff;
 }
 
-
 table tbody tr:nth-child(2n) {
-	background-color: inherit;
+  background-color: inherit;
 }
 
 table tbody tr td { 
-    font-size: 0.9em;
-	padding-left: 0.9em;
-    text-align: left;
-    vertical-align: middle;
-    border: none !important;
+  text-align: left;
+  vertical-align: middle;
+  border: none !important;
 }
 
 table tbody tr td + td{ 
-	text-align: left;
+  text-align: left;
+}
+
+table .bebopTableRow:hover,
+table .bebopTableRowOdd:hover,
+table .bebopTableRowEven:hover,
+div.cmsSortableList > ul li:hover {
+  background-color: rgba(117, 5, 29, 0.05) !important;
 }
 
 pre {
-    white-space: pre-wrap;
-    white-space: -moz-pre-wrap;
-    white-space: -pre-wrap;
-    white-space: -o-pre-wrap;
-    word-wrap: break-word;
+  white-space: pre-wrap;
+  white-space: -moz-pre-wrap;
+  white-space: -pre-wrap;
+  white-space: -o-pre-wrap;
+  word-wrap: break-word;
 }
 
 table tr.bebopTableRowEven {
-	background-color: #f3f3f3 !important;
+  background-color: #f3f3f3 !important;
 }
 
 table * a.checkBoxChecked img, table * a.checkBoxUnchecked img {
-	border: 0px none #ffffff;
+  border: 0px none #ffffff;
 }
 
 table + form {
-	margin-top: 1em;
+  margin-top: 1em;
 }
 
 div.endFloat {
@@ -567,179 +577,165 @@ textarea, select{
 	border: none;
 	padding: 0.2em;
 	box-shadow: inset 0 0 3px rgba(74,74,74,0.5);
-
 }
 
 
 input{
-	vertical-align: baseline;
-	margin-left: 0.4em;
-	background-color: #fbfbfb; 
-	-moz-border-radius:3px;
-	-webkit-border-radius:3px;
-	border-radius: 3px;
-	border: 1px solid #4a4a4a;
-	height:17.2px;
-	border: none;
-	padding: 0.2em;
-	box-shadow: inset 0 0 3px rgba(74,74,74,0.5);
+  margin-left: 0.4em;
+  border: none;
+  border-radius: 3px;
+  -o-border-radius:3px;
+  -ie-border-radius:3px;
+  -moz-border-radius:3px;
+  -webkit-border-radius:3px;
+  padding: 0.2em;
+  vertical-align: baseline;
+  background-color: #fbfbfb; 
+  height:17.2px;
+  box-shadow: inset 0 0 3px rgba(74,74,74,0.5);
 }
 
 input:hover, input:focus, textarea:hover, textarea:focus {
-	box-shadow: inset 0 0 3px rgba(117,5,29,0.5);
+  box-shadow: inset 0 0 3px rgba(117,5,29,0.5);
 }
 
 span.heading {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 span.key {
-	font-weight: bold;
-}
-div.actionGroupAction span.action.add{
-	font-size: 0.9em;
-}
-div.actionGroupAction span.action{
-	font-size:0.9em;
-	/*float: left;*/
+  font-weight: bold;
 }
+
 div.actionLink {  
-	margin-bottom: 1em;
-	margin-top: 1em;
+  margin-bottom: 1em;
+  margin-top: 1em;
 }
 
 div.actionLink span {
-	background-color: #75051d;
-	border-radius: 0.3em;
-	padding: 0.5em;
-	margin-right: 1.5em;
-	padding-right: 0.5em;
-	box-shadow: inset 5px 5px 10px rgba(255,255,255,0.3),inset -5px -5px
-	10px rgba(0,0,0,0.3);
+  margin-right: 1.5em;
+  border-radius: 0.3em;
+  padding: 0.3em 2em;
+  background-color: #75051d;
+  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;
-	font-size:10pt;
+  color:#ffffff;
 }
 
 div.actionLink span:hover {
-	background-color: #cc0033 ;
+  background-color: #cc0033 ;
 }
+
 div.actionLink span:active {
-	box-shadow: inset -5px -5px 10px rgba(255,255,255,0.3),inset 5px 5px
-	10px rgba(0,0,0,0.3);
+  box-shadow: inset -5px -5px 10px rgba(255,255,255,0.3),inset 5px 5px 10px rgba(0,0,0,0.3);
 }
 ul.bebopList {
-	list-style-type: none;
-	font-size: 0.8em;
+  list-style-type: none;
 }
 
 /* special layout for folder-browse */
 #folder-browse table.dataTable {
-	width: 100%;
-	border-top: 1px solid #999999;
-	border-bottom: 1px solid #999999;
-	border-collapse: collapse;
+  width: 100%;
+  border-top: 1px solid #999999;
+  border-bottom: 1px solid #999999;
+  border-collapse: collapse;
 }
 
-
 #folder-browse table.dataTable thead tr th { 
-	text-align: left;
-	color:#633e69;
+  text-align: left;
+  color:#633e69;
 }
 
-
 #folder-browse table.dataTable thead tr th + th + th + th + th { 
-	text-align: center;
+  text-align: center;
 }
 
 #folder-browse table.dataTable tbody tr td { 
-	text-align: left;
- }
-
-#folder-browse table.dataTable tbody tr td + td + td + td + td { 
-	text-align: center;
+  text-align: left;
 }
 
-div#bebopCurrentPane table.dataTable tbody tr:hover{
- 	#background-color: #fe9292; 
- 	background-color: #ffe0e0; 
+#folder-browse table.dataTable tbody tr td + td + td + td + td { 
+  text-align: center;
+}
+
+div#bebopCurrentPane table.dataTable tbody tr:hover{ 
+  background-color: #ffe0e0; 
 }
 
 /* special layout for folder-permissions */
 #folder-permissions table.dataTable thead tr th {
-	width: 15em;
+  width: 15em;
 }
 
 #folder-permissions table.dataTable thead tr th + th {
-	width: auto;
-	padding-left: 0.4em;
-	padding-right: 0.4em;
+  width: auto;
+  padding-left: 0.4em;
+  padding-right: 0.4em;
 }
 
 #folder-permissions table.dataTable tbody tr td + td { 
-	text-align: center;
+  text-align: center;
 }
 
 /* SortButtons */
 span.sortButtons {
-	float: left;
-	margin-right: 3px;
-	width: 20px;
+  float: left;
+  margin-right: 3px;
+  width: 20px;
 }
 
 span.sortButtons span a {
-	border: 0px none #ffffff;
+  border: 0px none #ffffff;
 }
 
 span.sortButtons span a img {
-	border: 0px none #ffffff;
+  border: 0px none #ffffff;
 }
 
 /*----Fieldset Legend----*/
 div#search{
-	width: 100%;
-	margin-top: 15px;
-	position: relative;
+  width: 100%;
+  margin-top: 15px;
+  position: relative;
 }
 
 div .terms{
-	margin: 0;
-	margin-top: 10px;
+  margin: 0;
+  margin-top: 10px;
 }
 
 div .query{
-	margin-top: 10px;
-	font-size: 0.9em;
+  margin-top: 10px;
 }
 
 div#search fieldset {
-	margin-top: 25px; 
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	padding: 15px 0 0 0;	
-
+  margin-top: 25px; 
+  -o-border-radius:5px;
+  -ie-border-radius:5px;
+  -moz-border-radius:5px;
+  -webkit-border-radius:5px;
+  border-radius:5px;
+  padding: 15px 0 0 0;
 }
 
 div#search fieldset legend{
-	margin: 0 0 0 -5px;
-	padding: 5px 10px;
-	color: #FFF;
-	font-weight: blod;
-	font-size: 12px;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	background: #1c1b1d;
-	background: -moz-linear-gradient(top, #1c1b1d, #404041);
-	background: -webkit-linear-gradient(top, #1c1b1d, #404041);
-	background: -o-linear-gradient(top, #1c1b1d, #404041);
-	background: linear-gradient(top, #1c1b1d, #404041);
-	-moz-box-shadow:1px 1px 2px #ccc;
-	-webkit-box-shadow:1px 1px 2px #ccc;
-	box-shadow:1px 1px 2px #ccc;
+  margin: 0 0 0 -5px;
+  padding: 5px 10px;
+  color: #FFF;
+  font-weight: blod;
+  -moz-border-radius:5px;
+  -webkit-border-radius:5px;
+  border-radius:5px;
+  background: #1c1b1d;
+  background: -moz-linear-gradient(top, #1c1b1d, #404041);
+  background: -webkit-linear-gradient(top, #1c1b1d, #404041);
+  background: -o-linear-gradient(top, #1c1b1d, #404041);
+  background: linear-gradient(top, #1c1b1d, #404041);
+  -moz-box-shadow:1px 1px 2px #ccc;
+  -webkit-box-shadow:1px 1px 2px #ccc;
+  box-shadow:1px 1px 2px #ccc;
 }
 
 div#search .terms {
@@ -747,7 +743,6 @@ div#search .terms {
 }
 
 div#search .filterName {
-	font-size: 0.9em;
 	text-align: left; 
 	vertical-align: top; 
 	font-weight: bold; 
@@ -756,7 +751,6 @@ div#search .filterName {
 }
 
 div#search .filterParam {
-    font-size: 0.9em;
 	display: table-cell; 
 	padding-bottom: 1.2em;
 	padding-top:0.5em;
@@ -770,56 +764,68 @@ div#search .filterParam >select{
 }
 
 /* CMS GlobalNavigation */
-div#cmsHeader .cmsGlobalNavigation {
-	float: right;
-	padding-top: 1em;
-}
-
-div#cmsHeader .cmsGlobalNavigation a{
-	color: #ffffff;
+div#cmsHeader .cmsGlobalNavigation a {
+  color: #ffffff;
 }
 
 div.cmsGlobalNavigation > span {
-	padding-left: 1em;
+  padding-left: 1em;
 }
-span.bebopTop:before {
-	content:url('../../../images/cms/dokumente.png');
-	padding-right: 0.3em;
-	vertical-align: sub;
+
+div.cmsGlobalNavigation > span :before {
+  position:relative;
+  top: 0.4em;
+  padding-right: 0.3em;
 }
+
 span.cmsGlobalNavigationContentCenter :before {
-	content:url('../../../images/cms/contentcenter.png');
-	padding-right: 0.3em;
-	vertical-align: sub;
+  content:url('../../../images/cms/contentcenter.png');
 }
 
 span.cmsGlobalNavigationWorkspace :before {
-	content:url('../../../images/cms/home.png');
-	padding-right: 0.3em;
-	vertical-align: sub;
+  content:url('../../../images/cms/home.png');
 }
 
 span.cmsGlobalNavigationSignOut :before {
-	content:url('../../../images/cms/lock.png');
-	padding-right: 0.3em;
-	vertical-align: sub;
+  content:url('../../../images/cms/lock.png');
 }
 
 span.cmsGlobalNavigationHelp :before {
-	content:url('../../../images/cms/help.png');
-	padding-right: 0.3em;
-	vertical-align: sub;
+  content:url('../../../images/cms/help.png');
 }
 
 span.cmsPreview :before {
-	content:url('../../../images/cms/preview.png');
-	padding-right: 0.3em;
-	vertical-align: sub;
-  
+  content:url('../../../images/cms/preview.png');
 }
 
 
 /* Segments, Layouts, Panels */
+div#right div.bebopLayoutPanel {
+  position: relative;
+  overflow:visible;
+}
+
+div#right div.bebopLayoutPanel div.bebopLeft {
+  position: relative;
+  float: left;
+  width: 22%;
+}
+
+div#right div.bebopLayoutPanel div.bebopBody {
+  right: 0;
+  width: 73%;
+  overflow: visible;
+}
+
+div#right div.bebopLayoutPanel:after {
+  content: " ";
+  font-size: 1px;
+  color: transparent;
+  clear: left;
+  float: none;
+  width: 100%;
+}
+
 div.bebopLeft {
 	position: absolute;
 	float: left;
@@ -828,23 +834,15 @@ div.bebopLeft {
 	padding: 0em 1em;
 }
 
-div.bebopSegmentedPanel {
-	/*font-size: 1.2em;
-	margin-left: 10px;*/
-}
-
 div.bebopSegment { 
-	margin-bottom:1em;
-	padding-bottom:0.5em;
-	border-bottom:1px dotted #666666;
-
+  margin-bottom:1em;
+  padding-bottom:0.5em;
+  border-bottom:1px solid rgba(102, 102, 102, 0.5);
 }
 
 div.bebopLeft div.bebopPanelRow { 
-	/*padding:0.5em;*/
-	width:100%;
+  width:100%;
 }
-/*edit pardis*/
 
 div.bebopPanelRow { 
 	margin-bottom:1em;
@@ -856,8 +854,6 @@ div.bebopPanelRow table tr td {
 
 div.bebopPanelRow textarea{
 	width:100%;
-	background-color:#ffffff;
-	border:2px solid #cacaca
 }
 
 div.bebopSegment div.bebopSegmentHeader { 
@@ -871,26 +867,26 @@ div.bebopSegmentBody ul li ul li{
 	padding-left:.5em;
 	
 }
-div.bebopBody {
-	top: 30px;
-	bottom: 29px;
-	overflow: auto;
-	position: absolute;
-	padding: 0em 1em;
-	background-color: #f2f0ff; 
-	width: 97%;
+
+div#right div.bebopBody {
+  top: 0;
+  bottom: 0;
+  overflow: auto;
+  position: absolute;
+  padding: 0em 1em;
+  background-color: #f2f0ff; 
 }
+
 div.bebopBody table tr{
-	text-align:left;
+  text-align:left;
 }
 
 div.bebopBody div.bebopPanelRow {
-	width:98%;
+  width:99%;
 } 
 
 div.bebopBody form #search span {
-	display: inline;
-
+  display: inline;
 }
 
 /*Formatierung für die Suche in Content Section*/
@@ -911,9 +907,8 @@ div .bebopBody ul li{
 }
 
 h3.bebopSegmentHeader{ 
-	margin-bottom:0em;
-	margin-top: 15px;
-	font-size: 1em;
+  mar gin-bottom:0em;
+  margin-top: 15px;
 }
 
 h3 {
@@ -923,10 +918,20 @@ h3 {
   padding: 0em;
   page-break-after: avoid;
 }
+
 /* BebopTree */
 ul.bebopTree {
-	padding: 0em;
-	font-size:0.9em;
+  padding: 0 0 1em 1.5em;
+}
+
+ul.bebopTree  a img {
+  margin-left: -2em;
+  vertical-align: bottom;
+}
+
+ul.bebopTree  a + a,
+ul.bebopTree  a + span {
+  margin-left: -1em;
 }
 
 div.bebopColumnPanel{
@@ -934,7 +939,7 @@ div.bebopColumnPanel{
 }
 
 ul.bebopTree * ul {
-	padding-left: 1em;
+  margin-left: -1em;
 }
 
 /* Bebop CurrentPane*/
@@ -988,10 +993,6 @@ div.cmsSortableList > ul {
 	list-style: none;
 }
 
-div.cmsSortableList > ul li:hover:nth-child(n) {
-	background-color: #fe9292;
-}
-
 div.cmsSortableList > ul li:nth-child(2n+1)
 {
 	background-color:#eeeeee;
@@ -999,50 +1000,44 @@ div.cmsSortableList > ul li:nth-child(2n+1)
 
 /* CMS Summary Section */
 div.cmsSummarySection { 
-	margin: 25px 0 0 10px;
-	padding: 1px;
+  padding: 0 1em;
 }
 
 div.cmsSummarySection div.cmsSummaryHeading { 
-	font-size:1.1em;
-	font-weight:bold;
-	margin-bottom:0.3em;
-}
-
-div.cmsSummarySection {
-
+  font-weight: bold;
+  margin-bottom:0.3em;
 }
 
 div.cmsSummarySection .cmsSummaryHeading {
-	color: #75051d;
+  color: #75051d;
 }
 
 div.cmsSummaryBody {  
-	margin-bottom:0.7em;
-	padding-bottom:0.3em;
-	border-bottom:1px dotted #666666;
-	font-family: Verdana, Helvetica, Arial, sans-serif;
+  margin-bottom:0.7em;
+  padding-bottom:0.3em;
+  border-bottom: 1px solid rgba(102, 102, 102, 0.5);
 }
-div.cmsSummarySection div.cmsSummaryBody span{
-	float: left;
+
+div.cmsSummarySection ul {
+  text-indent: -2.5em;
 }
+
 span.cmsCurrentRevision {
-	font-style:italic;
-	font-weight:bold;
+  font-style:italic;
+  font-weight:bold;
 }
 
 span.cmsInitialRevision {
-	color:#666666;
-	font-style:italic;
+  color:#666666;
+  font-style:italic;
 }
 
 span.cmsTaskComment {
-	margin-left:3em;
-	font-size:80%;
+  margin-left:3em;
 }
 
 span.cmsTaskCommentCredentials {
-	font-style:italic;
+  font-style:italic;
 }
 
 /* CMS Notes */
@@ -1102,7 +1097,7 @@ table.AlternateTable th + th, table.AlternateTable td + td {
 }
 /*edit pardis*/
 div.bebopBody div.bebopSegment h3.bebopSegmentHeader {
-	font-size: 1.2em;
+	padding-bottom: 0.5em;
 }
 #Go{
 	background-color:#ffffff;
@@ -1145,57 +1140,66 @@ div.bebopBody div.bebopSegment h3.bebopSegmentHeader {
 .tile div + div {
 	height: auto;
 }
-div#cmsFooter{
-	bottom: 0px;
-	top: auto;
-	width: 100%;
-	height: 25px;
-	padding: 0.2em;
-	color: #a4a4a4;
-	font-size: 0.8em;
-	position: absolute;
-	background-color: #1c1b1d;
+
+img.cmsImageDisplay {
+  float: left;
+  max-height: 200px;
+  width: auto;
 }
 
-div#cmsFooter .scicms {
-	float: left;
-	margin: 0.7em 4em;
-	color: #a4a4a4;
-	font-size: 9pt;
-	font-weight: bold;
+div.cmsImageInfoOverlay {
+  float: left;
+  margin-left: 2em;
 }
-div#cmsFooter .scicms a {
-	color: inherit;
+
+div#cmsFooter{
+  position: absolute;
+  top: auto;
+  bottom: 0px;
+  width: 100%;
+  height: 30px;
+  color: #a4a4a4;
+  background-color: #1c1b1d;
+  font-size: 0.8em;
 }
-div#cmsFooter .scicms a:hover {
-	color: #ffffff;
+
+div#cmsFooter .systemInformation {
+  float: left;
+  width: 25%;
+  color: #a4a4a4;
+  line-height: 30px;
+  font-weight: bold;
+  vertical-align: 30px;
 }
-div#cmsFooter .scicmsVersion {
-	font-size: 7pt;
-	font-weight: normal;
+
+div#cmsFooter .systemInformation a {
+  color: inherit;
+}
+div#cmsFooter .systemInformation a:hover {
+  color: #ffffff;
+}
+div#cmsFooter .systemInformation .version {
+  font-weight: normal;
 }
 
 div#cmsFooter .cmsGlobalNavigation{
-	float: left;
-	margin: 0.5em 4em 0.7em 10em;
-	color: #a4a4a4;
-	font-size: 9pt;  
-	font-weight: bold;
+  float: left;
+  line-height: 30px;
+  font-weight: bold;
 }
 
 div#cmsFooter .cmsGlobalNavigation span:hover {
-	color: #ffffff;
+  color: #ffffff;
 }
 
 div#cmsFooter .cmsGlobalNavigation span a {
-	color: inherit;
+  color: inherit;
 }
 
 div#cmsFooter .cmsGlobalNavigation + .cmsGlobalNavigation {
-	float: right;
+  float: right;
 }
 div.columnContent div.navbar{
-	font-size: 0.9em;
 	padding: 1em 1em;
 }
 div.bebopPanelRow span.optionGroup {
@@ -1225,6 +1229,7 @@ input#draft_search:active {
 	box-shadow: inset -5px -5px 10px rgba(255,255,255,0.3),inset 5px 5px
 	10px rgba(0,0,0,0.3);
 }
+
 /*----------------------------------------*/
 	/*Zeile aus dem basic.css*/
 /*----------------------------------------*/
@@ -1271,32 +1276,44 @@ a:focus, a:hover, a:active {
 #content {
 	min-height: 40em;
 	color: #4a4a4a;
-	font-size: 0.75em;
 	line-height: 1.5em;
 }
+
 /*momentan für die Inhalt von Content*/
 #content br{
 	margin-top: 10px;
 }
-div#cmsContent #content form input,
-div#cmsContent #content form select {
-	float: none;
-	padding: 0.2em;
+
+#content form {
+  background-color: transparent;
+  text-align: left;
 }
 
-div#cmsContent #content form select {
-	padding: 0.1em;
-	min-width: 11.4em;
+#content form input,
+#content form select {
+  float: none;
+  border: none;
+  padding: 0.2em;
 }
 
-div#cmsContent #content form input[type="submit"] {
-   margin-left: 1em;
-   border: none;
-   color: #ffffff;
-   background-color: #75051d;
-   height: 28px;
-   box-shadow: inset 5px 5px 10px rgba(255,255,255,0.3),inset -5px -5px
-   10px rgba(0,0,0,0.3);
+#content form select {
+  padding: 0.25em;
+  min-width: 11.4em;
+}
+
+#content textarea {
+  padding: 0.25em;
+}
+
+#content form input[type="submit"] {
+  margin-left: 1em;
+  border: none;
+  padding: 0 2em;
+  color: #ffffff;
+  background-color: #75051d;
+  height: 1.8em;
+  box-shadow: inset 5px 5px 10px rgba(255,255,255,0.3),inset -5px -5px
+  10px rgba(0,0,0,0.3);
 }
 
 input#file_upload{
@@ -1308,11 +1325,11 @@ input#file_upload{
    box-shadow: inset 5px 5px 10px rgba(255,255,255,0.3),inset -5px -5px
    10px rgba(0,0,0,0.3);
 }
-div#cmsContent #content form input[type="submit"]:hover {
+#content form input[type="submit"]:hover {
 	background-color: #cc0033 ;
 }
 
-div#cmsContent #content form input[type="submit"]:active {
+#content form input[type="submit"]:active {
 	box-shadow: inset -5px -5px 10px rgba(255,255,255,0.3),inset 5px 5px
 	10px rgba(0,0,0,0.3);
 }
@@ -1331,3 +1348,15 @@ div.bebopBody table{
 	margin-top: 15px;
 }
 
+a#preview_link:hover{
+	color: white;
+}
+
+a#preview_link:visited{
+	color: white;
+	border: none; 
+}
+
+div.bebopGridPanel{
+	margin-top: 15px;
+}
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 6b2d6f507..daebbebaa 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
@@ -41,6 +41,7 @@
 * {
   margin: 0em;
   padding: 0em;
+  word-wrap: break-word;
 }
 
 html {
@@ -52,6 +53,17 @@ body {
   font-family: Verdana, Helvetica, Arial, sans-serif;
   color: #4a4a4a;
   background-color: #ffffff;
+  text-align: justify;
+  hyphens: auto;
+  -o-hyphens: auto;
+  -ie-hyphens: auto;
+  -moz-hyphens: auto;
+  -webkit-hyphens: auto;
+}
+
+.contentWidth {
+  width: 1000px !important;
+  margin: 0 auto !important;
 }
 
 #pageWrap {
@@ -143,26 +155,12 @@ p + p {
   margin-top: 1em;
 }
 
-/* Tabellen */
-table {
-}
-
-th {
-}
-
-td {
-}
 
 /* Listen-Elemente */
 #content ul,
 #content ol {
   margin: 1em 0em;
   margin-left: 2.5em ;
-/*  color: #75051d !important; */
-}
-
-#content li {
-/*  color: #75051d; */
 }
 
 #itemList ul,
@@ -1008,6 +1006,7 @@ div.endFloat {
 
 /*--------Images in CT---------------*/
 #content div.image {
+  position: relative;
   float: right;
   margin: 2em 1em 0.75em 1.25em;
 }
@@ -1039,7 +1038,6 @@ div.image.right {
   float: right !important;
 }
 
-
 /*-------CT NewsItem--------*/
 
 #content #newsDate {
@@ -1100,12 +1098,14 @@ div.image.right {
 
 /*-------Key / Value------------------*/
 .key {
+  display: table-cell;
   width: 12em;
   padding-right: 0.8em;
   font-weight: bold;
 }
 
 .value {
+  display: table-cell;
   font-weight: normal;
 }
 
@@ -1369,8 +1369,8 @@ margin-top: 1em;
 }
 
 #content form.multiline input[type="submit"] {
-clear: both;
-margin-left : 12.7em;
+  clear: both;
+  margin-left : 12.7em;
 }
 
 /*---Profile-----*/
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLabel.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLabel.xsl
index 558c0e3c5..9b72eb626 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLabel.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLabel.xsl
@@ -126,7 +126,7 @@
   <!-- DE Ein Text-Label -->
   <!-- EN A text label -->
   <xsl:template match="bebop:label">
-      <xsl:call-template name="mandalay:bebopLabelText">
+    <xsl:call-template name="mandalay:bebopLabelText">
       <xsl:with-param name="text">
         <xsl:value-of select="."/>
       </xsl:with-param>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopTabbedPane.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopTabbedPane.xsl
index e2943c210..ebc1048d6 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopTabbedPane.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopTabbedPane.xsl
@@ -45,6 +45,9 @@
     <xsl:param name="layoutTree" select="."/>
     
     <div id="bebopTabbedPane">
+      <xsl:call-template name="mandalay:setIdAndClass">
+        <xsl:with-param name="currentLayoutNode" select="$layoutTree"/>
+      </xsl:call-template>
       <xsl:apply-templates select="bebop:tabStrip">
         <xsl:with-param name="setTabPaneMode">
           <!-- DE Hole alle benötigten Einstellungen-->
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsImageDisplay.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsImageDisplay.xsl
index fdd7ea4d6..9a84a4e95 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsImageDisplay.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsImageDisplay.xsl
@@ -79,12 +79,12 @@
       <xsl:if test="@width">
         <xsl:attribute name="width">
           <xsl:value-of select="@width"/>
-        </xsl:attribute>              
+        </xsl:attribute>
       </xsl:if>
       <xsl:if test="@height">
         <xsl:attribute name="height">
           <xsl:value-of select="@height"/>
-        </xsl:attribute>              
+        </xsl:attribute>
       </xsl:if>
       <div class="cmsImageInfoOverlay">
         <xsl:if test="$setImageName = 'true'">
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsSummary.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsSummary.xsl
index 64851d3ed..8a8142d03 100644
--- a/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsSummary.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/cms/cmsSummary.xsl
@@ -49,40 +49,52 @@
           <xsl:with-param name="id" select="'summary/itemSummary/header'"/>
         </xsl:call-template>
       </h3>
-      <div class="cmsSummaryBody">
-        <span class="key">
-          <xsl:call-template name="mandalay:getStaticText">
-            <xsl:with-param name="module" select="'cms'"/>
-            <xsl:with-param name="id" select="'summary/itemSummary/type'"/>
-          </xsl:call-template>
-        </span>
-        <xsl:value-of select="@objectType"/>
-        <br />
-        <span class="key">
-          <xsl:call-template name="mandalay:getStaticText">
-            <xsl:with-param name="module" select="'cms'"/>
-            <xsl:with-param name="id" select="'summary/itemSummary/name'"/>
-          </xsl:call-template>
-        </span>
-        <xsl:value-of select="@name"/>
-        <br />
-        <span class="key">
-          <xsl:call-template name="mandalay:getStaticText">
-            <xsl:with-param name="module" select="'cms'"/>
-            <xsl:with-param name="id" select="'summary/itemSummary/title'"/>
-          </xsl:call-template>
-        </span>
-        <xsl:value-of select="@title"/>
-        <br />
-        <xsl:apply-templates select="cms:subjectCategories"/>            
-        <span class="key">
-          <xsl:call-template name="mandalay:getStaticText">
-            <xsl:with-param name="module" select="'cms'"/>
-            <xsl:with-param name="id" select="'summary/itemSummary/description'"/>
-          </xsl:call-template>
-        </span>
-        <xsl:value-of disable-output-escaping="yes" select="@description"/>
-        <br />
+      <div class="cmsSummaryBody table">
+        <div class="tableRow">
+          <span class="key">
+            <xsl:call-template name="mandalay:getStaticText">
+              <xsl:with-param name="module" select="'cms'"/>
+              <xsl:with-param name="id" select="'summary/itemSummary/type'"/>
+            </xsl:call-template>
+          </span>
+          <span class="value">
+            <xsl:value-of select="@objectType"/>
+          </span>
+        </div>
+        <div class="tableRow">
+          <span class="key">
+            <xsl:call-template name="mandalay:getStaticText">
+              <xsl:with-param name="module" select="'cms'"/>
+              <xsl:with-param name="id" select="'summary/itemSummary/name'"/>
+            </xsl:call-template>
+          </span>
+          <span class="value">
+            <xsl:value-of select="@name"/>
+          </span>
+        </div>
+        <div class="tableRow">
+          <span class="key">
+            <xsl:call-template name="mandalay:getStaticText">
+              <xsl:with-param name="module" select="'cms'"/>
+              <xsl:with-param name="id" select="'summary/itemSummary/title'"/>
+            </xsl:call-template>
+          </span>
+          <span class="value">
+            <xsl:value-of select="@title"/>
+          </span>
+        </div>
+        <xsl:apply-templates select="cms:subjectCategories"/>
+        <div class="tableRow">
+          <span class="key">
+            <xsl:call-template name="mandalay:getStaticText">
+              <xsl:with-param name="module" select="'cms'"/>
+              <xsl:with-param name="id" select="'summary/itemSummary/description'"/>
+            </xsl:call-template>
+          </span>
+          <span class="value">
+            <xsl:value-of disable-output-escaping="yes" select="@description"/>
+          </span>
+        </div>
       </div>
     </div>
   </xsl:template>
@@ -90,23 +102,27 @@
   <!-- DE Zeigt die subjectCategories an -->
   <!-- EN show subject categories -->
   <xsl:template match="cms:subjectCategories">
-    <span class="key">
-      <xsl:call-template name="mandalay:getStaticText">
-        <xsl:with-param name="module" select="'cms'"/>
-        <xsl:with-param name="id" select="'summary/itemSummary/subjectCategories'"/>
-      </xsl:call-template>
-    </span>
-    <xsl:apply-templates/>
-    <br />
+    <div class="tableRow">
+      <span class="key">
+        <xsl:call-template name="mandalay:getStaticText">
+          <xsl:with-param name="module" select="'cms'"/>
+          <xsl:with-param name="id" select="'summary/itemSummary/subjectCategories'"/>
+        </xsl:call-template>
+      </span>
+      <span class="value">
+        <xsl:apply-templates/>
+      </span>
+    </div>
   </xsl:template>
   
   <!-- DE Zeigt eine subjectCategory an -->
   <!-- EN Shows a subject category -->
   <xsl:template match="cms:subjectCategory">
-    <xsl:value-of  disable-output-escaping="yes" select="."/>
-    <xsl:if test="position() != last()">
-      <br />
-    </xsl:if>
+    <ul>
+      <li>
+        <xsl:value-of disable-output-escaping="yes" select="."/>
+      </li>
+    </ul>
   </xsl:template>
   
   <!-- DE Zeigt die Kategorien an-->
@@ -132,8 +148,11 @@
   <!-- EN cms:category is using to different syntax. The other one is located
           in cmsCategoryStep. -->
   <xsl:template match="cms:category" mode="summary">
-    <xsl:value-of  disable-output-escaping="yes" select="."/>
-    <br />
+    <ul class="categoryList">
+      <li>
+        <xsl:value-of disable-output-escaping="yes" select="."/>
+      </li>
+    </ul>
   </xsl:template>
   
   <!-- DE Zeigt den stabilen Link an-->
@@ -164,7 +183,7 @@
           <xsl:with-param name="id" select="'summary/lifecycle/header'"/>
         </xsl:call-template>
       </h3>
-      <div class="cmsSummaryBody">
+      <div class="cmsSummaryBody table">
         <xsl:choose>
           <xsl:when test="@noLifecycle">
             <span class="noInfo">
@@ -175,57 +194,61 @@
             </span>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:value-of select="@name"/>
-            <xsl:choose>
-              <xsl:when test="@hasBegun='false'">
-                <xsl:call-template name="mandalay:getStaticText">
-                  <xsl:with-param name="module" select="'cms'"/>
-                  <xsl:with-param name="id" select="'summary/lifecycle/itemNotYetPublished/startText'"/>
-                </xsl:call-template>
-                <xsl:value-of select="@startDate"/>
-                <xsl:call-template name="mandalay:getStaticText">
-                  <xsl:with-param name="module" select="'cms'"/>
-                  <xsl:with-param name="id" select="'summary/lifecycle/itemNotYetPublished/middleText'"/>
-                </xsl:call-template>
-                <xsl:value-of select="@endDateString"/>
-                <xsl:call-template name="mandalay:getStaticText">
-                  <xsl:with-param name="module" select="'cms'"/>
-                  <xsl:with-param name="id" select="'summary/lifecycle/itemNotYetPublished/endText'"/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="@hasEnded='true'">
-                <xsl:call-template name="mandalay:getStaticText">
-                  <xsl:with-param name="module" select="'cms'"/>
-                  <xsl:with-param name="id" select="'summary/lifecycle/itemAlreadyEnded/startText'"/>
-                </xsl:call-template>
-                <xsl:value-of select="@startDate"/> 
-                <xsl:call-template name="mandalay:getStaticText">
-                  <xsl:with-param name="module" select="'cms'"/>
-                  <xsl:with-param name="id" select="'summary/lifecycle/itemAlreadyEnded/middleText'"/>
-                </xsl:call-template>
-                <xsl:value-of select="@endDate"/>
-                <xsl:call-template name="mandalay:getStaticText">
-                  <xsl:with-param name="module" select="'cms'"/>
-                  <xsl:with-param name="id" select="'summary/lifecycle/itemAlreadyEnded/endText'"/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:call-template name="mandalay:getStaticText">
-                  <xsl:with-param name="module" select="'cms'"/>
-                  <xsl:with-param name="id" select="'summary/lifecycle/itemPublished/startText'"/>
-                </xsl:call-template>
-                <xsl:value-of select="@startDate"/> 
-                <xsl:call-template name="mandalay:getStaticText">
-                  <xsl:with-param name="module" select="'cms'"/>
-                  <xsl:with-param name="id" select="'summary/lifecycle/itemPublished/middleText'"/>
-                </xsl:call-template>
-                <xsl:value-of select="@endDateString"/>
-                <xsl:call-template name="mandalay:getStaticText">
-                  <xsl:with-param name="module" select="'cms'"/>
-                  <xsl:with-param name="id" select="'summary/lifecycle/itemPublished/endText'"/>
-                </xsl:call-template>
-              </xsl:otherwise>
-            </xsl:choose>
+            <span class="key">
+              <xsl:value-of select="@name"/>
+            </span>
+            <span class="value">
+              <xsl:choose>
+                <xsl:when test="@hasBegun='false'">
+                  <xsl:call-template name="mandalay:getStaticText">
+                    <xsl:with-param name="module" select="'cms'"/>
+                    <xsl:with-param name="id" select="'summary/lifecycle/itemNotYetPublished/startText'"/>
+                  </xsl:call-template>
+                  <xsl:value-of select="@startDate"/>
+                  <xsl:call-template name="mandalay:getStaticText">
+                    <xsl:with-param name="module" select="'cms'"/>
+                    <xsl:with-param name="id" select="'summary/lifecycle/itemNotYetPublished/middleText'"/>
+                  </xsl:call-template>
+                  <xsl:value-of select="@endDateString"/>
+                  <xsl:call-template name="mandalay:getStaticText">
+                    <xsl:with-param name="module" select="'cms'"/>
+                    <xsl:with-param name="id" select="'summary/lifecycle/itemNotYetPublished/endText'"/>
+                  </xsl:call-template>
+                </xsl:when>
+                <xsl:when test="@hasEnded='true'">
+                  <xsl:call-template name="mandalay:getStaticText">
+                    <xsl:with-param name="module" select="'cms'"/>
+                    <xsl:with-param name="id" select="'summary/lifecycle/itemAlreadyEnded/startText'"/>
+                  </xsl:call-template>
+                  <xsl:value-of select="@startDate"/> 
+                  <xsl:call-template name="mandalay:getStaticText">
+                    <xsl:with-param name="module" select="'cms'"/>
+                    <xsl:with-param name="id" select="'summary/lifecycle/itemAlreadyEnded/middleText'"/>
+                  </xsl:call-template>
+                  <xsl:value-of select="@endDate"/>
+                  <xsl:call-template name="mandalay:getStaticText">
+                    <xsl:with-param name="module" select="'cms'"/>
+                    <xsl:with-param name="id" select="'summary/lifecycle/itemAlreadyEnded/endText'"/>
+                  </xsl:call-template>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:call-template name="mandalay:getStaticText">
+                    <xsl:with-param name="module" select="'cms'"/>
+                    <xsl:with-param name="id" select="'summary/lifecycle/itemPublished/startText'"/>
+                  </xsl:call-template>
+                  <xsl:value-of select="@startDate"/> 
+                  <xsl:call-template name="mandalay:getStaticText">
+                    <xsl:with-param name="module" select="'cms'"/>
+                    <xsl:with-param name="id" select="'summary/lifecycle/itemPublished/middleText'"/>
+                  </xsl:call-template>
+                  <xsl:value-of select="@endDateString"/>
+                  <xsl:call-template name="mandalay:getStaticText">
+                    <xsl:with-param name="module" select="'cms'"/>
+                    <xsl:with-param name="id" select="'summary/lifecycle/itemPublished/endText'"/>
+                  </xsl:call-template>
+                </xsl:otherwise>
+              </xsl:choose>
+            </span>
           </xsl:otherwise>
         </xsl:choose>
       </div>
@@ -274,19 +297,21 @@
       </xsl:call-template>
     </xsl:variable>
     
-    <div class="cmsTask">
-      <span class="key">
+    <div class="cmsTask tableRow">
+      <span class="tableCell">
+        <span class="key">
         <xsl:value-of select="@name"/>
-      </span>  
-      <span class="status">
-        (
-        <xsl:value-of select="@state"/>
-        )
+        </span>
+        <span class="status tableCell">
+          (
+          <xsl:value-of select="@state"/>
+          )
+        </span>
       </span>
       <xsl:if test="$setComments = 'true'">
         <xsl:if test="not(cms:taskComment)">
           <xsl:if test="setNoComment = 'true'">
-            <span class="noInfo">
+            <span class="noInfo tableCell">
               <xsl:call-template name="mandalay:getStaticText">
                 <xsl:with-param name="module" select="'cms'"/>
                 <xsl:with-param name="id" select="'summary/workflow/noComment'"/>
@@ -325,25 +350,30 @@
           <xsl:with-param name="id" select="'summary/revisionSummary/header'"/>
         </xsl:call-template>
       </h3>
-      <div class="cmsSummaryBody">
-        <span class="cmsCurrentRevision">
-          <xsl:value-of select="@lastModifiedDate"/>
-          &nbsp;
-          <xsl:call-template name="mandalay:getStaticText">
-            <xsl:with-param name="module" select="'cms'"/>
-            <xsl:with-param name="id" select="'summary/revisionSummary/currentRevision'"/>
-          </xsl:call-template>
-        </span>
-        <br />
+      <div class="cmsSummaryBody table">
+        <div class="tableRow">
+          <span class="cmsCurrentRevision tableCell">
+            <xsl:value-of select="@lastModifiedDate"/>
+          </span>
+          <span class="cmsCurrentRevision tableCell">
+            <xsl:call-template name="mandalay:getStaticText">
+              <xsl:with-param name="module" select="'cms'"/>
+              <xsl:with-param name="id" select="'summary/revisionSummary/currentRevision'"/>
+            </xsl:call-template>
+          </span>
+        </div>
         <xsl:apply-templates/>
-        <span class="cmsInitialRevision">
-          <xsl:value-of select="@creationDate"/>
-          &nbsp;
-          <xsl:call-template name="mandalay:getStaticText">
-            <xsl:with-param name="module" select="'cms'"/>
-            <xsl:with-param name="id" select="'summary/revisionSummary/initialRevision'"/>
-          </xsl:call-template>
-        </span>
+        <div class="tableRow">
+          <span class="cmsInitialRevision tableCell">
+            <xsl:value-of select="@creationDate"/>
+          </span>
+          <span class="cmsInitialRevision tableCell">
+            <xsl:call-template name="mandalay:getStaticText">
+              <xsl:with-param name="module" select="'cms'"/>
+              <xsl:with-param name="id" select="'summary/revisionSummary/initialRevision'"/>
+            </xsl:call-template>
+          </span>
+        </div>
       </div>
     </div>
   </xsl:template>
@@ -351,8 +381,8 @@
   <!-- DE Zeigt Informationen über eine Transaktion an -->
   <!-- EN Shows information about transactions -->
   <xsl:template match="cms:transaction">
-    <div class="cmsTransaction">
-      <span class="cmsTransactionDate">
+    <div class="cmsTransaction tableRow">
+      <span class="cmsTransactionDate tableCell">
         <a href="/ccm{@url}">
           <xsl:attribute name="title">
             <xsl:call-template name="mandalay:getStaticText">
@@ -369,12 +399,10 @@
           <xsl:value-of select="@date"/>
         </a>
       </span>
-      &nbsp;
-      <span class="cmsTransactionAuthor">
+      <span class="cmsTransactionAuthor tableCell">
         <xsl:value-of select="@author"/>
       </span>
-      &nbsp;
-      <span class="cmsTransactionLink">
+      <span class="cmsTransactionLink tableCell">
       </span>
     </div>
   </xsl:template>
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 6b25b0fa6..01a44b17c 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,9 @@
   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"
+  xmlns:atoz="http://xmlns.redhat.com/atoz/1.0"
   exclude-result-prefixes="xsl aplaws bebop cms docs forum mandalay nav portal ppp search subsite terms ui"
   version="1.0">
 
@@ -71,35 +73,43 @@
   <!-- DE Wichtig für die CSS-Auszeichung mit id und class und für die Colorset-Funktion -->
   <!-- EN Helper function for block creating tags -->
   <!-- EN needed for css-attributes id and class and for the colorset feature -->
-  <xsl:template name="mandalay:setParameters">
+  <xsl:template name="mandalay:setIdAndClass">
+    <xsl:param name="currentLayoutNode" select="."/>
     
     <xsl:variable name="condClass">
-      <xsl:if test="@classIf">
+      <xsl:if test="$currentLayoutNode/@classIf">
         <!-- DE Funktioniert leider nicht in einer Zeile, daher die Hilfsvariable -->
-        <xsl:variable name="key" select="substring-before(@classIf, ',')"/>
+        <xsl:variable name="key" select="substring-before($currentLayoutNode/@classIf, ',')"/>
         <xsl:variable name="condition">
           <xsl:apply-templates select="//*[@id=$key]"/>
         </xsl:variable>
         
         <xsl:if test="normalize-space($condition)">
-          <xsl:value-of select="substring-after(@classIf, ', ')"/>
+          <xsl:value-of select="substring-after($currentLayoutNode/@classIf, ', ')"/>
         </xsl:if>
       </xsl:if>
     </xsl:variable>
+    
+    <xsl:variable name="typeClass">
+      <xsl:if test="$currentLayoutNode/@setTypeClass='true'">
+        <xsl:call-template name="mandalay:getContentTypeName"/>
+      </xsl:if>
+    </xsl:variable>
+    
     <xsl:variable name="colorClass">
-      <xsl:if test="@withColorset='true'">
+      <xsl:if test="$currentLayoutNode/@withColorset='true'">
         <xsl:call-template name="mandalay:getColorset"/>
       </xsl:if>
     </xsl:variable>
     
-    <xsl:if test="@id">
+    <xsl:if test="$currentLayoutNode/@id">
       <xsl:attribute name="id">
         <xsl:value-of select="@id"/>
       </xsl:attribute>
     </xsl:if>
-    <xsl:if test="@class or $condClass != '' or $colorClass != ''">
+    <xsl:if test="$currentLayoutNode/@class or $condClass != '' or $typeClass != '' or $colorClass != ''">
       <xsl:attribute name="class">
-        <xsl:value-of select="concat(@class, ' ', $condClass, ' ', $colorClass)"/>
+        <xsl:value-of select="normalize-space(concat($currentLayoutNode/@class, ' ', $condClass, ' ', $typeClass, ' ', $colorClass))"/>
       </xsl:attribute>
     </xsl:if>
   </xsl:template>
@@ -209,7 +219,7 @@
 
   <xsl:template match="body">
     <body>
-      <xsl:call-template name="mandalay:setParameters"/>
+      <xsl:call-template name="mandalay:setIdAndClass"/>
       <span id="top"/>
       <a href="#startcontent" accesskey="S" class="navHide">
         <xsl:attribute name="title">
@@ -227,14 +237,14 @@
 
   <xsl:template match="span">
     <span>
-      <xsl:call-template name="mandalay:setParameters"/>
+      <xsl:call-template name="mandalay:setIdAndClass"/>
       <xsl:apply-templates/>
     </span>
   </xsl:template>
 
   <xsl:template match="div">
     <div>
-      <xsl:call-template name="mandalay:setParameters"/>
+      <xsl:call-template name="mandalay:setIdAndClass"/>
       <xsl:apply-templates/>
     </div>
   </xsl:template>
@@ -246,7 +256,7 @@
 
     <xsl:if test="normalize-space($divContent)">
       <div>
-        <xsl:call-template name="mandalay:setParameters"/>
+        <xsl:call-template name="mandalay:setIdAndClass"/>
         <xsl:apply-templates/>
       </div>
     </xsl:if>
@@ -425,7 +435,7 @@
     <!-- DE Wenn die Liste nicht leer ist -->
     <xsl:if test="$resultTree//*[@id=$list]/*[name()!='nav:noContent']">
       <div>
-        <xsl:call-template name="mandalay:setParameters"/>
+        <xsl:call-template name="mandalay:setIdAndClass"/>
         <xsl:attribute name="id"><xsl:value-of select="$list"/></xsl:attribute>
         <xsl:apply-templates/>
       </div>
@@ -457,7 +467,7 @@
   <!-- DE Div-Container für die Suchergebnisse -->
   <xsl:template match="showSearch">
     <!--<div>-->
-      <xsl:call-template name="mandalay:setParameters"/>
+      <xsl:call-template name="mandalay:setIdAndClass"/>
       <xsl:apply-templates/>
       <!--</div>-->
   </xsl:template>
@@ -465,7 +475,7 @@
   <!-- DE Suchformular -->
   <xsl:template match="useSearchForm">
     <!--<div>-->
-      <xsl:call-template name="mandalay:setParameters"/>
+      <xsl:call-template name="mandalay:setIdAndClass"/>
       <xsl:apply-templates select="$resultTree//bebop:form">
         <xsl:with-param name="layoutTree" select="."/>
       </xsl:apply-templates>
@@ -475,7 +485,7 @@
   <!-- DE Ergebnisse der Suche -->
   <xsl:template match="useSearchResults">
     <!--<div>-->
-      <xsl:call-template name="mandalay:setParameters"/>
+      <xsl:call-template name="mandalay:setIdAndClass"/>
       <xsl:apply-templates select="$resultTree//search:results">
         <xsl:with-param name="layoutTree" select="."/>
       </xsl:apply-templates>
@@ -529,14 +539,14 @@
 
   <xsl:template match="showImage">
     <div>
-      <xsl:call-template name="mandalay:setParameters"/>
+      <xsl:call-template name="mandalay:setIdAndClass"/>
       <xsl:call-template name="mandalay:staticImage"/>
     </div>
   </xsl:template>
 
   <xsl:template match="showStaticMenu">
     <div>
-      <xsl:call-template name="mandalay:setParameters"/>
+      <xsl:call-template name="mandalay:setIdAndClass"/>
       <xsl:call-template name="mandalay:staticMenu"/>
     </div>
   </xsl:template>
@@ -545,7 +555,7 @@
     <xsl:choose>
       <xsl:when test="@id!='' or @class!='' or @withColorset='true'">
         <span>
-          <xsl:call-template name="mandalay:setParameters"/>
+          <xsl:call-template name="mandalay:setIdAndClass"/>
           <xsl:call-template name="mandalay:getStaticText">
             <xsl:with-param name="id" select="line"/>
           </xsl:call-template>
@@ -563,7 +573,7 @@
     <xsl:choose>
       <xsl:when test="@id!='' or @class!='' or @withColorset='true'">
         <span>
-          <xsl:call-template name="mandalay:setParameters"/>
+          <xsl:call-template name="mandalay:setIdAndClass"/>
           <xsl:call-template name="mandalay:staticLink"/>
         </span>
       </xsl:when>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/staticMenu.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/staticMenu.xsl
index 2ce502663..08db84c23 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/staticMenu.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/staticMenu.xsl
@@ -195,4 +195,4 @@
     </a>
   </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/de/cms.xml b/ccm-sci-bundle/web/themes/mandalay/lang/de/cms.xml
index 6baaa19b9..ddce7e485 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/de/cms.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/de/cms.xml
@@ -63,7 +63,7 @@
   <line id="summary/revisionSummary/viewRevision">Version ansehen</line>
   
   <line id="categoryStep/header">Kategorien zuweisen</line>
-  <line id="categoryStep/addCategories">Kategorien ändern</line>
+  <line id="categoryStep/addCategories">Kategoriezuweisung ändern</line>
   <line id="categoryStep/noCategories">Es sind keine Kategorien dieses Kontextes zugewiesen</line>
   <line id="categoryStep/removeCategory">Zuweisung aufheben</line>
   
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/de/global.xml b/ccm-sci-bundle/web/themes/mandalay/lang/de/global.xml
index 30d384971..96d398707 100755
--- a/ccm-sci-bundle/web/themes/mandalay/lang/de/global.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/de/global.xml
@@ -43,8 +43,4 @@
   <line id="layout/page/title/search">Suche</line>
   <line id="layout/page/title/login">Login</line>
   <line id="layout/page/title/sitemap">Sitemap</line>
-
-  <line id="scicms/version">v2.1.0</line>
-  <line id="menu/title/scicms">Zur Homepage von ScientificCMS</line>
-  <line id="menu/name/scicms">ScientificCMS </line>
 </translations>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/en/cms.xml b/ccm-sci-bundle/web/themes/mandalay/lang/en/cms.xml
index 88fa16cf9..8084dfcc2 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/en/cms.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/cms.xml
@@ -63,7 +63,7 @@
   <line id="summary/revisionSummary/viewRevision">View Revision</line>
   
   <line id="categoryStep/header">Assign Categories</line>
-  <line id="categoryStep/addCategories">Change categories</line>
+  <line id="categoryStep/addCategories">Change associated categories</line>
   <line id="categoryStep/noCategories">There are no categories assigned in this context.</line>
   <line id="categoryStep/removeCategory">Remove</line>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/en/global.xml b/ccm-sci-bundle/web/themes/mandalay/lang/en/global.xml
index ac9193adc..aabb80081 100755
--- a/ccm-sci-bundle/web/themes/mandalay/lang/en/global.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/global.xml
@@ -43,8 +43,4 @@
   <line id="layout/page/title/search">Search</line>
   <line id="layout/page/title/login">Login</line>
   <line id="layout/page/title/sitemap">Sitemap</line>
-
-  <line id="scicms/version">v2.1.0</line>
-  <line id="menu/title/scicms">Go to homepage of ScientificCMS</line>
-  <line id="menu/name/scicms">ScientificCMS </line>
 </translations>
diff --git a/ccm-sci-bundle/web/themes/mandalay/layout/content-center.xml b/ccm-sci-bundle/web/themes/mandalay/layout/content-center.xml
index b913bfdae..528bb5019 100644
--- a/ccm-sci-bundle/web/themes/mandalay/layout/content-center.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/layout/content-center.xml
@@ -31,7 +31,7 @@
     <useCSSLoader/>
   </head>
   <body id="cmsPage">
-    <div id="cmsHeader">
+    <div id="cmsHeader" class="headerHeight">
       <div class="minWidth">
         <showImage class="logo">
           <src>images/logo.png</src>
@@ -50,7 +50,7 @@
             <useLogoutLink/>
           </showCMSGlobalNavigation>
         </div>
-        <showTabbedPane/>
+        <showTabbedPane class="minWidth"/>
       </div>
     </div>
     <div id="cmsBreadcrumbs" class="minWidth">
@@ -58,51 +58,54 @@
         <separator> > </separator>
       </showBebopContextBar>
     </div>
-    <div id="cmsContent">
-      <div id="left">
-        <div class="columnHead">
-          <showContentType/>
-          <span id="workflowwidget">
-<!--
-	          Workflow Widget
--->
-          </span>
+      <div id="cmsContent" class="minWidth headerHeight">
+        <div id="left">
+          <div class="columnHead">
+            <showContentType/>
+            <span id="workflowwidget">
+  <!--
+	            Workflow Widget
+  -->
+            </span>
+          </div>
+          <div class="columnContent">
+            <showLeftColumn/>
+          </div>
         </div>
-        <div class="columnContent">
-          <showLeftColumn/>
+        <div id="right">
+          <div class="columnHead">
+            <div class="contenttitle">
+              <showBebopPageTitle/>
+            </div>
+            <div id="contentlanguagewidget">
+  <!--
+	            Sprache
+  -->
+            </div>
+            <div id="contentviewmenu">
+              <showCMSGlobalNavigation>
+                <usePreviewLink/>
+              </showCMSGlobalNavigation>
+            </div>
+          </div>
+          <div id="content" class="columnContent">
+            <showBodyColumn/>
+          </div>
         </div>
+        <div class="endFloat"/>
       </div>
-      <div id="right">
-        <div class="columnHead">
-          <div class="contenttitle">
-            <showBebopPageTitle/>
-          </div>
-          <div id="contentlanguagewidget">
-<!--
-	          Sprache
--->
-          </div>
-          <div id="contentviewmenu">
-            <showCMSGlobalNavigation>
-              <usePreviewLink/>
-            </showCMSGlobalNavigation>
-          </div>
-        </div>
-        <div id="content" class="columnContent">
-          <showBodyColumn/>
-        </div>
-      </div>
-      <div class="endFloat"/>
-    </div>
+
     <div id="cmsFooter">
-      <showSystemInformation/>
-      <showCMSGlobalNavigation>
-        <useContentCenterLink/>
-        <useWorkspaceLink/>
-      </showCMSGlobalNavigation>
-      <showCMSGlobalNavigation>
-        <useHelpLink/>
-      </showCMSGlobalNavigation>
+      <div class="minWidth">
+        <showSystemInformation/>
+        <showCMSGlobalNavigation>
+          <useContentCenterLink/>
+          <useWorkspaceLink/>
+        </showCMSGlobalNavigation>
+        <showCMSGlobalNavigation>
+          <useHelpLink/>
+        </showCMSGlobalNavigation>
+      </div>
     </div>
   </body>
 </pageLayout>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/Address.xml b/ccm-sci-bundle/web/themes/mandalay/settings/Address.xml
index 1da12a6f8..7892ad915 100755
--- a/ccm-sci-bundle/web/themes/mandalay/settings/Address.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/Address.xml
@@ -23,9 +23,9 @@
 <!--  <setting id="csspath">Address</setting> -->
 
   <setting id="setImage">true</setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
   <setting id="setLeadText">true</setting>
   <setting id="setShowKeys">false</setting>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/Article.xml b/ccm-sci-bundle/web/themes/mandalay/settings/Article.xml
index d48ed8342..6a3d2a76f 100755
--- a/ccm-sci-bundle/web/themes/mandalay/settings/Article.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/Article.xml
@@ -23,8 +23,8 @@
 <!--  <setting id="csspath">Article</setting> -->
 
   <setting id="setImage">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption">true</setting>
   <setting id="setLeadText">true</setting>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/Bookmark.xml b/ccm-sci-bundle/web/themes/mandalay/settings/Bookmark.xml
index 3ec975aa3..5d05c90c5 100755
--- a/ccm-sci-bundle/web/themes/mandalay/settings/Bookmark.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/Bookmark.xml
@@ -23,8 +23,8 @@
 <!--  <setting id="csspath">Bookmark</setting> -->
 
   <setting id="setImage">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption">true</setting>
   <setting id="setLeadText">true</setting>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/Event.xml b/ccm-sci-bundle/web/themes/mandalay/settings/Event.xml
index 1929425f1..b894f977b 100755
--- a/ccm-sci-bundle/web/themes/mandalay/settings/Event.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/Event.xml
@@ -27,8 +27,8 @@
   <setting id="setDateFormat">S</setting>
 
   <setting id="setImage">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption">true</setting>
   <setting id="setLeadText">true</setting>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/FAQItem.xml b/ccm-sci-bundle/web/themes/mandalay/settings/FAQItem.xml
index 9ddd4b676..6e4d4cef6 100755
--- a/ccm-sci-bundle/web/themes/mandalay/settings/FAQItem.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/FAQItem.xml
@@ -23,8 +23,8 @@
 <!--  <setting id="csspath">FAQItem</setting> -->
 
   <setting id="setImage">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption">true</setting>
   <setting id="setLeadText">true</setting>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/FileStorageItem.xml b/ccm-sci-bundle/web/themes/mandalay/settings/FileStorageItem.xml
index 7d6d6b46b..49eb29fb3 100755
--- a/ccm-sci-bundle/web/themes/mandalay/settings/FileStorageItem.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/FileStorageItem.xml
@@ -25,8 +25,8 @@
   <setting id="separator"> | </setting>
 
   <setting id="setImage">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption">true</setting>
   <setting id="setLeadText">true</setting>
   <setting id="setViewLink">true</setting>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/Form.xml b/ccm-sci-bundle/web/themes/mandalay/settings/Form.xml
index f176f639a..b850f3c57 100755
--- a/ccm-sci-bundle/web/themes/mandalay/settings/Form.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/Form.xml
@@ -23,8 +23,8 @@
 <!--  <setting id="csspath">Form</setting> -->
 
   <setting id="setImage">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption">true</setting>
   <setting id="setLeadText">true</setting>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/GenericOrganization.xml b/ccm-sci-bundle/web/themes/mandalay/settings/GenericOrganization.xml
index 72e3d215a..e7ae21e7b 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/GenericOrganization.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/GenericOrganization.xml
@@ -22,9 +22,9 @@
 <settings>
 
   <setting id="setImage">true</setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
 
   <setting id="setRoles">true</setting>
   <setting id="setSubUnits">true</setting>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/GenericPerson.xml b/ccm-sci-bundle/web/themes/mandalay/settings/GenericPerson.xml
index 4ad3121d9..8952c4e84 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/GenericPerson.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/GenericPerson.xml
@@ -26,9 +26,9 @@
   <setting id="setGender">false</setting>
   <setting id="setDescription">false</setting>
   <setting id="setImage">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
-  <setting id="setImageCaption"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
+  <setting id="setImageCaption">true</setting>
 
   <setting id="listView/setLeadText">true</setting>
   <setting id="listView/setLeadTextLength">440</setting>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/GlossaryItem.xml b/ccm-sci-bundle/web/themes/mandalay/settings/GlossaryItem.xml
index 7a5c0d6ef..2b5e84b87 100755
--- a/ccm-sci-bundle/web/themes/mandalay/settings/GlossaryItem.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/GlossaryItem.xml
@@ -23,8 +23,8 @@
 <!--  <setting id="csspath">GlossaryItem</setting> -->
 
   <setting id="setImage">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption">true</setting>
 
   <setting id="listView/setLinkToDetails">false</setting>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/Image.xml b/ccm-sci-bundle/web/themes/mandalay/settings/Image.xml
index b3746638d..fc276d502 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/Image.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/Image.xml
@@ -21,9 +21,9 @@
 
 <settings>
   <setting id="setLeadText">true</setting>
-  <setting id="setImage">true</setting>
-  <setting id="setImageMaxHeight">200</setting>
-  <setting id="setImageMaxWidth">200</setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
+  <setting id="setImageCaption">true</setting>
   <setting id="setImageCaption">true</setting>
   <setting id="setShowKeys">true</setting>
   
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/Member.xml b/ccm-sci-bundle/web/themes/mandalay/settings/Member.xml
index 4ad3121d9..ffbb43e29 100755
--- a/ccm-sci-bundle/web/themes/mandalay/settings/Member.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/Member.xml
@@ -26,8 +26,8 @@
   <setting id="setGender">false</setting>
   <setting id="setDescription">false</setting>
   <setting id="setImage">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption"></setting>
 
   <setting id="listView/setLeadText">true</setting>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/MultiPartArticle.xml b/ccm-sci-bundle/web/themes/mandalay/settings/MultiPartArticle.xml
index 794933d06..5545f806d 100755
--- a/ccm-sci-bundle/web/themes/mandalay/settings/MultiPartArticle.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/MultiPartArticle.xml
@@ -29,8 +29,8 @@
   <setting id="setSectionListHeading">false</setting>
 
   <setting id="setImage">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption">true</setting>
   <setting id="setLeadText">true</setting>
   <setting id="setLastLinkToTopAfter">false</setting>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/NewsItem.xml b/ccm-sci-bundle/web/themes/mandalay/settings/NewsItem.xml
index 0b229eeb9..003ace267 100755
--- a/ccm-sci-bundle/web/themes/mandalay/settings/NewsItem.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/NewsItem.xml
@@ -24,8 +24,8 @@
 
   <setting id="setNewsDate">true</setting>
   <setting id="setImage">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption">true</setting>
   <setting id="setLeadText">true</setting>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/OrganizationalUnit.xml b/ccm-sci-bundle/web/themes/mandalay/settings/OrganizationalUnit.xml
index 5a06587b6..7fb72510d 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/OrganizationalUnit.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/OrganizationalUnit.xml
@@ -22,9 +22,9 @@
 <settings>
 
   <setting id="setImage">true</setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
 
   <setting id="setDirection">true</setting>
   <setting id="directionSetLink">true</setting>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/Project.xml b/ccm-sci-bundle/web/themes/mandalay/settings/Project.xml
index 618195acc..99b6cbc6d 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/Project.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/Project.xml
@@ -22,9 +22,9 @@
 <settings>
   
   <setting id="setImage">true</setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
 
   <setting id="setTeam">true</setting>
   <setting id="setOrgaUnits">true</setting>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/ResearchNetwork.xml b/ccm-sci-bundle/web/themes/mandalay/settings/ResearchNetwork.xml
index cf40dd4c8..0afea53bf 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/ResearchNetwork.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/ResearchNetwork.xml
@@ -22,9 +22,9 @@
 <settings>
 
   <setting id="setImage">true</setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
 
   <setting id="setDirection">true</setting>
   <setting id="setCoordination">true</setting>  
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/SciDepartment.xml b/ccm-sci-bundle/web/themes/mandalay/settings/SciDepartment.xml
index 0c2b4f180..1bb5ef2b8 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/SciDepartment.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/SciDepartment.xml
@@ -23,8 +23,8 @@
   
   <setting id="setImage">false</setting>
   <setting id="setImageCaption">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
 
   <setting id="setAddendum">true</setting>
   <setting id="setShortDesc">true</setting>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/SciInstitute.xml b/ccm-sci-bundle/web/themes/mandalay/settings/SciInstitute.xml
index 4058b861a..26e58e0ea 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/SciInstitute.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/SciInstitute.xml
@@ -23,8 +23,8 @@
   
   <setting id="setImage">false</setting>
   <setting id="setImageCaption">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
 
   <setting id="setAddendum">true</setting>
   <setting id="setShortDesc">true</setting>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/SciMember.xml b/ccm-sci-bundle/web/themes/mandalay/settings/SciMember.xml
index 965abd86b..fa56ff4b7 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/SciMember.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/SciMember.xml
@@ -28,4 +28,4 @@
 
   <setting id="contactentry/homepage/show">false</setting>
   <setting id="contactentry/visitingHours/show">false</setting>
-</settings>
+</settings>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/SciOrganization.xml b/ccm-sci-bundle/web/themes/mandalay/settings/SciOrganization.xml
index 1c8a6e9df..7d9b1b28a 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/SciOrganization.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/SciOrganization.xml
@@ -23,8 +23,8 @@
   
   <setting id="setImage">true</setting>
   <setting id="setImageCaption">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
 
   <setting id="setAddendum">true</setting>
   <setting id="setShortDesc">true</setting>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/SciProject.xml b/ccm-sci-bundle/web/themes/mandalay/settings/SciProject.xml
index e2a779831..1a372ff4d 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/SciProject.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/SciProject.xml
@@ -23,8 +23,8 @@
   
   <setting id="setImage">false</setting>
   <setting id="setImageCaption">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
 
   <setting id="setAddendum">true</setting>
   <setting id="setShortDesc">true</setting>
@@ -76,6 +76,4 @@
   <setting id="memberList/showEmail">true</setting>
   <setting id="memberList/linkEmail">true</setting>
 
-
-
 </settings>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml b/ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml
index d6055af84..2f6f13f63 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/SciPublications.xml
@@ -22,8 +22,8 @@
 <settings>
   <setting id="setImage">true</setting>
   <setting id="setImageCaption">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
 
   <setting id="authorListMode">list</setting>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/SiteProxy.xml b/ccm-sci-bundle/web/themes/mandalay/settings/SiteProxy.xml
index 145e9f29b..450a52cac 100755
--- a/ccm-sci-bundle/web/themes/mandalay/settings/SiteProxy.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/SiteProxy.xml
@@ -24,8 +24,8 @@
 
   <setting id="setLeadText">true</setting>
   <setting id="setImage">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption">true</setting>
   <setting id="setLeadText">true</setting>
 
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/Survey.xml b/ccm-sci-bundle/web/themes/mandalay/settings/Survey.xml
index f176f639a..b850f3c57 100644
--- a/ccm-sci-bundle/web/themes/mandalay/settings/Survey.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/Survey.xml
@@ -23,8 +23,8 @@
 <!--  <setting id="csspath">Form</setting> -->
 
   <setting id="setImage">true</setting>
-  <setting id="setImageMaxHeight"></setting>
-  <setting id="setImageMaxWidth"></setting>
+  <setting id="setImageMaxHeight">300</setting>
+  <setting id="setImageMaxWidth">300</setting>
   <setting id="setImageCaption">true</setting>
   <setting id="setLeadText">true</setting>
 
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 6047e0969..559f9de7a 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
@@ -51,7 +51,7 @@
 
   <xsl:template match="showDynamicImage">
     <div>
-      <xsl:call-template name="mandalay:setParameters"/>
+      <xsl:call-template name="mandalay:setIdAndClass"/>
       <xsl:call-template name="mandalay:dynamicImage"/>
     </div>
   </xsl:template> 
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 b3adc0559..488305d5d 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
@@ -118,7 +118,6 @@
 	<xsl:with-param name="default" select="'true'"/>
       </xsl:call-template>
     </xsl:variable>
-
     <xsl:variable name="setLifespan">
       <xsl:call-template name="mandalay:getSetting">
         <xsl:with-param name="module"  select="'SciProject'"/>
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 b2d14386b..a4fdb513d 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
@@ -266,10 +266,10 @@
         </xsl:if>
       
       <ul>
-    <xsl:for-each select="./volumes/publication">
-        <xsl:sort select="./@volume" data-type="number" order="descending"/>
-        <xsl:sort select="./yearOfPublication" data-type="number" order="descending"/>
-        <xsl:sort select="./title" data-type="text"/>
+	<xsl:for-each select="./volumes/publication">
+	  <xsl:sort select="./@volume" data-type="number" order="descending"/>
+      <xsl:sort select="./yearOfPublication" data-type="number" order="descending"/>
+      <xsl:sort select="./title" data-type="text"/>
 	  <li>
 		<xsl:apply-templates select="." mode="list_view"/>
 	  </li>  
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/formatParser.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/formatParser.xsl
index b4a4d9ecd..b5902b602 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/formatParser.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/formatParser.xsl
@@ -38,76 +38,71 @@
   -->
 
   <!-- Process the format for an article in a collected volume -->
-  <xsl:template name="bibrefArticleInCollectedVolume"
-  match="bibrefArticleInCollectedVolumeFormat">
+  <xsl:template name="bibrefArticleInCollectedVolume" match="bibrefArticleInCollectedVolumeFormat">
     <!-- Parameters for publication data -->
-    <xsl:param name="authors" />
-    <xsl:param name="chapter" />
-    <xsl:param name="collectedVolume" />
-    <xsl:param name="misc" select="''" />
-    <xsl:param name="pagesFrom" />
-    <xsl:param name="pagesTo" />
-    <xsl:param name="reviewed" />
-    <xsl:param name="series" />
-    <xsl:param name="title" />
-    <xsl:param name="year" />
+    <xsl:param name="authors"/>
+    <xsl:param name="chapter"/>
+    <xsl:param name="collectedVolume"/>
+    <xsl:param name="misc" select="''"/>
+    <xsl:param name="pagesFrom"/>
+    <xsl:param name="pagesTo"/>
+    <xsl:param name="reviewed"/>
+    <xsl:param name="series"/>
+    <xsl:param name="title"/>
+    <xsl:param name="year"/>
     <!-- Technical parameters -->
-    <xsl:param name="oid" />
-    <xsl:param name="useRelativeUrl" select="'false'" />
+    <xsl:param name="oid"/>
+    <xsl:param name="useRelativeUrl" select="'false'"/>
     <xsl:apply-templates>
       <!-- Publication data -->
-      <xsl:with-param name="authors" select="$authors" />
-      <xsl:with-param name="chapter" select="$chapter" />
-      <xsl:with-param name="collectedVolume"
-      select="$collectedVolume" />
-      <xsl:with-param name="misc" select="$misc" />
-      <xsl:with-param name="pagesFrom" select="$pagesFrom" />
-      <xsl:with-param name="pagesTo" select="$pagesTo" />
-      <xsl:with-param name="reviewed" select="$reviewed" />
-      <xsl:with-param name="series" select="$series" />
-      <xsl:with-param name="title" select="$title" />
-      <xsl:with-param name="year" select="$year" />
+      <xsl:with-param name="authors" select="$authors"/>
+      <xsl:with-param name="chapter" select="$chapter"/>
+      <xsl:with-param name="collectedVolume" select="$collectedVolume"/>
+      <xsl:with-param name="misc" select="$misc"/>
+      <xsl:with-param name="pagesFrom" select="$pagesFrom"/>
+      <xsl:with-param name="pagesTo" select="$pagesTo"/>
+      <xsl:with-param name="reviewed" select="$reviewed"/>
+      <xsl:with-param name="series" select="$series"/>
+      <xsl:with-param name="title" select="$title"/>
+      <xsl:with-param name="year" select="$year"/>
       <!-- Technical data -->
-      <xsl:with-param name="oid" select="$oid" />
-      <xsl:with-param name="useRelativeUrl"
-      select="$useRelativeUrl" />
-    </xsl:apply-templates>
+      <xsl:with-param name="oid" select="$oid"/>      
+      <xsl:with-param name="useRelativeUrl" select="$useRelativeUrl"/>
+    </xsl:apply-templates>       
   </xsl:template>
 
   <!-- Process the format for an article in a journal -->
-  <xsl:template name="bibrefArticleInJournal"
-  match="bibrefArticleInJournalFormat">
+  <xsl:template name="bibrefArticleInJournal" match="bibrefArticleInJournalFormat">
     <!-- Publication data -->
-    <xsl:param name="authors" />
-    <xsl:param name="issue" />
-    <xsl:param name="journal" />
-    <xsl:param name="misc" select="''" />
-    <xsl:param name="pagesFrom" />
-    <xsl:param name="pagesTo" />
-    <xsl:param name="publicationDate" />
-    <xsl:param name="reviewed" />
-    <xsl:param name="series" />
-    <xsl:param name="title" />
-    <xsl:param name="volume" />
-    <xsl:param name="year" />
+    <xsl:param name="authors"/>
+    <xsl:param name="issue"/>
+    <xsl:param name="journal"/>
+    <xsl:param name="misc" select="''"/>
+    <xsl:param name="pagesFrom"/>
+    <xsl:param name="pagesTo"/>
+    <xsl:param name="publicationDate"/>
+    <xsl:param name="reviewed"/>
+    <xsl:param name="series"/>
+    <xsl:param name="title"/>
+    <xsl:param name="volume"/>
+    <xsl:param name="year"/>
     <!-- Technical data -->
-    <xsl:param name="oid" />
-    <xsl:param name="useRelativeUrl" select="'false'" />
+    <xsl:param name="oid"/>
+    <xsl:param name="useRelativeUrl" select="'false'"/>
     <xsl:apply-templates>
       <!-- Publication data -->
-      <xsl:with-param name="authors" select="$authors" />
-      <xsl:with-param name="issue" select="$issue" />
-      <xsl:with-param name="journal" select="$journal" />
-      <xsl:with-param name="misc" select="$misc" />
-      <xsl:with-param name="pagesFrom" select="$pagesFrom" />
-      <xsl:with-param name="pagesTo" select="$pagesTo" />
-      <xsl:with-param name="publicationDate"
-      select="$publicationDate" />
-      <xsl:with-param name="reviewed" select="$reviewed" />
-      <xsl:with-param name="series" select="$series" />
-      <xsl:with-param name="title" select="$title" />
-      <xsl:with-param name="volume" select="$volume" />
-      <xsl:with-param name="year" select="$year" />
+      <xsl:with-param name="authors" select="$authors"/>
+      <xsl:with-param name="issue" select="$issue"/>
+      <xsl:with-param name="journal" select="$journal"/>
+      <xsl:with-param name="misc" select="$misc"/>
+      <xsl:with-param name="pagesFrom" select="$pagesFrom"/>
+      <xsl:with-param name="pagesTo" select="$pagesTo"/>  
+      <xsl:with-param name="publicationDate" select="$publicationDate"/>
+      <xsl:with-param name="reviewed" select="$reviewed"/>
+      <xsl:with-param name="series" select="$series"/>
+      <xsl:with-param name="title" select="$title"/>
+      <xsl:with-param name="volume" select="$volume"/>
+      <xsl:with-param name="year" select="$year"/>
       <!-- Technical data -->
       <xsl:with-param name="oid" select="$oid" />
       <xsl:with-param name="useRelativeUrl"