Moved header to layout.
Merge branch 'header'