Added header and footer
Major changes