Style changes, header progress
Merge branch 'greg'