minor design fixes including spacing and alignment