Moves header into header-image content block
Cleans up the header image inclusion