Forms edited, templates optimised