Fix up layout and bundles.