Refactor headers to a separate partial