Clean up.
Lay out the component after adding to main view. (see #11833)
Merge pull request #1897 from jburel/layout-issue

Layout issue