Slightly better header
Merge branch 'stub-styles'