Minor improvement + translation

I think using takes_context is nicer than requiring more arguments in the templates.