more changes
Merge branch 'cleanup-header' of https://github.com/oaxlin/pages into cleanup-header