added templates and form