Added generic templates to the views