Add js changes and form builder
Merge changes in js