Some layout/spacing tweaks.