Clean up CSS and spacing