Updated headers and links