Template fixes
Django theme fixes
Django theme fixes