template and form changes