D2D: Tweaks to spacing