Added more content for question 1, fixed template issue