Fix some styling and spacing issues.