fix default layout.
Merge branch 'hotfix/fix-default-layout'