Improve Header, Footer Markup