Changes regarding page-header
Fix #21

I hope this is the last one.