Small changes

Made some changes to the templates and the archive pages. If you find any bad links please let me know.