[WIP] New header and footer plus templates cleanup

Do not merge yet