header and style updates
Merge branch 'jeremy'