JW - More bundling and layout changes

JW - More bundling and layout changes