Position and spacing tweaks