Prevent zone margin and overlap issues per Holly's request
Merge pull request #1725 from darkwing/zone-headers

Prevent zone margin and overlap issues per Holly's request