Content imprevements in templates