Fixing layout path
Merge branch 'layout-fixes' into dev-2