layout added
Merge branch 'layout'