Setting master layout
Merge branch 'master' into layout-home