Fixing the templates