Fixing another, missed issue with Pivot margins.
Fixing several other margin issues.