General refactor - Header and Footer