Index template small changes