removing EmailInput and adding templates