Some index template changes