Color/spacing tweaks