Add fixed header and footers
Pull from upstream and resolve merge conflict.