Added new layout
Merge branch 'master' into dev