fixed spacing and alignment issues