Updated templates, views.