Fixing up new templates with Django tags etc.