Moved header options into the template files.
These functions might not be needed any more?

Confusing names anyway...