Minor Header & Footer Fixes