Forms Builder - some clean up; add input text template