Fix default component layout
Merge pull request #9878 from mmun/fix-default-layout

Fix default component layout