more margin and spacing tweaks