Caption design fixes