diff --git a/src/main/java/org/olat/course/config/ui/courselayout/CourseLayoutGeneratorController.java b/src/main/java/org/olat/course/config/ui/courselayout/CourseLayoutGeneratorController.java
index 22426ce2cbcf183bd8584203926b33426c094493..71cc1e44e1a16f402fd2f0a707af812f810eda15 100644
--- a/src/main/java/org/olat/course/config/ui/courselayout/CourseLayoutGeneratorController.java
+++ b/src/main/java/org/olat/course/config/ui/courselayout/CourseLayoutGeneratorController.java
@@ -76,7 +76,7 @@ import org.olat.course.run.environment.CourseEnvironment;
  */
 public class CourseLayoutGeneratorController extends FormBasicController {
 
-	private static final String ELEMENT_ATTRIBUTE_DELIM = "::";
+	private static final String ELEMENT_ATTRIBUTE_DELIM = "__";
 	private static final String PREVIEW_IMAGE_NAME = "preview.png";
 	private CourseConfig courseConfig;
 	private SingleSelection styleSel;
diff --git a/src/main/java/org/olat/course/config/ui/courselayout/_content/style.html b/src/main/java/org/olat/course/config/ui/courselayout/_content/style.html
index 85e8c50508ab37d41db0514b88fbf5e1df35b891..fe9e80d0fccece788d3cb19500244f706e54db70 100644
--- a/src/main/java/org/olat/course/config/ui/courselayout/_content/style.html
+++ b/src/main/java/org/olat/course/config/ui/courselayout/_content/style.html
@@ -1,5 +1,4 @@
-<br/>
-<table>
+<table class="table table-bordered">
   <tr>
     <th>&nbsp;</th>
 	#foreach( $attrib in $allAttribs )
@@ -17,7 +16,7 @@
 	
 		#set($elAttribs = $element.getValue())
 		#foreach( $attrib in $allAttribs )
-			<td>
+			<td class="">
 			#set($attribName = $attrib.getLayoutAttributeTypeName())
 			#if ($elAttribs.get($attribName)) 
 				$r.render($elAttribs.get($attribName).getName())