Update headers, fix archive view