Tweak the top and bottom spacing on captions

Some of the spacing was quite big since the caption background colour was removed, and we tried to make the spacing more uniform.