Style changes for CD demo
Merge branch 'CD-demo'