Tweaks

More tweaks to make sure spacing is working across multiple page types.