Added fully functional form builder