Make captions optional
Add shortcut functions
Add spacing before the span