Combined 2 footers and updated all affected files