Header elements #2

Irrelevant and minor changes.