Fix remaining placeholders to use callouts

Fixes #164

Also remove 20px top margin for `callout`.