Added header,content div,clean-up