Layout and spacing tweaks