Added archive templates, moved headers outside main tag