updated templates for 1.5, added extra (request) to TemplateViews