Adding dateline back
fixing header
updates to site and merging