Minor upgrades on header and footer