Fixed alignment and spacing issues