Adding new form
Added js file
Merged in changes