Updated templates for views