Fixed Minor Issues with Header and Footer