More spacing tweaks