Header and Footer plus some fixes