spacing and design fixes