Footer refactoring