Added Header
fixed test
Merge branch 'layout'