Refactored section header modules
Fixed merge conflicts
Merge pull request #397 from guardian/header-modules

Refactored section header modules