Update layout
Add documentation about performance
Merge branch 'sonata/master'