removed property id
added combined widget.js + demandbaseForm.js