Updated content and index templates