Update formatting
Further tweak captions