Fixed alignment/spacing issues