Rework templates
Minor changes