More margin tweaks