Footer refactor