Spacing general tweaks