Merge footer changes from roots repo