Improved Header

Also disabled header texts, since these are totally useless (compared to
texts burnt into the image), fixed a typo and cleaned up from last
merge.