Added templates

and hide names