Styles and template changes for caption only
Merge branch 'master' into gh-pages