Made some changes to header and footer