more bundling and layout changes
Merge branch 'master' into twobirds-jw1
Merge pull request #7 from kneekey23/twobirds-jw1

JW - More bundling and layout changes