Finshing chap 1, adding links into templates, and linking pages