layout and bundle changes.
rebase _layout and merge conflicts