Improve Index template