modify control to add a picture
Merge composer/master into refactoring