diff --git a/src/RWMooseDiagram.package/RWDiagram.class/instance/attributesWithEditor.class.layout.mondrian..st b/src/RWMooseDiagram.package/RWDiagram.class/instance/attributesWithEditor.class.layout.mondrian..st
index 06cacfb..f5565a6 100644
--- a/src/RWMooseDiagram.package/RWDiagram.class/instance/attributesWithEditor.class.layout.mondrian..st
+++ b/src/RWMooseDiagram.package/RWDiagram.class/instance/attributesWithEditor.class.layout.mondrian..st
@@ -5,7 +5,7 @@ attributesWithEditor: rwEditor class: clsRWDiagramElement layout: rwLayout mondr
 	displayedAttributes := clsRWDiagramElement dAttributes collect: [ :each | each asRWDiagramElement: rwLayout ].
 	rwEditor settings isReading
 		ifTrue: [ displayedAttributes := displayedAttributes reject: [ :c | rwLayout isModelElementNotShownWithChildren: c ] ].
-	b shape rectangle
+	b shape ellipse
 		if: [ :m | rwLayout highlight: m ] fillColor: rwLayout colorSchema attributeHighLightedColor;
 		if: [ :m | (rwLayout highlight: m) not ] fillColor: rwLayout colorSchema attributeColor;
 		width: 20;
diff --git a/src/RWMooseDiagram.package/RWDiagram.class/instance/methodUsage.withEditor.withLayout.withMondrian.ofMooseModel.test..st b/src/RWMooseDiagram.package/RWDiagram.class/instance/methodUsage.withEditor.withLayout.withMondrian.ofMooseModel.test..st
index 5cf0671..3fe90f8 100644
--- a/src/RWMooseDiagram.package/RWDiagram.class/instance/methodUsage.withEditor.withLayout.withMondrian.ofMooseModel.test..st
+++ b/src/RWMooseDiagram.package/RWDiagram.class/instance/methodUsage.withEditor.withLayout.withMondrian.ofMooseModel.test..st
@@ -133,7 +133,7 @@ Handles the modifies DBTable to color database tables differently
 										fillColor: Color transparent.
 									b
 										node: 'attributes'
-										forIt: [ b shape rectangle
+										forIt: [ b shape ellipse
 												if: [ :m | rwLayout highlight: m ] fillColor: rwLayout colorSchema dataBaseAsAttributeHighLighteColor;
 												if: [ :m | (rwLayout highlight: m) not ] fillColor: rwLayout colorSchema dataBaseAsAttributeColor;
 												width: 20;
@@ -273,11 +273,11 @@ source: aFAMIXGroup allAccesses connectFrom: #from to: #variable."
 		ifFalse: [ lb addText: 'Dependency graph' ]
 		ifTrue: [ lb addText: 'Dependency graph - Elements with permanent appearance changers are highlighted' ].
 	lb addText: 'Layout: ' , rwLayout name.
-	lb addColor: rwLayout colorSchema classColor text: 'Class or interface or a grouping that is mapped to class'.
+	lb addColor: rwLayout colorSchema classColor text: 'Class (Grouping level 1)'.
 	"lb addColor: rwLayout colorSchema dataBaseTableColor text: 'Database table'."
-	lb addColor: rwLayout colorSchema dataBaseAsAttributeColor text: 'DataBase Table'.
-	lb addColor: rwLayout colorSchema attributeColor text: '"Data" - Class or interface attribute'.
-	lb addColor: rwLayout colorSchema methodColor text: '"Coding" - Class method or some element that is mapped to class method'.
+	lb addColor: rwLayout colorSchema methodColor text: 'Box: Active system component'.
+	lb addColor: rwLayout colorSchema attributeColor text: 'Circle: Passive system component'.
+	lb addColor: rwLayout colorSchema dataBaseAsAttributeColor text: 'Circle: DataBase Table'.
 	lb addLineColor: rwLayout colorSchema attributeLineColor text: 'Access to "Data" resp. attribute'.
 	lb addLineColor: rwLayout colorSchema methodLineColor text: 'Invocation between "Coding" resp. methods, the arrow points to the used one'.
 	lb build.