commercial components fixes for spacing
fixes for spacing on old style components
peer review fixes
Merge pull request #3883 from guardian/commercial-components-fixes

Commercial components fixes