Section and margin tweaks

Removing reliance on sections for margins while ensuring backwards compatibility when they are there.