Alignment/spacing tweaks