Added headers to  various pages
fixed merge conflicts