diff --git a/src/Toplo-Examples/ToElementWithEditor.class.st b/src/Toplo-Examples/ToElementWithEditor.class.st
index cd3169a66..f64f6f6aa 100644
--- a/src/Toplo-Examples/ToElementWithEditor.class.st
+++ b/src/Toplo-Examples/ToElementWithEditor.class.st
@@ -23,7 +23,7 @@ ToElementWithEditor >> beforeEditorOpened: anEditor fromManager: aManager [
 		do: [ :event | aManager closeWindow ].
 
 	anEditor text: (contents ifNil: [self background paint color asString]).
-	anEditor infinite requestFocus.
+	anEditor requestFocus.
 	anEditor selecter
 		all;
 		apply.
diff --git a/src/Toplo-Examples/ToSandBox.class.st b/src/Toplo-Examples/ToSandBox.class.st
index b1d7a819a..7976c466b 100644
--- a/src/Toplo-Examples/ToSandBox.class.st
+++ b/src/Toplo-Examples/ToSandBox.class.st
@@ -932,6 +932,7 @@ ToSandBox class >> example_CodeEditor [
 	disabox := ToCheckMenuItem new label: (ToLabel text: 'Disable').
 
 	menuBar := ToMenuBar new.
+	menuBar hMatchParent.
 	menuBar addItem: fileMenu.
 	menuBar addItem: inspectBtn.
 	menuBar addItem: showStatisticsBtn.
@@ -983,6 +984,46 @@ ToSandBox class >> example_EditableList2WithAllClassesNames [
 	space show
 ]
 
+{ #category : #album }
+ToSandBox class >> example_EditorWithMinHeight [
+
+	| pane menuBar text album disabox inspectBtn showStatisticsBtn |
+	pane := ToPane vertical matchParent.
+
+	text := ''.
+	album := ToAlbum new.
+	album hMatchParent.
+	album vFitContent.
+	album next constraintsDo: [ :c |
+		c vertical fitContent.
+		c horizontal matchParent ].
+	album infinite constraintsDo: [ :c |
+		c vertical fitContent.
+		c horizontal matchParent ].
+	album text: text copy.
+	album minHeight: 100.
+
+	inspectBtn := ToMenuItem new labelText: 'Inspect'.
+	showStatisticsBtn := ToMenuItem new labelText: 'Statistics'.
+	disabox := ToCheckMenuItem new label: (ToLabel text: 'Disable').
+
+	menuBar := ToMenuBar new.
+	menuBar hMatchParent.
+	menuBar addItem: inspectBtn.
+	menuBar addItem: showStatisticsBtn.
+	menuBar addItem: disabox.
+
+	pane addChild: menuBar.
+	pane addChild: album.
+
+	inspectBtn whenClickedDo: [ :evt | album space root inspect ].
+	disabox whenClickedDo: [ :evt | album disabled: disabox isChecked ].
+	showStatisticsBtn whenClickedDo: [ :evt |
+		album space showStatisticsWindow ].
+
+	pane openInSpace
+]
+
 { #category : #album }
 ToSandBox class >> example_EditorWithPlaceholder [
 
@@ -1002,8 +1043,8 @@ ToSandBox class >> example_EditorWithPlaceholder [
 		        withRowNumbers;
 		        withSaveCapability;
 		        whenSaveRequestedDo: [ :saveRequested |
-			        saveRequested client saveResult: true ];
-		        withEditsFeedback.
+			        saveRequested accepted: true ];
+		        yourself.
 	view openInInnerWindow
 ]
 
@@ -1027,7 +1068,7 @@ ToSandBox class >> example_EditorWithPlaceholderWithAlbum [
 		        withRowNumbers;
 		        withSaveCapability;
 		        whenSaveRequestedDo: [ :saveRequested |
-			        saveRequested client saveResult: true ];
+			        saveRequested accepted: true ];
 		        withEditsFeedback.
 	view openInInnerWindow
 ]
@@ -1041,10 +1082,10 @@ ToSandBox class >> example_EditorWithoutSoftLine [
 		        withRowNumbers;
 		        withSaveCapability;
 		        whenSaveRequestedDo: [ :saveRequested |
-			        saveRequested client saveResult: true ];
+			        saveRequested accepted: true  ];
 		        withEditsFeedback.
 	view withoutSoftLine.
-	view text: ((String loremIpsum: 100000) asRopedText fontName: 'Source Code Pro').
+	view text: ((String loremIpsum: 10000) asRopedText fontName: 'Source Code Pro').
 	view openInSpace
 ]
 
diff --git a/src/Toplo-Examples/ToWorkspaceExample.class.st b/src/Toplo-Examples/ToWorkspaceExample.class.st
index c41179af3..3b33f38ea 100644
--- a/src/Toplo-Examples/ToWorkspaceExample.class.st
+++ b/src/Toplo-Examples/ToWorkspaceExample.class.st
@@ -5,8 +5,8 @@ Class {
 	#name : #ToWorkspaceExample,
 	#superclass : #Object,
 	#instVars : [
-		'textModel',
-		'bindings'
+		'bindings',
+		'album'
 	],
 	#category : #'Toplo-Examples-TopLevel'
 }
@@ -72,8 +72,8 @@ ToWorkspaceExample >> correctFrom: start to: stop with: aString [
 ToWorkspaceExample >> doIt [
 
 	| toDo |
-	toDo := textModel selectedText asString.
-	toDo ifEmpty: [ toDo := textModel text asString ].
+	toDo := album selectedText asString.
+	toDo ifEmpty: [ toDo := album text asString ].
 	[
 	OpalCompiler new
 		source: toDo readStream;
@@ -93,14 +93,14 @@ ToWorkspaceExample >> hasBindingOf: aString [
 ToWorkspaceExample >> initialize [
 	super initialize.
 	bindings := Dictionary new.
-	textModel := ToAlbum new.
+	album := ToAlbum new.
 
 ]
 
 { #category : #'user interface' }
 ToWorkspaceExample >> initializeCodeEditor [
 
-	textModel
+	album
 		withRowNumbers;
 		placeholderBuilder: [ :thePlaceholder :e | | text lab |
 			text := (('Workspace example' , String cr , '- doit: Cmd-d') asRopedText
@@ -145,15 +145,15 @@ ToWorkspaceExample >> openInSpace: aSpace [
 
 	| frame |
 	self initializeCodeEditor.
-	textModel infinite requestFocus.
-	textModel showPlaceholder.
+	album requestFocus.
+	album showPlaceholder.
 	frame := ToInnerWindow new title: 'Workspace'.
-	frame pane addChild: textModel.
+	frame pane addChild: album.
 	aSpace root addChild: frame
 ]
 
 { #category : #accessing }
 ToWorkspaceExample >> text [
 
-	^ textModel text
+	^ album text
 ]
diff --git a/src/Toplo-Widget-Accordion/ToAccordionElement.class.st b/src/Toplo-Widget-Accordion/ToAccordionElement.class.st
deleted file mode 100644
index ec2a23f8d..000000000
--- a/src/Toplo-Widget-Accordion/ToAccordionElement.class.st
+++ /dev/null
@@ -1,146 +0,0 @@
-Class {
-	#name : #ToAccordionElement,
-	#superclass : #ToElement,
-	#instVars : [
-		'header',
-		'body',
-		'headerBuilder',
-		'bodyBuilder'
-	],
-	#category : #'Toplo-Widget-Accordion-Core'
-}
-
-{ #category : #examples }
-ToAccordionElement class >> exampleWithLabel [
-
-	<script>
-	| inst |
-	inst := self new.
-	inst headerBuilder: [ :header |
-		header addChild: (ToLabel text: 'Header') ].
-	inst bodyBuilder: [ :body |
-		body addChild:
-			(ToLabel new text: 'Body with random background color').
-		body
-			hMatchParent;
-			height: 100;
-			background: Color random ].
-	inst openInSpace.
-	^ inst
-]
-
-{ #category : #'as yet unclassified' }
-ToAccordionElement class >> exampleWithLabelAndAlbumInBody [
-
-	<script>
-	| inst |
-	inst := self new.
-	inst headerBuilder: [ :header |
-		header addChild: (ToLabel text: 'Header') ].
-	inst bodyBuilder: [ :body |
-		| album |
-		album := ToAlbum new
-			         withSaveCapability;
-			         whenSaveRequestedDo: [ :saveRequested |
-				         saveRequested accepted: true ];
-			         whenCancelRequestedDo: [ :cancelRequested |
-				         cancelRequested editorElement text: '' ];
-			         yourself.
-		album hMatchParent.
-		album vFitContent.
-		album next vFitContent.
-		album infinite vFitContent.
-		album text: 'AAAAAAAA'.
-		body addChild: album ].
-	inst openInSpace.
-	^ inst
-]
-
-{ #category : #accessing }
-ToAccordionElement >> bodyBuilder: aValuable [
-	"With a body as argument"
-	
-	bodyBuilder := aValuable
-]
-
-{ #category : #'expanding-collapsing' }
-ToAccordionElement >> collapse [
-
-	body removeChildren.
-	body removeFromParent
-]
-
-{ #category : #'expanding-collapsing' }
-ToAccordionElement >> expand [
-
-	bodyBuilder ifNil: [ ^ self ].
-	bodyBuilder value: body.
-	self addChild: body
-]
-
-{ #category : #accessing }
-ToAccordionElement >> headerBuilder: aValuable [
-	"With an header as argument"
-	
-	header builder: aValuable
-]
-
-{ #category : #initialization }
-ToAccordionElement >> initialize [
-
-	super initialize.
-	self layout: BlLinearLayout vertical.
-	self hMatchParent.
-	self vFitContent.
-	self initializeHeader.
-	self initializeClick.
-	self initializeBody.
-
-]
-
-{ #category : #initialization }
-ToAccordionElement >> initializeBody [
-
-	body := ToElement new
-		        constraintsDo: [ :c |
-			        c vertical fitContent.
-			        c horizontal matchParent ];
-		        border: (BlBorder paint: Color veryLightGray width: 1);
-		        yourself
-]
-
-{ #category : #initialization }
-ToAccordionElement >> initializeClick [
-
-	header whenClickedDo: [ :e |
-		e consume.
-		header isCollapsed: header isCollapsed not.
-		header isCollapsed
-			ifFalse: [ self expand ]
-			ifTrue: [ self collapse ] ]
-]
-
-{ #category : #initialization }
-ToAccordionElement >> initializeHeader [
-
-	header := ToAccordionHeaderElement new.
-	self addChild: header
-]
-
-{ #category : #testing }
-ToAccordionElement >> isCollapsed [ 
-	
-	^ header isCollapsed 
-]
-
-{ #category : #accessing }
-ToAccordionElement >> isCollapsed: aBoolean [
-	
-	header isCollapsed: aBoolean
-]
-
-{ #category : #skin }
-ToAccordionElement >> newRawSkin [
-
-	^ ToAccordionElementSkin new
-]
diff --git a/src/Toplo-Widget-Accordion/ToAccordionItemBodyElement.class.st b/src/Toplo-Widget-Accordion/ToAccordionItemBodyElement.class.st
new file mode 100644
index 000000000..40a05ea02
--- /dev/null
+++ b/src/Toplo-Widget-Accordion/ToAccordionItemBodyElement.class.st
@@ -0,0 +1,71 @@
+Class {
+	#name : #ToAccordionItemBodyElement,
+	#superclass : #ToElement,
+	#instVars : [
+		'builder',
+		'content',
+		'preservedContent',
+		'isBuilt'
+	],
+	#category : #'Toplo-Widget-Accordion-Core'
+}
+
+{ #category : #accessing }
+ToAccordionItemBodyElement >> builder: aValuable [
+	"With content as argument"
+
+	isBuilt := false.
+	builder := aValuable 
+]
+
+{ #category : #accessing }
+ToAccordionItemBodyElement >> content [ 
+
+	^ content
+]
+
+{ #category : #initialization }
+ToAccordionItemBodyElement >> initialize [ 
+
+	super initialize.
+	isBuilt := false.
+	preservedContent := true.
+	self initializeContent
+]
+
+{ #category : #initialization }
+ToAccordionItemBodyElement >> initializeContent [
+
+	content := ToElement new
+		           withNullSkin;
+		           background: BlBackground transparent;
+		           layout: BlLinearLayout vertical;
+		           constraintsDo: [ :c |
+			           c vertical fitContent.
+			           c horizontal matchParent ];
+		           yourself.
+	self addChild: content
+]
+
+{ #category : #accessing }
+ToAccordionItemBodyElement >> preservedContent: aBoolean [
+
+	preservedContent := aBoolean
+]
+
+{ #category : #'expanding-collapsing' }
+ToAccordionItemBodyElement >> switchCollapsed [
+
+	preservedContent ifFalse: [ content removeChildren ].
+	content visibility: BlVisibility gone
+]
+
+{ #category : #'expanding-collapsing' }
+ToAccordionItemBodyElement >> switchExpanded [
+
+	(isBuilt and: [ preservedContent ]) ifFalse: [
+		content removeChildren.
+		builder ifNotNil: [ builder value: content ].
+		isBuilt := true ].
+	content visibility: BlVisibility visible
+]
diff --git a/src/Toplo-Widget-Accordion/ToAccordionItemElement.class.st b/src/Toplo-Widget-Accordion/ToAccordionItemElement.class.st
new file mode 100644
index 000000000..d339a784f
--- /dev/null
+++ b/src/Toplo-Widget-Accordion/ToAccordionItemElement.class.st
@@ -0,0 +1,241 @@
+Class {
+	#name : #ToAccordionItemElement,
+	#superclass : #ToElement,
+	#instVars : [
+		'header',
+		'body'
+	],
+	#category : #'Toplo-Widget-Accordion-Core'
+}
+
+{ #category : #examples }
+ToAccordionItemElement class >> exampleSeveralInPaneWithLabel [
+
+	<script>
+	| pane |
+	pane := ToPane new.
+	pane layout: BlLinearLayout vertical.
+	pane hMatchParent.
+	pane vFitContent.
+	(1 to: 5) collect: [ :i |
+		pane addChild: ((self itemWithLabelText: 'Header ' , i asString) isExpanded: true)].
+	pane openInSpace.
+	^ pane
+]
+
+{ #category : #examples }
+ToAccordionItemElement class >> exampleWithLabel [
+
+	<script>
+	| inst |
+	inst := self itemWithLabel.
+	inst openInSpace.
+	^ inst
+]
+
+{ #category : #examples }
+ToAccordionItemElement class >> exampleWithLabelAndAlbumInBody [
+
+	<script>
+	| inst |
+	inst := self itemWithLabelAndAlbumInBody.
+	inst openInSpace.
+	^ inst
+]
+
+{ #category : #examples }
+ToAccordionItemElement class >> exampleWithLabelExpanded [
+
+	<script>
+	| inst |
+	inst := self itemWithLabel.
+	inst isExpanded: true.
+	inst openInSpace.
+	^ inst
+]
+
+{ #category : #examples }
+ToAccordionItemElement class >> exampleWithLabelNotPreservingBody [
+
+	<script>
+	| inst |
+	inst := self itemWithLabel.
+	inst preserveBody: false.
+	inst openInSpace.
+	^ inst
+]
+
+{ #category : #examples }
+ToAccordionItemElement class >> exampleWithLabelNotPreservingBodyAndExpanded [
+
+	<script>
+	| inst |
+	inst := self itemWithLabel.
+	inst preserveBody: false.
+	inst isExpanded: true.
+	inst openInSpace.
+	^ inst
+]
+
+{ #category : #examples }
+ToAccordionItemElement class >> itemWithLabel [
+
+	^ self itemWithLabelText: 'Header'
+]
+
+{ #category : #examples }
+ToAccordionItemElement class >> itemWithLabelAndAlbumInBody [
+
+	| inst |
+	inst := self new.
+	inst headerBuilder: [ :header |
+		header addChild: (ToLabel text: 'Header') ].
+	inst bodyBuilder: [ :body |
+		| album |
+		album := ToAlbum new
+			         withSaveCapability;
+			         whenSaveRequestedDo: [ :saveRequested |
+				         saveRequested accepted: true ];
+			         whenCancelRequestedDo: [ :cancelRequested |
+				         cancelRequested editorElement text: '' ];
+			         yourself.
+		album hMatchParent.
+		album vFitContent.
+		album next constraintsDo: [ :c |
+			c vertical fitContent.
+			c horizontal matchParent ].
+		album infinite constraintsDo: [ :c |
+			c vertical fitContent.
+			c horizontal matchParent ].
+		album minHeight: 50.
+		album text: 'AAAAAAAA'.
+		body addChild: album ].
+	^ inst
+]
+
+{ #category : #examples }
+ToAccordionItemElement class >> itemWithLabelText: aString [
+
+	| inst |
+	inst := self new.
+	inst headerBuilder: [ :header |
+		header addChild: (ToLabel text: aString) ].
+	inst bodyBuilder: [ :body |
+		body addChild:
+			(ToLabel new text: 'Body with random background color').
+		body
+			hMatchParent;
+			height: 100;
+			background: Color random ].
+	inst vFitContent; hMatchParent.
+	^ inst
+]
+
+{ #category : #accessing }
+ToAccordionItemElement >> bodyBuilder: aValuable [
+	"With a body content as argument"
+	
+	body builder: aValuable
+]
+
+{ #category : #'expanding-collapsing' }
+ToAccordionItemElement >> collapse [
+
+	body switchCollapsed
+]
+
+{ #category : #'expanding-collapsing' }
+ToAccordionItemElement >> expand [
+
+	body switchExpanded 
+
+]
+
+{ #category : #accessing }
+ToAccordionItemElement >> headerBuilder: aValuable [
+	"With an header as argument"
+	
+	header builder: aValuable
+]
+
+{ #category : #initialization }
+ToAccordionItemElement >> initialize [
+
+	super initialize.
+	self layout: BlLinearLayout vertical.
+	self hMatchParent.
+	self vFitContent.
+	self initializeHeader.
+	self initializeBody.
+	self initializeClick
+]
+
+{ #category : #initialization }
+ToAccordionItemElement >> initializeBody [
+
+	body := ToAccordionItemBodyElement new.
+	body hMatchParent.
+	body vFitContent.
+	self addChild: body
+]
+
+{ #category : #initialization }
+ToAccordionItemElement >> initializeClick [
+
+	header whenClickedDo: [ :e |
+		"e consume."
+		header isCollapsed: header isCollapsed not.
+		header isCollapsed
+			ifFalse: [ self expand ]
+			ifTrue: [ self collapse ] ]
+]
+
+{ #category : #initialization }
+ToAccordionItemElement >> initializeHeader [
+
+	header := ToAccordionItemHeaderElement new.
+	self addChild: header
+]
+
+{ #category : #testing }
+ToAccordionItemElement >> isCollapsed [ 
+	
+	^ header isCollapsed 
+]
+
+{ #category : #accessing }
+ToAccordionItemElement >> isCollapsed: aBoolean [
+	
+	header isCollapsed: aBoolean
+]
+
+{ #category : #accessing }
+ToAccordionItemElement >> isExpanded [
+	
+	^ self isCollapsed not
+]
+
+{ #category : #accessing }
+ToAccordionItemElement >> isExpanded: aBoolean [
+	
+	self isCollapsed: aBoolean not
+]
+
+{ #category : #skin }
+ToAccordionItemElement >> newRawSkin [
+
+	^ ToAccordionItemElementSkin new
+]
+
+{ #category : #'hooks - children' }
+ToAccordionItemElement >> onAddedToSceneGraph [
+
+	self isCollapsed ifFalse: [ self expand ].
+	super onAddedToSceneGraph
+]
+
+{ #category : #accessing }
+ToAccordionItemElement >> preserveBody: aBoolean [
+
+	body preservedContent: aBoolean
+]
diff --git a/src/Toplo-Widget-Accordion/ToAccordionElementSkin.class.st b/src/Toplo-Widget-Accordion/ToAccordionItemElementSkin.class.st
similarity index 65%
rename from src/Toplo-Widget-Accordion/ToAccordionElementSkin.class.st
rename to src/Toplo-Widget-Accordion/ToAccordionItemElementSkin.class.st
index 8c6c2252d..4d824bbc4 100644
--- a/src/Toplo-Widget-Accordion/ToAccordionElementSkin.class.st
+++ b/src/Toplo-Widget-Accordion/ToAccordionItemElementSkin.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ToAccordionElementSkin,
+	#name : #ToAccordionItemElementSkin,
 	#superclass : #ToRawSkin,
 	#category : #'Toplo-Widget-Accordion-Core'
 }
 
 { #category : #'event handling' }
-ToAccordionElementSkin >> installSkinEvent: anEvent [
+ToAccordionItemElementSkin >> installSkinEvent: anEvent [
 
 	super installSkinEvent: anEvent.
 	anEvent elementDo: [ :e |  ]
diff --git a/src/Toplo-Widget-Accordion/ToAccordionHeaderElement.class.st b/src/Toplo-Widget-Accordion/ToAccordionItemHeaderElement.class.st
similarity index 68%
rename from src/Toplo-Widget-Accordion/ToAccordionHeaderElement.class.st
rename to src/Toplo-Widget-Accordion/ToAccordionItemHeaderElement.class.st
index b7019ef20..5da965282 100644
--- a/src/Toplo-Widget-Accordion/ToAccordionHeaderElement.class.st
+++ b/src/Toplo-Widget-Accordion/ToAccordionItemHeaderElement.class.st
@@ -1,5 +1,5 @@
 Class {
-	#name : #ToAccordionHeaderElement,
+	#name : #ToAccordionItemHeaderElement,
 	#superclass : #ToElement,
 	#traits : 'TToClickable',
 	#classTraits : 'TToClickable classTrait',
@@ -15,7 +15,7 @@ Class {
 }
 
 { #category : #examples }
-ToAccordionHeaderElement class >> exampleWithLabel [
+ToAccordionItemHeaderElement class >> exampleWithLabel [
 
 	<script>
 	| inst |
@@ -26,39 +26,39 @@ ToAccordionHeaderElement class >> exampleWithLabel [
 ]
 
 { #category : #'as yet unclassified' }
-ToAccordionHeaderElement >> builder: aValuable [
+ToAccordionItemHeaderElement >> builder: aValuable [
 	"With an header as argument"
 	
 	aValuable value: content
 ]
 
 { #category : #'as yet unclassified' }
-ToAccordionHeaderElement >> clickHandler [
+ToAccordionItemHeaderElement >> clickHandler [
 
 	^ clickHandler 
 ]
 
 { #category : #'as yet unclassified' }
-ToAccordionHeaderElement >> clickHandler: anHandler [
+ToAccordionItemHeaderElement >> clickHandler: anHandler [
 
 	clickHandler := anHandler
 ]
 
 { #category : #accessing }
-ToAccordionHeaderElement >> content [ 
+ToAccordionItemHeaderElement >> content [ 
 
 	^ content
 ]
 
 { #category : #'as yet unclassified' }
-ToAccordionHeaderElement >> icon: aToImage [
+ToAccordionItemHeaderElement >> icon: aToImage [
 
 	iconContainer removeChildren.
 	iconContainer addChild: aToImage	
 ]
 
 { #category : #initialization }
-ToAccordionHeaderElement >> initialize [
+ToAccordionItemHeaderElement >> initialize [
 
 	super initialize.
 	isCollapsed := true.
@@ -77,31 +77,31 @@ ToAccordionHeaderElement >> initialize [
 ]
 
 { #category : #'as yet unclassified' }
-ToAccordionHeaderElement >> isCollapsed [ 
+ToAccordionItemHeaderElement >> isCollapsed [ 
 	
 	^ isCollapsed 
 ]
 
 { #category : #'as yet unclassified' }
-ToAccordionHeaderElement >> isCollapsed: aBoolean [
+ToAccordionItemHeaderElement >> isCollapsed: aBoolean [
 
 	isCollapsed := aBoolean
 ]
 
 { #category : #skin }
-ToAccordionHeaderElement >> newRawSkin [
+ToAccordionItemHeaderElement >> newRawSkin [
 
-	^ ToAccordionHeaderElementSkin new
+	^ ToAccordionItemHeaderElementSkin new
 ]
 
 { #category : #'as yet unclassified' }
-ToAccordionHeaderElement >> rawClickEventClass [
+ToAccordionItemHeaderElement >> rawClickEventClass [
 
 	^ clickEventClass
 ]
 
 { #category : #'as yet unclassified' }
-ToAccordionHeaderElement >> rawClickEventClass: aClass [
+ToAccordionItemHeaderElement >> rawClickEventClass: aClass [
 
 	clickEventClass := aClass
 ]
diff --git a/src/Toplo-Widget-Accordion/ToAccordionHeaderElementSkin.class.st b/src/Toplo-Widget-Accordion/ToAccordionItemHeaderElementSkin.class.st
similarity index 79%
rename from src/Toplo-Widget-Accordion/ToAccordionHeaderElementSkin.class.st
rename to src/Toplo-Widget-Accordion/ToAccordionItemHeaderElementSkin.class.st
index 626db9aef..77a46f277 100644
--- a/src/Toplo-Widget-Accordion/ToAccordionHeaderElementSkin.class.st
+++ b/src/Toplo-Widget-Accordion/ToAccordionItemHeaderElementSkin.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ToAccordionHeaderElementSkin,
+	#name : #ToAccordionItemHeaderElementSkin,
 	#superclass : #ToRawSkin,
 	#category : #'Toplo-Widget-Accordion-Core'
 }
 
 { #category : #'as yet unclassified' }
-ToAccordionHeaderElementSkin >> clickedSkinEvent: anEvent [
+ToAccordionItemHeaderElementSkin >> clickedSkinEvent: anEvent [
 
 	super clickedSkinEvent: anEvent.
 	anEvent elementDo: [ :e |
@@ -17,7 +17,7 @@ ToAccordionHeaderElementSkin >> clickedSkinEvent: anEvent [
 ]
 
 { #category : #'event handling' }
-ToAccordionHeaderElementSkin >> installSkinEvent: anEvent [
+ToAccordionItemHeaderElementSkin >> installSkinEvent: anEvent [
 
 	super installSkinEvent: anEvent.
 	anEvent elementDo: [ :e |
diff --git a/src/Toplo-Widget-Accordion/ToAccordionListElement.class.st b/src/Toplo-Widget-Accordion/ToAccordionListElement.class.st
index b4e842403..f5e57fb52 100644
--- a/src/Toplo-Widget-Accordion/ToAccordionListElement.class.st
+++ b/src/Toplo-Widget-Accordion/ToAccordionListElement.class.st
@@ -11,11 +11,10 @@ ToAccordionListElement class >> example1 [
 	| list |
 	list := ToAccordionListElement new.
 	list dataAccessor addAll: ((1 to: 5) collect: [ :i |
-			 ToAccordionElement new
+			 ToAccordionItemElement new
 				 headerBuilder: [ :header |
 					 header addChild: (ToLabel text: 'Header ' , i asString) ];
 				 bodyBuilder: [ :body |
-					 body background: Color white.
 					 body addChild: (BlElement new
 								  margin: (BlInsets all: 5);
 								  border: Color random;
@@ -25,6 +24,48 @@ ToAccordionListElement class >> example1 [
 	list openInSpace
 ]
 
+{ #category : #'Xp to trash' }
+ToAccordionListElement class >> example2WithAlbumInBody [
+
+	<script>
+	| list rand |
+	rand := Random new.
+	list := ToListElement new.
+	list dataAccessor addAll: ((1 to: 500) collect: [ :i |
+			 String loremIpsum: (rand nextIntegerBetween: 100 and: 600) ]).
+	list nodeBuilder: [ :node :loremString :holder |
+		| accordeon |
+		accordeon := ToAccordionItemElement new
+			             headerBuilder: [ :header |
+				             header addChild:
+						             (ToLabel text: 'Lorem ' , holder position asString) ];
+			             bodyBuilder: [ :body |
+				             | album |
+				             album := ToAlbum new
+					                      withSaveCapability;
+					                      whenSaveRequestedDo: [ :saveRequested |
+						                      saveRequested accepted: true ];
+					                      whenCancelRequestedDo: [ :cancelRequested |
+						                      cancelRequested editorElement text:
+								                      loremString ];
+					                      yourself.
+				             album hMatchParent.
+				             album vFitContent.
+				             album next constraintsDo: [ :c |
+					             c vertical fitContent.
+					             c horizontal matchParent ].
+				             album infinite constraintsDo: [ :c |
+					             c vertical fitContent.
+					             c horizontal matchParent ].
+				             album minHeight: 50.
+				             album text: loremString.
+				             body addChild: album ];
+			             yourself.
+		node addChild: accordeon ].
+	list matchParent.
+	list openInSpace
+]
+
 { #category : #initialization }
 ToAccordionListElement >> defaultInnerElement [
 
diff --git a/src/Toplo-Widget-Album/ToLabelEditorManager.class.st b/src/Toplo-Widget-Album/ToLabelEditorManager.class.st
index 487f695ca..bade22c9e 100644
--- a/src/Toplo-Widget-Album/ToLabelEditorManager.class.st
+++ b/src/Toplo-Widget-Album/ToLabelEditorManager.class.st
@@ -34,7 +34,7 @@ ToLabelEditorManager >> newEditorForLabel: aLabel [
 		do: [ :event | self closeWindow ].
 	ed withSaveCapability.
 	ed text: aLabel text copy.
-	ed infinite requestFocus.
+	ed requestFocus.
 	ed selecter
 		all;
 		apply.
diff --git a/src/Toplo-Widget-Select/ToSelectElementSkin.class.st b/src/Toplo-Widget-Select/ToSelectElementSkin.class.st
index 6ee1e624d..5ce94cd78 100644
--- a/src/Toplo-Widget-Select/ToSelectElementSkin.class.st
+++ b/src/Toplo-Widget-Select/ToSelectElementSkin.class.st
@@ -28,7 +28,7 @@ ToSelectElementSkin >> shortcutsToInstallIn: aSelect [
 						          nextSelectableIndexToScrollTo.
 					   listElement secondarySelecter selectOnlyIndex: idx.
 					   listElement secondarySelecter scrollToDataSourcePosition: idx.
-					   aSelect windowManager popupEvent: aShortcutEvent ]).
+					   aSelect manager popupEvent: aShortcutEvent ]).
 
 		  stream nextPut: (BlShortcutWithAction new
 				   combination: BlKeyCombination builder arrowUp build;