Cleaning up a few things. Adding required field denotation to the template creation