Modified layout.
Merge branch 'local'