Added footer, optimized header