Reorganized templates, adding a template base. Validations for form edited and improved.