fix header and background
resolve conflicts
Merge pull request #5 from azdavis/header

Header