Done changes in header and footer