Added templating into index output