Add a name field and HTML templates